refactoring of the server extension feature (see ECLIPSE-966)