[500255] [Releng] Remove the .defs plugins and features from the SDKs

https://bugs.eclipse.org/bugs/show_bug.cgi?id=500255

56 files changed, 0 insertions, 8234 deletions

diff --git a/plugins/org.eclipse.net4j.defs/.classpath b/plugins/org.eclipse.net4j.defs/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.defs/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.net4j.defs/.project b/plugins/org.eclipse.net4j.defs/.project
deleted file mode 100644
index 6a400cb81e..0000000000
--- a/plugins/org.eclipse.net4j.defs/.project
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.defs</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e7faf29fc8..0000000000
--- a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jul 04 12:59:42 CEST 2011
-eclipse.preferences.version=1
-
diff --git a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2b5ab6d39c..0000000000
--- a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,381 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=2
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5e9a5657bc..0000000000
--- a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,119 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=false
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_EMFT
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_EMFT
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=org.eclipse.emf.cdo;org.eclipse.emf.internal.cdo;org.eclipse.net4j;org.eclipse.internal.net4j;org.eclipse.emf;org.eclipse;com;org;javax;java;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2004-2016 Eike Stepper (Berlin, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n *    Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 864e30fe5d..0000000000
--- a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index b050639a54..0000000000
--- a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 2f50f36c0c..0000000000
--- a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-commit.comment.template=[${task.id}] ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 0c17d59e45..0000000000
--- a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
-MISSING_EE_DESCRIPTIONS=Warning
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Ignore
-automatically_removed_unused_problem_filters=Disabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fe01bb701d..0000000000
--- a/plugins/org.eclipse.net4j.defs/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,31 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.build.bin.includes=1
-compilers.p.build.java.compliance=1
-compilers.p.build.missing.output=2
-compilers.p.build.output.library=1
-compilers.p.build.source.library=1
-compilers.p.build.src.includes=1
-compilers.p.deprecated=2
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=1
-compilers.p.missing-version-export-package=1
-compilers.p.missing-version-import-package=1
-compilers.p.missing-version-require-bundle=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.defs/.settings/org.moreunit.prefs b/plugins/org.eclipse.net4j.defs/.settings/org.moreunit.prefs
deleted file mode 100644
index 48c2caa909..0000000000
--- a/plugins/org.eclipse.net4j.defs/.settings/org.moreunit.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed Dec 10 11:19:31 CET 2008
-eclipse.preferences.version=1
-org.moreunit.flexiblenaming=true
-org.moreunit.prefixes=
-org.moreunit.unitsourcefolder=org.eclipse.net4j.defs\:src\:org.eclipse.net4j.tests.defs\:src
-org.moreunit.useprojectsettings=true
diff --git a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
deleted file mode 100644
index 233f95f22e..0000000000
--- a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.defs;singleton:=true
-Bundle-Version: 4.0.400.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.net4j.util.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.http;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.net4j.defs;version="4.0.400",
- org.eclipse.net4j.defs.impl;version="4.0.400",
- org.eclipse.net4j.defs.util;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.defs/about.html b/plugins/org.eclipse.net4j.defs/about.html
deleted file mode 100644
index c5796baf03..0000000000
--- a/plugins/org.eclipse.net4j.defs/about.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-
diff --git a/plugins/org.eclipse.net4j.defs/about.ini b/plugins/org.eclipse.net4j.defs/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.net4j.defs/about.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
diff --git a/plugins/org.eclipse.net4j.defs/about.mappings b/plugins/org.eclipse.net4j.defs/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.net4j.defs/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.defs/about.properties b/plugins/org.eclipse.net4j.defs/about.properties
deleted file mode 100644
index 40d14d7c15..0000000000
--- a/plugins/org.eclipse.net4j.defs/about.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2009, 2011-2013 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#    Eike Stepper - initial API and implementation
-   
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-featureName = Net4j Signalling Platform Definitions
-featureText = Net4j Signalling Platform Definitions\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
diff --git a/plugins/org.eclipse.net4j.defs/build.properties b/plugins/org.eclipse.net4j.defs/build.properties
deleted file mode 100644
index b9fe091dec..0000000000
--- a/plugins/org.eclipse.net4j.defs/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2008-2010, 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html,\
-               plugin.xml,\
-               model/,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
-
-generateSourceReferences = true
diff --git a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.ecore b/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.ecore
deleted file mode 100644
index bb056eed92..0000000000
--- a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.ecore
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="defs"
-    nsURI="http://www.eclipse.org/NET4J/defs/1.0.0" nsPrefix="net4j.defs">
-  <eClassifiers xsi:type="ecore:EClass" name="ConnectorDef" abstract="true" eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="userID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="bufferProvider" lowerBound="1"
-        eType="#//BufferProviderDef"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="executorService" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//ExecutorServiceDef"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="negotiator" eType="ecore:EClass ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//NegotiatorDef"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="clientProtocolProvider"
-        lowerBound="1" upperBound="-1" eType="#//ClientProtocolFactoryDef" unsettable="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ClientProtocolFactoryDef" abstract="true"
-      eSuperTypes="#//ProtocolProviderDef"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TCPConnectorDef" eSuperTypes="#//ConnectorDef">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tcpSelectorDef" eType="#//TCPSelectorDef"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="host" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="port" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        unsettable="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AcceptorDef" abstract="true" eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="bufferProvider" eType="#//BufferPoolDef"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="executorService" eType="ecore:EClass ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//ThreadPoolDef"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="negotiator" eType="ecore:EClass ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//NegotiatorDef"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serverProtocolProvider"
-        lowerBound="1" upperBound="-1" eType="#//ServerProtocolFactoryDef" unsettable="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TCPAcceptorDef" eSuperTypes="#//AcceptorDef">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="host" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="port" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tcpSelectorDef" lowerBound="1"
-        eType="#//TCPSelectorDef"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JVMAcceptorDef" eSuperTypes="#//AcceptorDef">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JVMConnectorDef" eSuperTypes="#//ConnectorDef">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HTTPConnectorDef" eSuperTypes="#//ConnectorDef">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="url" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TCPSelectorDef" eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ServerProtocolFactoryDef" abstract="true"
-      eSuperTypes="#//ProtocolProviderDef"/>
-  <eClassifiers xsi:type="ecore:EClass" name="BufferProviderDef" abstract="true" eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def"/>
-  <eClassifiers xsi:type="ecore:EClass" name="BufferPoolDef" eSuperTypes="#//BufferProviderDef"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProtocolProviderDef" abstract="true"
-      eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def"/>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.ecorediag b/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.ecorediag
deleted file mode 100644
index 72353b4465..0000000000
--- a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.ecorediag
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_KTEcAdaNEd2NXrd06-kp9w" type="EcoreTools" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_KWkb8NaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KWoGUNaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KWotYNaNEd2NXrd06-kp9w" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_KWsXwNaNEd2NXrd06-kp9w" type="2001">
-        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.defs.ecore#//ConnectorDef/userID"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KWsXwdaNEd2NXrd06-kp9w"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWotYdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWotYtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWotY9aNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KWpUcNaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWpUcdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWpUctaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWpUc9aNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KWkb8daNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//ConnectorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KWkb8taNEd2NXrd06-kp9w" x="200" y="202"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KWsXwtaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KWs-0NaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KWs-0daNEd2NXrd06-kp9w" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWs-0taNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWs-09aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWs-1NaNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KWs-1daNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWtl4NaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWtl4daNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWtl4taNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KWsXw9aNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//ClientProtocolFactoryDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KWsXxNaNEd2NXrd06-kp9w" x="385" y="101"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KWtl49aNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KWtl5taNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KWu0ANaNEd2NXrd06-kp9w" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_KWvbFNaNEd2NXrd06-kp9w" type="2001">
-        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.defs.ecore#//TCPConnectorDef/host"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KWvbFdaNEd2NXrd06-kp9w"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_KWvbFtaNEd2NXrd06-kp9w" type="2001">
-        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.defs.ecore#//TCPConnectorDef/port"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KWvbF9aNEd2NXrd06-kp9w"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWu0AdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWu0AtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWu0A9aNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KWvbENaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWvbEdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWvbEtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWvbE9aNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KWtl5NaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//TCPConnectorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KWtl5daNEd2NXrd06-kp9w" x="395" y="311"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KWwCINaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KWwpMNaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KWxQQNaNEd2NXrd06-kp9w" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWxQQdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWxQQtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWxQQ9aNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KWxQRNaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWxQRdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWxQRtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWxQR9aNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KWwCIdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//AcceptorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KWwCItaNEd2NXrd06-kp9w" x="713" y="202"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KWxQSNaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KWx3UNaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KWx3UdaNEd2NXrd06-kp9w" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_KWyeYNaNEd2NXrd06-kp9w" type="2001">
-        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/host"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KWyeYdaNEd2NXrd06-kp9w"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_KWyeYtaNEd2NXrd06-kp9w" type="2001">
-        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/port"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KWyeY9aNEd2NXrd06-kp9w"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWx3UtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWx3U9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWx3VNaNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KWx3VdaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWx3VtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWx3V9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWx3WNaNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KWxQSdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//TCPAcceptorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KWxQStaNEd2NXrd06-kp9w" x="587" y="311"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KWyeZNaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KWzFcNaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KWzFcdaNEd2NXrd06-kp9w" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_KWzsgNaNEd2NXrd06-kp9w" type="2001">
-        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.defs.ecore#//JVMAcceptorDef/name"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KWzsgdaNEd2NXrd06-kp9w"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWzFctaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWzFc9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWzFdNaNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KWzFddaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KWzFdtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KWzFd9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KWzFeNaNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KWyeZdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//JVMAcceptorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KWyeZtaNEd2NXrd06-kp9w" x="769" y="311"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KWzsgtaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KW0TkNaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KW06oNaNEd2NXrd06-kp9w" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_KW1hsdaNEd2NXrd06-kp9w" type="2001">
-        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.defs.ecore#//JVMConnectorDef/name"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KW1hstaNEd2NXrd06-kp9w"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW06odaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW06otaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW06o9aNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KW06pNaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW06pdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW06ptaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW1hsNaNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KWzsg9aNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//JVMConnectorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KWzshNaNEd2NXrd06-kp9w" y="311"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KW1hs9aNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KW2IwNaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KW2IwdaNEd2NXrd06-kp9w" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_KW2v0NaNEd2NXrd06-kp9w" type="2001">
-        <element xmi:type="ecore:EAttribute" href="org.eclipse.net4j.defs.ecore#//HTTPConnectorDef/url"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KW2v0daNEd2NXrd06-kp9w"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW2IwtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW2Iw9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW2IxNaNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KW2IxdaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW2IxtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW2Ix9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW2IyNaNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KW1htNaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//HTTPConnectorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KW1htdaNEd2NXrd06-kp9w" x="193" y="311"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KW2v0taNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KW2v1daNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KW3W4NaNEd2NXrd06-kp9w" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW3W4daNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW3W4taNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW3W49aNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KW398NaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW398daNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW398taNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW3989aNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KW2v09aNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//TCPSelectorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KW2v1NaNEd2NXrd06-kp9w" x="496" y="202"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KW399NaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KW4lANaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KW4lAdaNEd2NXrd06-kp9w" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW4lAtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW4lA9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW4lBNaNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KW4lBdaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW4lBtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW4lB9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW4lCNaNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KW399daNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//ServerProtocolFactoryDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KW399taNEd2NXrd06-kp9w" x="799" y="101"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KW4lCdaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KW5MENaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KW5MEdaNEd2NXrd06-kp9w" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW5MEtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW5ME9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW5MFNaNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KW5MFdaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW5MFtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW5MF9aNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW5MGNaNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KW4lCtaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//BufferProviderDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KW4lC9aNEd2NXrd06-kp9w" x="195"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KW5zINaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KW5zI9aNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KW6aMNaNEd2NXrd06-kp9w" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW6aMdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW6aMtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW6aM9aNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KW6aNNaNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW6aNdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW6aNtaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW6aN9aNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KW5zIdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//BufferPoolDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KW5zItaNEd2NXrd06-kp9w" x="630" y="101"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_KW6aONaNEd2NXrd06-kp9w" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_KW7BQNaNEd2NXrd06-kp9w" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_KW7BQdaNEd2NXrd06-kp9w" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW7oUNaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW7oUdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW7oUtaNEd2NXrd06-kp9w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KW7oU9aNEd2NXrd06-kp9w" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KW7oVNaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KW7oVdaNEd2NXrd06-kp9w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KW7oVtaNEd2NXrd06-kp9w"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_KW6aOdaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-    <element xmi:type="ecore:EClass" href="org.eclipse.net4j.defs.ecore#//ProtocolProviderDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KW6aOtaNEd2NXrd06-kp9w" x="609"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_KTEcAtaNEd2NXrd06-kp9w"/>
-  <element xmi:type="ecore:EPackage" href="org.eclipse.net4j.defs.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_KW9dgNaNEd2NXrd06-kp9w" type="3002" source="_KWkb8NaNEd2NXrd06-kp9w" target="_KW4lCdaNEd2NXrd06-kp9w">
-    <children xmi:type="notation:Node" xmi:id="_KW-roNaNEd2NXrd06-kp9w" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KW-rodaNEd2NXrd06-kp9w" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KW_SsNaNEd2NXrd06-kp9w" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KW_SsdaNEd2NXrd06-kp9w" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KW9dgdaNEd2NXrd06-kp9w" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KW9dgtaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.defs.ecore#//ConnectorDef/bufferProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KW9dg9aNEd2NXrd06-kp9w" points="[1, 0, 0, 161]$[1, -161, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcJfgNaNEd2NXrd06-kp9w" id="(0.49612403,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcJfgdaNEd2NXrd06-kp9w" id="(0.4964029,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KW_SstaNEd2NXrd06-kp9w" type="3002" source="_KWkb8NaNEd2NXrd06-kp9w" target="_KWsXwtaNEd2NXrd06-kp9w">
-    <children xmi:type="notation:Node" xmi:id="_KW_5wNaNEd2NXrd06-kp9w" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KW_5wdaNEd2NXrd06-kp9w" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KW_5wtaNEd2NXrd06-kp9w" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KW_5w9aNEd2NXrd06-kp9w" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KW_Ss9aNEd2NXrd06-kp9w" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KW_StNaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.defs.ecore#//ConnectorDef/clientProtocolProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KW_StdaNEd2NXrd06-kp9w" points="[1, 0, -180, 60]$[182, -60, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcCKwdaNEd2NXrd06-kp9w" id="(0.74418604,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcCx0NaNEd2NXrd06-kp9w" id="(0.4972973,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXAg0NaNEd2NXrd06-kp9w" type="3003" source="_KWsXwtaNEd2NXrd06-kp9w" target="_KW6aONaNEd2NXrd06-kp9w">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXAg0daNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXAg0taNEd2NXrd06-kp9w" fontName="Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXAg09aNEd2NXrd06-kp9w" points="[1, 0, -181, 60]$[1, -30, -181, 30]$[183, -30, 1, 30]$[183, -60, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcBjsdaNEd2NXrd06-kp9w" id="(0.4972973,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcCKwNaNEd2NXrd06-kp9w" id="(0.32894737,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXAg1NaNEd2NXrd06-kp9w" type="3002" source="_KWtl49aNEd2NXrd06-kp9w" target="_KW2v0taNEd2NXrd06-kp9w">
-    <children xmi:type="notation:Node" xmi:id="_KXBH4NaNEd2NXrd06-kp9w" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KXBH4daNEd2NXrd06-kp9w" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KXBH4taNEd2NXrd06-kp9w" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KXBH49aNEd2NXrd06-kp9w" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXAg1daNEd2NXrd06-kp9w" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXAg1taNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.defs.ecore#//TCPConnectorDef/tcpSelectorDef"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXAg19aNEd2NXrd06-kp9w" points="[0, 0, -52, 68]$[52, -68, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcI4cNaNEd2NXrd06-kp9w" id="(0.6666667,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcI4cdaNEd2NXrd06-kp9w" id="(0.3277311,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXBH5NaNEd2NXrd06-kp9w" type="3003" source="_KWtl49aNEd2NXrd06-kp9w" target="_KWkb8NaNEd2NXrd06-kp9w">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXBH5daNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXBH5taNEd2NXrd06-kp9w" fontName="Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXBH59aNEd2NXrd06-kp9w" points="[0, 0, 144, 60]$[0, -30, 144, 30]$[-143, -30, 1, 30]$[-143, -60, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcIRYNaNEd2NXrd06-kp9w" id="(0.33333334,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcIRYdaNEd2NXrd06-kp9w" id="(0.74418604,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXBH6NaNEd2NXrd06-kp9w" type="3002" source="_KWwCINaNEd2NXrd06-kp9w" target="_KW5zINaNEd2NXrd06-kp9w">
-    <children xmi:type="notation:Node" xmi:id="_KXBu8NaNEd2NXrd06-kp9w" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KXBu8daNEd2NXrd06-kp9w" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KXBu8taNEd2NXrd06-kp9w" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KXBu89aNEd2NXrd06-kp9w" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXBH6daNEd2NXrd06-kp9w" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXBH6taNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.defs.ecore#//AcceptorDef/bufferProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXBH69aNEd2NXrd06-kp9w" points="[0, 0, 63, 60]$[-63, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcHDQNaNEd2NXrd06-kp9w" id="(0.33333334,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcHqUNaNEd2NXrd06-kp9w" id="(0.49541286,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXBu9NaNEd2NXrd06-kp9w" type="3002" source="_KWwCINaNEd2NXrd06-kp9w" target="_KW399NaNEd2NXrd06-kp9w">
-    <children xmi:type="notation:Node" xmi:id="_KXBu-NaNEd2NXrd06-kp9w" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KXBu-daNEd2NXrd06-kp9w" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KXBu-taNEd2NXrd06-kp9w" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KXBu-9aNEd2NXrd06-kp9w" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXBu9daNEd2NXrd06-kp9w" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXBu9taNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.defs.ecore#//AcceptorDef/serverProtocolProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXBu99aNEd2NXrd06-kp9w" points="[0, 0, -112, 60]$[112, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcGcMNaNEd2NXrd06-kp9w" id="(0.6666667,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcGcMdaNEd2NXrd06-kp9w" id="(0.4973545,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXCWANaNEd2NXrd06-kp9w" type="3002" source="_KWxQSNaNEd2NXrd06-kp9w" target="_KW2v0taNEd2NXrd06-kp9w">
-    <children xmi:type="notation:Node" xmi:id="_KXCWBNaNEd2NXrd06-kp9w" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KXCWBdaNEd2NXrd06-kp9w" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KXCWBtaNEd2NXrd06-kp9w" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KXCWB9aNEd2NXrd06-kp9w" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXCWAdaNEd2NXrd06-kp9w" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXCWAtaNEd2NXrd06-kp9w" fontName="Sans" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/tcpSelectorDef"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXCWA9aNEd2NXrd06-kp9w" points="[1, 0, 52, 68]$[-51, -68, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kb_ugNaNEd2NXrd06-kp9w" id="(0.32786885,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcAVkNaNEd2NXrd06-kp9w" id="(0.66386557,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXC9ENaNEd2NXrd06-kp9w" type="3003" source="_KWxQSNaNEd2NXrd06-kp9w" target="_KWwCINaNEd2NXrd06-kp9w">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXC9EdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXC9EtaNEd2NXrd06-kp9w" fontName="Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXC9E9aNEd2NXrd06-kp9w" points="[1, 0, -79, 68]$[1, -30, -79, 38]$[80, -30, 0, 38]$[80, -68, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcA8oNaNEd2NXrd06-kp9w" id="(0.6639344,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcBjsNaNEd2NXrd06-kp9w" id="(0.33333334,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXC9FNaNEd2NXrd06-kp9w" type="3003" source="_KWyeZNaNEd2NXrd06-kp9w" target="_KWwCINaNEd2NXrd06-kp9w">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXC9FdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXC9FtaNEd2NXrd06-kp9w" fontName="Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXC9F9aNEd2NXrd06-kp9w" points="[1, 0, 0, 68]$[1, -68, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kb7dENaNEd2NXrd06-kp9w" id="(0.09677419,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kb8EINaNEd2NXrd06-kp9w" id="(0.6666667,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXDkINaNEd2NXrd06-kp9w" type="3003" source="_KWzsgtaNEd2NXrd06-kp9w" target="_KWkb8NaNEd2NXrd06-kp9w">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXDkIdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXDkItaNEd2NXrd06-kp9w" fontName="Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXDkI9aNEd2NXrd06-kp9w" points="[0, 0, -165, 60]$[0, -30, -165, 30]$[166, -30, 1, 30]$[166, -60, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kb_HcNaNEd2NXrd06-kp9w" id="(0.49624062,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kb_HcdaNEd2NXrd06-kp9w" id="(0.24806201,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXELMNaNEd2NXrd06-kp9w" type="3003" source="_KW1hs9aNEd2NXrd06-kp9w" target="_KWkb8NaNEd2NXrd06-kp9w">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXELMdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXELMtaNEd2NXrd06-kp9w" fontName="Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXELM9aNEd2NXrd06-kp9w" points="[0, 0, 1, 60]$[0, -60, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kb95UNaNEd2NXrd06-kp9w" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kb95UdaNEd2NXrd06-kp9w" id="(0.49612403,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXELNNaNEd2NXrd06-kp9w" type="3003" source="_KW399NaNEd2NXrd06-kp9w" target="_KW6aONaNEd2NXrd06-kp9w">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXELNdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXELNtaNEd2NXrd06-kp9w" fontName="Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXELN9aNEd2NXrd06-kp9w" points="[0, 0, 183, 60]$[0, -30, 183, 30]$[-183, -30, 0, 30]$[-183, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcEnANaNEd2NXrd06-kp9w" id="(0.4973545,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcFOENaNEd2NXrd06-kp9w" id="(0.6644737,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KXFZUNaNEd2NXrd06-kp9w" type="3003" source="_KW5zINaNEd2NXrd06-kp9w" target="_KW4lCdaNEd2NXrd06-kp9w">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KXFZUdaNEd2NXrd06-kp9w" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KXFZUtaNEd2NXrd06-kp9w" fontName="Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KXFZU9aNEd2NXrd06-kp9w" points="[0, 0, 386, 60]$[0, -30, 386, 30]$[-385, -30, 1, 30]$[-385, -60, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcFOEdaNEd2NXrd06-kp9w" id="(0.49541286,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KcF1INaNEd2NXrd06-kp9w" id="(0.74820143,1.0)"/>
-  </edges>
-</notation:Diagram>
diff --git a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel b/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel
deleted file mode 100644
index ef9735fdf4..0000000000
--- a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
-    modelDirectory="/org.eclipse.net4j.defs/src" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.net4j.defs" modelName="Org.eclipse.net4j" codeFormatting="true"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs">
-  <foreignModel>org.eclipse.net4j.defs.ecore</foreignModel>
-  <genPackages prefix="Net4jDefs" basePackage="org.eclipse.net4j" disposableProviderFactory="true"
-      ecorePackage="org.eclipse.net4j.defs.ecore#/">
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ConnectorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//ConnectorDef/userID"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/bufferProvider"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/executorService"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/negotiator"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/clientProtocolProvider"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ClientProtocolFactoryDef"/>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPConnectorDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//TCPConnectorDef/tcpSelectorDef"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPConnectorDef/host"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPConnectorDef/port"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//AcceptorDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/bufferProvider"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/executorService"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/negotiator"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/serverProtocolProvider"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPAcceptorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/host"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/port"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/tcpSelectorDef"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//JVMAcceptorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//JVMAcceptorDef/name"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//JVMConnectorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//JVMConnectorDef/name"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//HTTPConnectorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//HTTPConnectorDef/url"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPSelectorDef"/>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ServerProtocolFactoryDef"/>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//BufferProviderDef"/>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//BufferPoolDef"/>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ProtocolProviderDef"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.net4j.defs/modeling32.png b/plugins/org.eclipse.net4j.defs/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.net4j.defs/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.defs/plugin.properties b/plugins/org.eclipse.net4j.defs/plugin.properties
deleted file mode 100644
index 6cd31a88d5..0000000000
--- a/plugins/org.eclipse.net4j.defs/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2008-2010, 2012, 2013 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Andre Dietisheim - initial API and implementation
-
-pluginName = Net4j Signalling Platform Definitions
-providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.net4j.defs/plugin.xml b/plugins/org.eclipse.net4j.defs/plugin.xml
deleted file mode 100644
index 04bde71f02..0000000000
--- a/plugins/org.eclipse.net4j.defs/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
-	Copyright (c) 2008, 2009, 2012 Eike Stepper (Berlin, Germany) and others.
-	All rights reserved. This program and the accompanying materials
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-	
-	Contributors:
-	  Eike Stepper - initial API and implementation
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://www.eclipse.org/NET4J/defs/1.0.0"
-            class="org.eclipse.net4j.defs.Net4jDefsPackage"
-            genModel="model/org.eclipse.net4j.defs.genmodel"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java
deleted file mode 100644
index 880fddcd30..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-import org.eclipse.net4j.util.defs.Def;
-import org.eclipse.net4j.util.defs.NegotiatorDef;
-import org.eclipse.net4j.util.defs.ThreadPoolDef;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Acceptor Def</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService <em>Executor Service</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef()
- * @model abstract="true"
- * @generated
- */
-public interface AcceptorDef extends Def
-{
-  /**
-   * Returns the value of the '<em><b>Buffer Provider</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Buffer Provider</em>' reference isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Buffer Provider</em>' reference.
-   * @see #setBufferProvider(BufferPoolDef)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef_BufferProvider()
-   * @model
-   * @generated
-   */
-  BufferPoolDef getBufferProvider();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Buffer Provider</em>' reference.
-   * @see #getBufferProvider()
-   * @generated
-   */
-  void setBufferProvider(BufferPoolDef value);
-
-  /**
-   * Returns the value of the '<em><b>Executor Service</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Executor Service</em>' reference isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Executor Service</em>' reference.
-   * @see #setExecutorService(ThreadPoolDef)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef_ExecutorService()
-   * @model
-   * @generated
-   */
-  ThreadPoolDef getExecutorService();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService <em>Executor Service</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Executor Service</em>' reference.
-   * @see #getExecutorService()
-   * @generated
-   */
-  void setExecutorService(ThreadPoolDef value);
-
-  /**
-   * Returns the value of the '<em><b>Negotiator</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Negotiator</em>' reference isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Negotiator</em>' reference.
-   * @see #isSetNegotiator()
-   * @see #unsetNegotiator()
-   * @see #setNegotiator(NegotiatorDef)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef_Negotiator()
-   * @model unsettable="true"
-   * @generated
-   */
-  NegotiatorDef getNegotiator();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Negotiator</em>' reference.
-   * @see #isSetNegotiator()
-   * @see #unsetNegotiator()
-   * @see #getNegotiator()
-   * @generated
-   */
-  void setNegotiator(NegotiatorDef value);
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #isSetNegotiator()
-   * @see #getNegotiator()
-   * @see #setNegotiator(NegotiatorDef)
-   * @generated
-   */
-  void unsetNegotiator();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference is set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return whether the value of the '<em>Negotiator</em>' reference is set.
-   * @see #unsetNegotiator()
-   * @see #getNegotiator()
-   * @see #setNegotiator(NegotiatorDef)
-   * @generated
-   */
-  boolean isSetNegotiator();
-
-  /**
-   * Returns the value of the '<em><b>Server Protocol Provider</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.net4j.defs.ServerProtocolFactoryDef}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Server Protocol Provider</em>' reference list isn't clear, there really should be more
-   * of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Server Protocol Provider</em>' reference list.
-   * @see #isSetServerProtocolProvider()
-   * @see #unsetServerProtocolProvider()
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef_ServerProtocolProvider()
-   * @model unsettable="true" required="true"
-   * @generated
-   */
-  EList<ServerProtocolFactoryDef> getServerProtocolProvider();
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #isSetServerProtocolProvider()
-   * @see #getServerProtocolProvider()
-   * @generated
-   */
-  void unsetServerProtocolProvider();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}' reference list is set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return whether the value of the '<em>Server Protocol Provider</em>' reference list is set.
-   * @see #unsetServerProtocolProvider()
-   * @see #getServerProtocolProvider()
-   * @generated
-   */
-  boolean isSetServerProtocolProvider();
-
-} // AcceptorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
deleted file mode 100644
index ccc2a25815..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Buffer Pool Def</b></em>'. <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getBufferPoolDef()
- * @model
- * @generated
- */
-public interface BufferPoolDef extends BufferProviderDef
-{
-
-} // BufferPoolDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
deleted file mode 100644
index a2e19ca700..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-import org.eclipse.net4j.util.defs.Def;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Buffer Provider Def</b></em>'. <!-- end-user-doc
- * -->
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getBufferProviderDef()
- * @model abstract="true"
- * @generated
- */
-public interface BufferProviderDef extends Def
-{
-
-} // BufferProviderDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
deleted file mode 100644
index ceedb856e6..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Client Protocol Factory Def</b></em>'. <!--
- * end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getClientProtocolFactoryDef()
- * @model abstract="true"
- * @generated
- */
-public interface ClientProtocolFactoryDef extends ProtocolProviderDef
-{
-
-} // ClientProtocolFactoryDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java
deleted file mode 100644
index a005c76f86..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-import org.eclipse.net4j.util.defs.Def;
-import org.eclipse.net4j.util.defs.ExecutorServiceDef;
-import org.eclipse.net4j.util.defs.NegotiatorDef;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Connector Def</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService <em>Executor Service</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef()
- * @model abstract="true"
- * @generated
- */
-public interface ConnectorDef extends Def
-{
-  /**
-   * Returns the value of the '<em><b>User ID</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>User ID</em>' attribute isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>User ID</em>' attribute.
-   * @see #isSetUserID()
-   * @see #unsetUserID()
-   * @see #setUserID(String)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef_UserID()
-   * @model unsettable="true"
-   * @generated
-   */
-  String getUserID();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @param value
-   *          the new value of the '<em>User ID</em>' attribute.
-   * @see #isSetUserID()
-   * @see #unsetUserID()
-   * @see #getUserID()
-   * @generated
-   */
-  void setUserID(String value);
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @see #isSetUserID()
-   * @see #getUserID()
-   * @see #setUserID(String)
-   * @generated
-   */
-  void unsetUserID();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute is set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return whether the value of the '<em>User ID</em>' attribute is set.
-   * @see #unsetUserID()
-   * @see #getUserID()
-   * @see #setUserID(String)
-   * @generated
-   */
-  boolean isSetUserID();
-
-  /**
-   * Returns the value of the '<em><b>Buffer Provider</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Buffer Provider</em>' reference isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Buffer Provider</em>' reference.
-   * @see #setBufferProvider(BufferProviderDef)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef_BufferProvider()
-   * @model required="true"
-   * @generated
-   */
-  BufferProviderDef getBufferProvider();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Buffer Provider</em>' reference.
-   * @see #getBufferProvider()
-   * @generated
-   */
-  void setBufferProvider(BufferProviderDef value);
-
-  /**
-   * Returns the value of the '<em><b>Executor Service</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Executor Service</em>' reference isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Executor Service</em>' reference.
-   * @see #setExecutorService(ExecutorServiceDef)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef_ExecutorService()
-   * @model required="true"
-   * @generated
-   */
-  ExecutorServiceDef getExecutorService();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService <em>Executor Service</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Executor Service</em>' reference.
-   * @see #getExecutorService()
-   * @generated
-   */
-  void setExecutorService(ExecutorServiceDef value);
-
-  /**
-   * Returns the value of the '<em><b>Negotiator</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Negotiator</em>' reference isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Negotiator</em>' reference.
-   * @see #isSetNegotiator()
-   * @see #unsetNegotiator()
-   * @see #setNegotiator(NegotiatorDef)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef_Negotiator()
-   * @model unsettable="true"
-   * @generated
-   */
-  NegotiatorDef getNegotiator();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Negotiator</em>' reference.
-   * @see #isSetNegotiator()
-   * @see #unsetNegotiator()
-   * @see #getNegotiator()
-   * @generated
-   */
-  void setNegotiator(NegotiatorDef value);
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #isSetNegotiator()
-   * @see #getNegotiator()
-   * @see #setNegotiator(NegotiatorDef)
-   * @generated
-   */
-  void unsetNegotiator();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference is set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return whether the value of the '<em>Negotiator</em>' reference is set.
-   * @see #unsetNegotiator()
-   * @see #getNegotiator()
-   * @see #setNegotiator(NegotiatorDef)
-   * @generated
-   */
-  boolean isSetNegotiator();
-
-  /**
-   * Returns the value of the '<em><b>Client Protocol Provider</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.net4j.defs.ClientProtocolFactoryDef}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Client Protocol Provider</em>' reference list isn't clear, there really should be more
-   * of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Client Protocol Provider</em>' reference list.
-   * @see #isSetClientProtocolProvider()
-   * @see #unsetClientProtocolProvider()
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef_ClientProtocolProvider()
-   * @model unsettable="true" required="true"
-   * @generated
-   */
-  EList<ClientProtocolFactoryDef> getClientProtocolProvider();
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #isSetClientProtocolProvider()
-   * @see #getClientProtocolProvider()
-   * @generated
-   */
-  void unsetClientProtocolProvider();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}' reference list is set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return whether the value of the '<em>Client Protocol Provider</em>' reference list is set.
-   * @see #unsetClientProtocolProvider()
-   * @see #getClientProtocolProvider()
-   * @generated
-   */
-  boolean isSetClientProtocolProvider();
-
-} // ConnectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java
deleted file mode 100644
index 24f00820dc..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>HTTP Connector Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getHTTPConnectorDef()
- * @model
- * @generated
- */
-public interface HTTPConnectorDef extends ConnectorDef
-{
-  /**
-   * Returns the value of the '<em><b>Url</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Url</em>' attribute isn't clear, there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Url</em>' attribute.
-   * @see #setUrl(String)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getHTTPConnectorDef_Url()
-   * @model
-   * @generated
-   */
-  String getUrl();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @param value
-   *          the new value of the '<em>Url</em>' attribute.
-   * @see #getUrl()
-   * @generated
-   */
-  void setUrl(String value);
-
-} // HTTPConnectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java
deleted file mode 100644
index 235c6a0c64..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>JVM Acceptor Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMAcceptorDef()
- * @model
- * @generated
- */
-public interface JVMAcceptorDef extends AcceptorDef
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMAcceptorDef_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @param value
-   *          the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-} // JVMAcceptorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java
deleted file mode 100644
index bacfdc9027..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>JVM Connector Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMConnectorDef()
- * @model
- * @generated
- */
-public interface JVMConnectorDef extends ConnectorDef
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMConnectorDef_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @param value
-   *          the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-} // JVMConnectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java
deleted file mode 100644
index b8a079c712..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
- * the model. <!-- end-user-doc -->
- * @see org.eclipse.net4j.defs.Net4jDefsPackage
- * @generated
- */
-public interface Net4jDefsFactory extends EFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  Net4jDefsFactory eINSTANCE = org.eclipse.net4j.defs.impl.Net4jDefsFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>TCP Connector Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return a new object of class '<em>TCP Connector Def</em>'.
-   * @generated
-   */
-  TCPConnectorDef createTCPConnectorDef();
-
-  /**
-   * Returns a new object of class '<em>TCP Acceptor Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return a new object of class '<em>TCP Acceptor Def</em>'.
-   * @generated
-   */
-  TCPAcceptorDef createTCPAcceptorDef();
-
-  /**
-   * Returns a new object of class '<em>JVM Acceptor Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return a new object of class '<em>JVM Acceptor Def</em>'.
-   * @generated
-   */
-  JVMAcceptorDef createJVMAcceptorDef();
-
-  /**
-   * Returns a new object of class '<em>JVM Connector Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return a new object of class '<em>JVM Connector Def</em>'.
-   * @generated
-   */
-  JVMConnectorDef createJVMConnectorDef();
-
-  /**
-   * Returns a new object of class '<em>HTTP Connector Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return a new object of class '<em>HTTP Connector Def</em>'.
-   * @generated
-   */
-  HTTPConnectorDef createHTTPConnectorDef();
-
-  /**
-   * Returns a new object of class '<em>TCP Selector Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return a new object of class '<em>TCP Selector Def</em>'.
-   * @generated
-   */
-  TCPSelectorDef createTCPSelectorDef();
-
-  /**
-   * Returns a new object of class '<em>Buffer Pool Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return a new object of class '<em>Buffer Pool Def</em>'.
-   * @generated
-   */
-  BufferPoolDef createBufferPoolDef();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  Net4jDefsPackage getNet4jDefsPackage();
-
-} // Net4jDefsFactory
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java
deleted file mode 100644
index 437b244709..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java
+++ /dev/null
@@ -1,1227 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.net4j.defs.Net4jDefsFactory
- * @model kind="package"
- * @generated
- */
-public interface Net4jDefsPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "defs"; //$NON-NLS-1$
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/NET4J/defs/1.0.0"; //$NON-NLS-1$
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "net4j.defs"; //$NON-NLS-1$
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  Net4jDefsPackage eINSTANCE = org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl <em>Connector Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.ConnectorDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getConnectorDef()
-   * @generated
-   */
-  int CONNECTOR_DEF = 0;
-
-  /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CONNECTOR_DEF__USER_ID = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CONNECTOR_DEF__BUFFER_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CONNECTOR_DEF__EXECUTOR_SERVICE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CONNECTOR_DEF__NEGOTIATOR = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the '<em>Connector Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   *
-   * @generated
-   * @ordered
-   */
-  int CONNECTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl <em>Protocol Provider Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
-   * @generated
-   */
-  int PROTOCOL_PROVIDER_DEF = 12;
-
-  /**
-   * The number of structural features of the '<em>Protocol Provider Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PROTOCOL_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl <em>Client Protocol Factory Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
-   * @generated
-   */
-  int CLIENT_PROTOCOL_FACTORY_DEF = 1;
-
-  /**
-   * The number of structural features of the '<em>Client Protocol Factory Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPConnectorDefImpl <em>TCP Connector Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.TCPConnectorDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
-   * @generated
-   */
-  int TCP_CONNECTOR_DEF = 2;
-
-  /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
-
-  /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
-
-  /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
-
-  /**
-   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF = CONNECTOR_DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Host</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_CONNECTOR_DEF__HOST = CONNECTOR_DEF_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Port</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_CONNECTOR_DEF__PORT = CONNECTOR_DEF_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the '<em>TCP Connector Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl <em>Acceptor Def</em>}' class. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @see org.eclipse.net4j.defs.impl.AcceptorDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getAcceptorDef()
-   * @generated
-   */
-  int ACCEPTOR_DEF = 3;
-
-  /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACCEPTOR_DEF__BUFFER_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACCEPTOR_DEF__EXECUTOR_SERVICE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACCEPTOR_DEF__NEGOTIATOR = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the '<em>Acceptor Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   *
-   * @generated
-   * @ordered
-   */
-  int ACCEPTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
-   * @generated
-   */
-  int TCP_ACCEPTOR_DEF = 4;
-
-  /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_ACCEPTOR_DEF__BUFFER_PROVIDER = ACCEPTOR_DEF__BUFFER_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_ACCEPTOR_DEF__EXECUTOR_SERVICE = ACCEPTOR_DEF__EXECUTOR_SERVICE;
-
-  /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_ACCEPTOR_DEF__NEGOTIATOR = ACCEPTOR_DEF__NEGOTIATOR;
-
-  /**
-   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Host</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_ACCEPTOR_DEF__HOST = ACCEPTOR_DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Port</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_ACCEPTOR_DEF__PORT = ACCEPTOR_DEF_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF = ACCEPTOR_DEF_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the '<em>TCP Acceptor Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
-   * @generated
-   */
-  int JVM_ACCEPTOR_DEF = 5;
-
-  /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_ACCEPTOR_DEF__BUFFER_PROVIDER = ACCEPTOR_DEF__BUFFER_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_ACCEPTOR_DEF__EXECUTOR_SERVICE = ACCEPTOR_DEF__EXECUTOR_SERVICE;
-
-  /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_ACCEPTOR_DEF__NEGOTIATOR = ACCEPTOR_DEF__NEGOTIATOR;
-
-  /**
-   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_ACCEPTOR_DEF__NAME = ACCEPTOR_DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>JVM Acceptor Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.JVMConnectorDefImpl <em>JVM Connector Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.JVMConnectorDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
-   * @generated
-   */
-  int JVM_CONNECTOR_DEF = 6;
-
-  /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
-
-  /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
-
-  /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
-
-  /**
-   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_CONNECTOR_DEF__NAME = CONNECTOR_DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>JVM Connector Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JVM_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl <em>HTTP Connector Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
-   * @generated
-   */
-  int HTTP_CONNECTOR_DEF = 7;
-
-  /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int HTTP_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
-
-  /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int HTTP_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int HTTP_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
-
-  /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int HTTP_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
-
-  /**
-   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int HTTP_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
-
-  /**
-   * The feature id for the '<em><b>Url</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int HTTP_CONNECTOR_DEF__URL = CONNECTOR_DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>HTTP Connector Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int HTTP_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.TCPSelectorDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
-   * @generated
-   */
-  int TCP_SELECTOR_DEF = 8;
-
-  /**
-   * The number of structural features of the '<em>TCP Selector Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TCP_SELECTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl <em>Server Protocol Factory Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
-   * @generated
-   */
-  int SERVER_PROTOCOL_FACTORY_DEF = 9;
-
-  /**
-   * The number of structural features of the '<em>Server Protocol Factory Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVER_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.BufferProviderDefImpl <em>Buffer Provider Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.BufferProviderDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferProviderDef()
-   * @generated
-   */
-  int BUFFER_PROVIDER_DEF = 10;
-
-  /**
-   * The number of structural features of the '<em>Buffer Provider Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BUFFER_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.BufferPoolDefImpl <em>Buffer Pool Def</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see org.eclipse.net4j.defs.impl.BufferPoolDefImpl
-   * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
-   * @generated
-   */
-  int BUFFER_POOL_DEF = 11;
-
-  /**
-   * The number of structural features of the '<em>Buffer Pool Def</em>' class.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BUFFER_POOL_DEF_FEATURE_COUNT = BUFFER_PROVIDER_DEF_FEATURE_COUNT + 0;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ConnectorDef <em>Connector Def</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for class '<em>Connector Def</em>'.
-   * @see org.eclipse.net4j.defs.ConnectorDef
-   * @generated
-   */
-  EClass getConnectorDef();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>User ID</em>'.
-   * @see org.eclipse.net4j.defs.ConnectorDef#getUserID()
-   * @see #getConnectorDef()
-   * @generated
-   */
-  EAttribute getConnectorDef_UserID();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Buffer Provider</em>'.
-   * @see org.eclipse.net4j.defs.ConnectorDef#getBufferProvider()
-   * @see #getConnectorDef()
-   * @generated
-   */
-  EReference getConnectorDef_BufferProvider();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService <em>Executor Service</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Executor Service</em>'.
-   * @see org.eclipse.net4j.defs.ConnectorDef#getExecutorService()
-   * @see #getConnectorDef()
-   * @generated
-   */
-  EReference getConnectorDef_ExecutorService();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Negotiator</em>'.
-   * @see org.eclipse.net4j.defs.ConnectorDef#getNegotiator()
-   * @see #getConnectorDef()
-   * @generated
-   */
-  EReference getConnectorDef_Negotiator();
-
-  /**
-   * Returns the meta object for the reference list '
-   * {@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for the reference list '<em>Client Protocol Provider</em>'.
-   * @see org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider()
-   * @see #getConnectorDef()
-   * @generated
-   */
-  EReference getConnectorDef_ClientProtocolProvider();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef <em>Client Protocol Factory Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for class '<em>Client Protocol Factory Def</em>'.
-   * @see org.eclipse.net4j.defs.ClientProtocolFactoryDef
-   * @generated
-   */
-  EClass getClientProtocolFactoryDef();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPConnectorDef <em>TCP Connector Def</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for class '<em>TCP Connector Def</em>'.
-   * @see org.eclipse.net4j.defs.TCPConnectorDef
-   * @generated
-   */
-  EClass getTCPConnectorDef();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Tcp Selector Def</em>'.
-   * @see org.eclipse.net4j.defs.TCPConnectorDef#getTcpSelectorDef()
-   * @see #getTCPConnectorDef()
-   * @generated
-   */
-  EReference getTCPConnectorDef_TcpSelectorDef();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.TCPConnectorDef#getHost <em>Host</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Host</em>'.
-   * @see org.eclipse.net4j.defs.TCPConnectorDef#getHost()
-   * @see #getTCPConnectorDef()
-   * @generated
-   */
-  EAttribute getTCPConnectorDef_Host();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Port</em>'.
-   * @see org.eclipse.net4j.defs.TCPConnectorDef#getPort()
-   * @see #getTCPConnectorDef()
-   * @generated
-   */
-  EAttribute getTCPConnectorDef_Port();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.AcceptorDef <em>Acceptor Def</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for class '<em>Acceptor Def</em>'.
-   * @see org.eclipse.net4j.defs.AcceptorDef
-   * @generated
-   */
-  EClass getAcceptorDef();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Buffer Provider</em>'.
-   * @see org.eclipse.net4j.defs.AcceptorDef#getBufferProvider()
-   * @see #getAcceptorDef()
-   * @generated
-   */
-  EReference getAcceptorDef_BufferProvider();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService <em>Executor Service</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Executor Service</em>'.
-   * @see org.eclipse.net4j.defs.AcceptorDef#getExecutorService()
-   * @see #getAcceptorDef()
-   * @generated
-   */
-  EReference getAcceptorDef_ExecutorService();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Negotiator</em>'.
-   * @see org.eclipse.net4j.defs.AcceptorDef#getNegotiator()
-   * @see #getAcceptorDef()
-   * @generated
-   */
-  EReference getAcceptorDef_Negotiator();
-
-  /**
-   * Returns the meta object for the reference list '
-   * {@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for the reference list '<em>Server Protocol Provider</em>'.
-   * @see org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider()
-   * @see #getAcceptorDef()
-   * @generated
-   */
-  EReference getAcceptorDef_ServerProtocolProvider();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPAcceptorDef <em>TCP Acceptor Def</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for class '<em>TCP Acceptor Def</em>'.
-   * @see org.eclipse.net4j.defs.TCPAcceptorDef
-   * @generated
-   */
-  EClass getTCPAcceptorDef();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getHost <em>Host</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Host</em>'.
-   * @see org.eclipse.net4j.defs.TCPAcceptorDef#getHost()
-   * @see #getTCPAcceptorDef()
-   * @generated
-   */
-  EAttribute getTCPAcceptorDef_Host();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getPort <em>Port</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Port</em>'.
-   * @see org.eclipse.net4j.defs.TCPAcceptorDef#getPort()
-   * @see #getTCPAcceptorDef()
-   * @generated
-   */
-  EAttribute getTCPAcceptorDef_Port();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Tcp Selector Def</em>'.
-   * @see org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef()
-   * @see #getTCPAcceptorDef()
-   * @generated
-   */
-  EReference getTCPAcceptorDef_TcpSelectorDef();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.JVMAcceptorDef <em>JVM Acceptor Def</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for class '<em>JVM Acceptor Def</em>'.
-   * @see org.eclipse.net4j.defs.JVMAcceptorDef
-   * @generated
-   */
-  EClass getJVMAcceptorDef();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.net4j.defs.JVMAcceptorDef#getName()
-   * @see #getJVMAcceptorDef()
-   * @generated
-   */
-  EAttribute getJVMAcceptorDef_Name();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.JVMConnectorDef <em>JVM Connector Def</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for class '<em>JVM Connector Def</em>'.
-   * @see org.eclipse.net4j.defs.JVMConnectorDef
-   * @generated
-   */
-  EClass getJVMConnectorDef();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.net4j.defs.JVMConnectorDef#getName()
-   * @see #getJVMConnectorDef()
-   * @generated
-   */
-  EAttribute getJVMConnectorDef_Name();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.HTTPConnectorDef <em>HTTP Connector Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for class '<em>HTTP Connector Def</em>'.
-   * @see org.eclipse.net4j.defs.HTTPConnectorDef
-   * @generated
-   */
-  EClass getHTTPConnectorDef();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Url</em>'.
-   * @see org.eclipse.net4j.defs.HTTPConnectorDef#getUrl()
-   * @see #getHTTPConnectorDef()
-   * @generated
-   */
-  EAttribute getHTTPConnectorDef_Url();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPSelectorDef <em>TCP Selector Def</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for class '<em>TCP Selector Def</em>'.
-   * @see org.eclipse.net4j.defs.TCPSelectorDef
-   * @generated
-   */
-  EClass getTCPSelectorDef();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ServerProtocolFactoryDef <em>Server Protocol Factory Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for class '<em>Server Protocol Factory Def</em>'.
-   * @see org.eclipse.net4j.defs.ServerProtocolFactoryDef
-   * @generated
-   */
-  EClass getServerProtocolFactoryDef();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.BufferProviderDef <em>Buffer Provider Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for class '<em>Buffer Provider Def</em>'.
-   * @see org.eclipse.net4j.defs.BufferProviderDef
-   * @generated
-   */
-  EClass getBufferProviderDef();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.BufferPoolDef <em>Buffer Pool Def</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the meta object for class '<em>Buffer Pool Def</em>'.
-   * @see org.eclipse.net4j.defs.BufferPoolDef
-   * @generated
-   */
-  EClass getBufferPoolDef();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ProtocolProviderDef <em>Protocol Provider Def</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the meta object for class '<em>Protocol Provider Def</em>'.
-   * @see org.eclipse.net4j.defs.ProtocolProviderDef
-   * @generated
-   */
-  EClass getProtocolProviderDef();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  Net4jDefsFactory getNet4jDefsFactory();
-
-  /**
-   * <!-- begin-user-doc --> Defines literals for the meta objects that represent
-   * <ul>
-   * <li>each class,</li>
-   * <li>each feature of each class,</li>
-   * <li>each enum,</li>
-   * <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl <em>Connector Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.ConnectorDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getConnectorDef()
-     * @generated
-     */
-    EClass CONNECTOR_DEF = eINSTANCE.getConnectorDef();
-
-    /**
-     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EAttribute CONNECTOR_DEF__USER_ID = eINSTANCE.getConnectorDef_UserID();
-
-    /**
-     * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EReference CONNECTOR_DEF__BUFFER_PROVIDER = eINSTANCE.getConnectorDef_BufferProvider();
-
-    /**
-     * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference CONNECTOR_DEF__EXECUTOR_SERVICE = eINSTANCE.getConnectorDef_ExecutorService();
-
-    /**
-     * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EReference CONNECTOR_DEF__NEGOTIATOR = eINSTANCE.getConnectorDef_Negotiator();
-
-    /**
-     * The meta object literal for the '<em><b>Client Protocol Provider</b></em>' reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    EReference CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = eINSTANCE.getConnectorDef_ClientProtocolProvider();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl <em>Client Protocol Factory Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
-     * @generated
-     */
-    EClass CLIENT_PROTOCOL_FACTORY_DEF = eINSTANCE.getClientProtocolFactoryDef();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.TCPConnectorDefImpl <em>TCP Connector Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.TCPConnectorDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
-     * @generated
-     */
-    EClass TCP_CONNECTOR_DEF = eINSTANCE.getTCPConnectorDef();
-
-    /**
-     * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF = eINSTANCE.getTCPConnectorDef_TcpSelectorDef();
-
-    /**
-     * The meta object literal for the '<em><b>Host</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EAttribute TCP_CONNECTOR_DEF__HOST = eINSTANCE.getTCPConnectorDef_Host();
-
-    /**
-     * The meta object literal for the '<em><b>Port</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EAttribute TCP_CONNECTOR_DEF__PORT = eINSTANCE.getTCPConnectorDef_Port();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl <em>Acceptor Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.AcceptorDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getAcceptorDef()
-     * @generated
-     */
-    EClass ACCEPTOR_DEF = eINSTANCE.getAcceptorDef();
-
-    /**
-     * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EReference ACCEPTOR_DEF__BUFFER_PROVIDER = eINSTANCE.getAcceptorDef_BufferProvider();
-
-    /**
-     * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference ACCEPTOR_DEF__EXECUTOR_SERVICE = eINSTANCE.getAcceptorDef_ExecutorService();
-
-    /**
-     * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EReference ACCEPTOR_DEF__NEGOTIATOR = eINSTANCE.getAcceptorDef_Negotiator();
-
-    /**
-     * The meta object literal for the '<em><b>Server Protocol Provider</b></em>' reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    EReference ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = eINSTANCE.getAcceptorDef_ServerProtocolProvider();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
-     * @generated
-     */
-    EClass TCP_ACCEPTOR_DEF = eINSTANCE.getTCPAcceptorDef();
-
-    /**
-     * The meta object literal for the '<em><b>Host</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EAttribute TCP_ACCEPTOR_DEF__HOST = eINSTANCE.getTCPAcceptorDef_Host();
-
-    /**
-     * The meta object literal for the '<em><b>Port</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EAttribute TCP_ACCEPTOR_DEF__PORT = eINSTANCE.getTCPAcceptorDef_Port();
-
-    /**
-     * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF = eINSTANCE.getTCPAcceptorDef_TcpSelectorDef();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
-     * @generated
-     */
-    EClass JVM_ACCEPTOR_DEF = eINSTANCE.getJVMAcceptorDef();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EAttribute JVM_ACCEPTOR_DEF__NAME = eINSTANCE.getJVMAcceptorDef_Name();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.JVMConnectorDefImpl <em>JVM Connector Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.JVMConnectorDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
-     * @generated
-     */
-    EClass JVM_CONNECTOR_DEF = eINSTANCE.getJVMConnectorDef();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EAttribute JVM_CONNECTOR_DEF__NAME = eINSTANCE.getJVMConnectorDef_Name();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl <em>HTTP Connector Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
-     * @generated
-     */
-    EClass HTTP_CONNECTOR_DEF = eINSTANCE.getHTTPConnectorDef();
-
-    /**
-     * The meta object literal for the '<em><b>Url</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    EAttribute HTTP_CONNECTOR_DEF__URL = eINSTANCE.getHTTPConnectorDef_Url();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.TCPSelectorDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
-     * @generated
-     */
-    EClass TCP_SELECTOR_DEF = eINSTANCE.getTCPSelectorDef();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl <em>Server Protocol Factory Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
-     * @generated
-     */
-    EClass SERVER_PROTOCOL_FACTORY_DEF = eINSTANCE.getServerProtocolFactoryDef();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.BufferProviderDefImpl <em>Buffer Provider Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.BufferProviderDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferProviderDef()
-     * @generated
-     */
-    EClass BUFFER_PROVIDER_DEF = eINSTANCE.getBufferProviderDef();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.BufferPoolDefImpl <em>Buffer Pool Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.BufferPoolDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
-     * @generated
-     */
-    EClass BUFFER_POOL_DEF = eINSTANCE.getBufferPoolDef();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl <em>Protocol Provider Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @see org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl
-     * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
-     * @generated
-     */
-    EClass PROTOCOL_PROVIDER_DEF = eINSTANCE.getProtocolProviderDef();
-
-  }
-
-} // Net4jDefsPackage
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
deleted file mode 100644
index cf34d5881d..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-import org.eclipse.net4j.util.defs.Def;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Protocol Provider Def</b></em>'. <!--
- * end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getProtocolProviderDef()
- * @model abstract="true"
- * @generated
- */
-public interface ProtocolProviderDef extends Def
-{
-
-} // ProtocolProviderDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
deleted file mode 100644
index 3e1e8c55f0..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Server Protocol Factory Def</b></em>'. <!--
- * end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getServerProtocolFactoryDef()
- * @model abstract="true"
- * @generated
- */
-public interface ServerProtocolFactoryDef extends ProtocolProviderDef
-{
-
-} // ServerProtocolFactoryDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java
deleted file mode 100644
index abdedd1b32..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Acceptor Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.net4j.defs.TCPAcceptorDef#getHost <em>Host</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.TCPAcceptorDef#getPort <em>Port</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef()
- * @model
- * @generated
- */
-public interface TCPAcceptorDef extends AcceptorDef
-{
-  /**
-   * Returns the value of the '<em><b>Host</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Host</em>' attribute isn't clear, there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Host</em>' attribute.
-   * @see #setHost(String)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef_Host()
-   * @model required="true"
-   * @generated
-   */
-  String getHost();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getHost <em>Host</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @param value
-   *          the new value of the '<em>Host</em>' attribute.
-   * @see #getHost()
-   * @generated
-   */
-  void setHost(String value);
-
-  /**
-   * Returns the value of the '<em><b>Port</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port</em>' attribute isn't clear, there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Port</em>' attribute.
-   * @see #setPort(int)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef_Port()
-   * @model required="true"
-   * @generated
-   */
-  int getPort();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getPort <em>Port</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @param value
-   *          the new value of the '<em>Port</em>' attribute.
-   * @see #getPort()
-   * @generated
-   */
-  void setPort(int value);
-
-  /**
-   * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Tcp Selector Def</em>' reference isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Tcp Selector Def</em>' reference.
-   * @see #setTcpSelectorDef(TCPSelectorDef)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef_TcpSelectorDef()
-   * @model required="true"
-   * @generated
-   */
-  TCPSelectorDef getTcpSelectorDef();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Tcp Selector Def</em>' reference.
-   * @see #getTcpSelectorDef()
-   * @generated
-   */
-  void setTcpSelectorDef(TCPSelectorDef value);
-
-} // TCPAcceptorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java
deleted file mode 100644
index 95b4c4e78f..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Connector Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.net4j.defs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.TCPConnectorDef#getHost <em>Host</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPConnectorDef()
- * @model
- * @generated
- */
-public interface TCPConnectorDef extends ConnectorDef
-{
-  /**
-   * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Tcp Selector Def</em>' reference isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Tcp Selector Def</em>' reference.
-   * @see #setTcpSelectorDef(TCPSelectorDef)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPConnectorDef_TcpSelectorDef()
-   * @model
-   * @generated
-   */
-  TCPSelectorDef getTcpSelectorDef();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Tcp Selector Def</em>' reference.
-   * @see #getTcpSelectorDef()
-   * @generated
-   */
-  void setTcpSelectorDef(TCPSelectorDef value);
-
-  /**
-   * Returns the value of the '<em><b>Host</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Host</em>' attribute isn't clear, there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Host</em>' attribute.
-   * @see #setHost(String)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPConnectorDef_Host()
-   * @model required="true"
-   * @generated
-   */
-  String getHost();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getHost <em>Host</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @param value
-   *          the new value of the '<em>Host</em>' attribute.
-   * @see #getHost()
-   * @generated
-   */
-  void setHost(String value);
-
-  /**
-   * Returns the value of the '<em><b>Port</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port</em>' attribute isn't clear, there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Port</em>' attribute.
-   * @see #isSetPort()
-   * @see #unsetPort()
-   * @see #setPort(int)
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPConnectorDef_Port()
-   * @model unsettable="true"
-   * @generated
-   */
-  int getPort();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @param value
-   *          the new value of the '<em>Port</em>' attribute.
-   * @see #isSetPort()
-   * @see #unsetPort()
-   * @see #getPort()
-   * @generated
-   */
-  void setPort(int value);
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @see #isSetPort()
-   * @see #getPort()
-   * @see #setPort(int)
-   * @generated
-   */
-  void unsetPort();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute is set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @return whether the value of the '<em>Port</em>' attribute is set.
-   * @see #unsetPort()
-   * @see #getPort()
-   * @see #setPort(int)
-   * @generated
-   */
-  boolean isSetPort();
-
-} // TCPConnectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
deleted file mode 100644
index c40a3759ad..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs;
-
-import org.eclipse.net4j.util.defs.Def;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Selector Def</b></em>'. <!-- end-user-doc
- * -->
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPSelectorDef()
- * @model
- * @generated
- */
-public interface TCPSelectorDef extends Def
-{
-
-} // TCPSelectorDef
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java
deleted file mode 100644
index d07a3e91e6..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Andre Dietisheim - initial API and implementation
- *   Eike Stepper - maintenance
- *
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.ITransportConfig;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.defs.AcceptorDef;
-import org.eclipse.net4j.defs.BufferPoolDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
-import org.eclipse.net4j.defs.util.Net4jDefsUtil;
-import org.eclipse.net4j.util.CheckUtil;
-import org.eclipse.net4j.util.defs.NegotiatorDef;
-import org.eclipse.net4j.util.defs.ThreadPoolDef;
-import org.eclipse.net4j.util.defs.impl.DefImpl;
-import org.eclipse.net4j.util.security.INegotiator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-import java.util.concurrent.ExecutorService;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Acceptor Def</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getExecutorService <em>Executor Service</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getNegotiator <em>Negotiator</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
-{
-  /**
-   * The cached value of the '{@link #getBufferProvider() <em>Buffer Provider</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getBufferProvider()
-   * @generated
-   * @ordered
-   */
-  protected BufferPoolDef bufferProvider;
-
-  /**
-   * The cached value of the '{@link #getExecutorService() <em>Executor Service</em>}' reference.
-   * <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * @see #getExecutorService()
-   * @generated
-   * @ordered
-   */
-  protected ThreadPoolDef executorService;
-
-  /**
-   * The cached value of the '{@link #getNegotiator() <em>Negotiator</em>}' reference.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @see #getNegotiator()
-   * @generated
-   * @ordered
-   */
-  protected NegotiatorDef negotiator;
-
-  /**
-   * This is true if the Negotiator reference has been set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean negotiatorESet;
-
-  /**
-   * The cached value of the '{@link #getServerProtocolProvider() <em>Server Protocol Provider</em>}' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getServerProtocolProvider()
-   * @generated
-   * @ordered
-   */
-  protected EList<ServerProtocolFactoryDef> serverProtocolProvider;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected AcceptorDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.ACCEPTOR_DEF;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public BufferPoolDef getBufferProvider()
-  {
-    if (bufferProvider != null && bufferProvider.eIsProxy())
-    {
-      InternalEObject oldBufferProvider = (InternalEObject)bufferProvider;
-      bufferProvider = (BufferPoolDef)eResolveProxy(oldBufferProvider);
-      if (bufferProvider != oldBufferProvider)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
-              oldBufferProvider, bufferProvider));
-        }
-      }
-    }
-    return bufferProvider;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public BufferPoolDef basicGetBufferProvider()
-  {
-    return bufferProvider;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setBufferProvider(BufferPoolDef newBufferProvider)
-  {
-    BufferPoolDef oldBufferProvider = bufferProvider;
-    bufferProvider = newBufferProvider;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
-          oldBufferProvider, bufferProvider));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public ThreadPoolDef getExecutorService()
-  {
-    if (executorService != null && executorService.eIsProxy())
-    {
-      InternalEObject oldExecutorService = (InternalEObject)executorService;
-      executorService = (ThreadPoolDef)eResolveProxy(oldExecutorService);
-      if (executorService != oldExecutorService)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
-              oldExecutorService, executorService));
-        }
-      }
-    }
-    return executorService;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public ThreadPoolDef basicGetExecutorService()
-  {
-    return executorService;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setExecutorService(ThreadPoolDef newExecutorService)
-  {
-    ThreadPoolDef oldExecutorService = executorService;
-    executorService = newExecutorService;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
-          oldExecutorService, executorService));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public NegotiatorDef getNegotiator()
-  {
-    if (negotiator != null && negotiator.eIsProxy())
-    {
-      InternalEObject oldNegotiator = (InternalEObject)negotiator;
-      negotiator = (NegotiatorDef)eResolveProxy(oldNegotiator);
-      if (negotiator != oldNegotiator)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR,
-              oldNegotiator, negotiator));
-        }
-      }
-    }
-    return negotiator;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public NegotiatorDef basicGetNegotiator()
-  {
-    return negotiator;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setNegotiator(NegotiatorDef newNegotiator)
-  {
-    NegotiatorDef oldNegotiator = negotiator;
-    negotiator = newNegotiator;
-    boolean oldNegotiatorESet = negotiatorESet;
-    negotiatorESet = true;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
-          negotiator, !oldNegotiatorESet));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetNegotiator()
-  {
-    NegotiatorDef oldNegotiator = negotiator;
-    boolean oldNegotiatorESet = negotiatorESet;
-    negotiator = null;
-    negotiatorESet = false;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
-          null, oldNegotiatorESet));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetNegotiator()
-  {
-    return negotiatorESet;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<ServerProtocolFactoryDef> getServerProtocolProvider()
-  {
-    if (serverProtocolProvider == null)
-    {
-      serverProtocolProvider = new EObjectResolvingEList.Unsettable<ServerProtocolFactoryDef>(
-          ServerProtocolFactoryDef.class, this, Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER);
-    }
-    return serverProtocolProvider;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetServerProtocolProvider()
-  {
-    if (serverProtocolProvider != null)
-    {
-      ((InternalEList.Unsettable<?>)serverProtocolProvider).unset();
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetServerProtocolProvider()
-  {
-    return serverProtocolProvider != null && ((InternalEList.Unsettable<?>)serverProtocolProvider).isSet();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
-      if (resolve)
-      {
-        return getBufferProvider();
-      }
-      return basicGetBufferProvider();
-    case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
-      if (resolve)
-      {
-        return getExecutorService();
-      }
-      return basicGetExecutorService();
-    case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
-      if (resolve)
-      {
-        return getNegotiator();
-      }
-      return basicGetNegotiator();
-    case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
-      return getServerProtocolProvider();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
-      setBufferProvider((BufferPoolDef)newValue);
-      return;
-    case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
-      setExecutorService((ThreadPoolDef)newValue);
-      return;
-    case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
-      setNegotiator((NegotiatorDef)newValue);
-      return;
-    case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
-      getServerProtocolProvider().clear();
-      getServerProtocolProvider().addAll((Collection<? extends ServerProtocolFactoryDef>)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
-      setBufferProvider((BufferPoolDef)null);
-      return;
-    case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
-      setExecutorService((ThreadPoolDef)null);
-      return;
-    case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
-      unsetNegotiator();
-      return;
-    case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
-      unsetServerProtocolProvider();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
-      return bufferProvider != null;
-    case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
-      return executorService != null;
-    case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
-      return isSetNegotiator();
-    case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
-      return isSetServerProtocolProvider();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected void validateDefinition()
-  {
-    super.validateDefinition();
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE), "thread pool not set!");
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER), "buffer pool not set!");
-    if (isSetServerProtocolProvider())
-    {
-      CheckUtil.checkState(getServerProtocolProvider().size() >= 1,
-          "server protocol provider is set but has no protocol factories!");
-    }
-  }
-
-  /**
-   * @ADDED
-   */
-  protected void configure(ITransportConfig config)
-  {
-
-    config.setBufferProvider((IBufferProvider)getBufferProvider().getInstance());
-    config.setReceiveExecutor((ExecutorService)getExecutorService().getInstance());
-    if (isSetServerProtocolProvider() && getServerProtocolProvider().size() > 0)
-    {
-      config.setProtocolProvider(Net4jDefsUtil.createFactoriesProtocolProvider(getServerProtocolProvider()));
-    }
-    if (isSetNegotiator())
-    {
-      config.setNegotiator((INegotiator)getNegotiator().getInstance());
-    }
-  }
-
-} // AcceptorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java
deleted file mode 100644
index 37cdb86bdc..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Andre Dietisheim - initial API and implementation
- *   Eike Stepper - maintenance
- *
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.defs.BufferPoolDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Buffer Pool Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPoolDef
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected BufferPoolDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.BUFFER_POOL_DEF;
-  }
-
-  /**
-   * creates and returns a buffer provider.
-   *
-   * @generated NOT
-   */
-  @Override
-  protected Object createInstance()
-  {
-    return Net4jUtil.createBufferPool();
-  }
-} // BufferPoolDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java
deleted file mode 100644
index be3f75f2e5..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.BufferProviderDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.util.defs.impl.DefImpl;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Buffer Provider Def</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class BufferProviderDefImpl extends DefImpl implements BufferProviderDef
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected BufferProviderDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.BUFFER_PROVIDER_DEF;
-  }
-
-} // BufferProviderDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java
deleted file mode 100644
index 83ca38fd57..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Client Protocol Factory Def</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ClientProtocolFactoryDefImpl extends ProtocolProviderDefImpl implements ClientProtocolFactoryDef
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected ClientProtocolFactoryDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.CLIENT_PROTOCOL_FACTORY_DEF;
-  }
-
-} // ClientProtocolFactoryDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java
deleted file mode 100644
index 6c4c3b0b43..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.ITransportConfig;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.defs.BufferProviderDef;
-import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
-import org.eclipse.net4j.defs.ConnectorDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.util.Net4jDefsUtil;
-import org.eclipse.net4j.util.CheckUtil;
-import org.eclipse.net4j.util.defs.ExecutorServiceDef;
-import org.eclipse.net4j.util.defs.NegotiatorDef;
-import org.eclipse.net4j.util.defs.impl.DefImpl;
-import org.eclipse.net4j.util.security.INegotiator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.spi.net4j.Connector;
-
-import java.util.Collection;
-import java.util.concurrent.ExecutorService;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Connector Def</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getUserID <em>User ID</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getExecutorService <em>Executor Service</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getNegotiator <em>Negotiator</em>}</li>
- *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
-{
-  /**
-   * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @see #getUserID()
-   * @generated
-   * @ordered
-   */
-  protected static final String USER_ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @see #getUserID()
-   * @generated
-   * @ordered
-   */
-  protected String userID = USER_ID_EDEFAULT;
-
-  /**
-   * This is true if the User ID attribute has been set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean userIDESet;
-
-  /**
-   * The cached value of the '{@link #getBufferProvider() <em>Buffer Provider</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getBufferProvider()
-   * @generated
-   * @ordered
-   */
-  protected BufferProviderDef bufferProvider;
-
-  /**
-   * The cached value of the '{@link #getExecutorService() <em>Executor Service</em>}' reference.
-   * <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * @see #getExecutorService()
-   * @generated
-   * @ordered
-   */
-  protected ExecutorServiceDef executorService;
-
-  /**
-   * The cached value of the '{@link #getNegotiator() <em>Negotiator</em>}' reference.
-   * <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * @see #getNegotiator()
-   * @generated
-   * @ordered
-   */
-  protected NegotiatorDef negotiator;
-
-  /**
-   * This is true if the Negotiator reference has been set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean negotiatorESet;
-
-  /**
-   * The cached value of the '{@link #getClientProtocolProvider() <em>Client Protocol Provider</em>}' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getClientProtocolProvider()
-   * @generated
-   * @ordered
-   */
-  protected EList<ClientProtocolFactoryDef> clientProtocolProvider;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected ConnectorDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.CONNECTOR_DEF;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public String getUserID()
-  {
-    return userID;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUserID(String newUserID)
-  {
-    String oldUserID = userID;
-    userID = newUserID;
-    boolean oldUserIDESet = userIDESet;
-    userIDESet = true;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID, userID,
-          !oldUserIDESet));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetUserID()
-  {
-    String oldUserID = userID;
-    boolean oldUserIDESet = userIDESet;
-    userID = USER_ID_EDEFAULT;
-    userIDESet = false;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID,
-          USER_ID_EDEFAULT, oldUserIDESet));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetUserID()
-  {
-    return userIDESet;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public BufferProviderDef getBufferProvider()
-  {
-    if (bufferProvider != null && bufferProvider.eIsProxy())
-    {
-      InternalEObject oldBufferProvider = (InternalEObject)bufferProvider;
-      bufferProvider = (BufferProviderDef)eResolveProxy(oldBufferProvider);
-      if (bufferProvider != oldBufferProvider)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER,
-              oldBufferProvider, bufferProvider));
-        }
-      }
-    }
-    return bufferProvider;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public BufferProviderDef basicGetBufferProvider()
-  {
-    return bufferProvider;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setBufferProvider(BufferProviderDef newBufferProvider)
-  {
-    BufferProviderDef oldBufferProvider = bufferProvider;
-    bufferProvider = newBufferProvider;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER,
-          oldBufferProvider, bufferProvider));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public ExecutorServiceDef getExecutorService()
-  {
-    if (executorService != null && executorService.eIsProxy())
-    {
-      InternalEObject oldExecutorService = (InternalEObject)executorService;
-      executorService = (ExecutorServiceDef)eResolveProxy(oldExecutorService);
-      if (executorService != oldExecutorService)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE,
-              oldExecutorService, executorService));
-        }
-      }
-    }
-    return executorService;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public ExecutorServiceDef basicGetExecutorService()
-  {
-    return executorService;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setExecutorService(ExecutorServiceDef newExecutorService)
-  {
-    ExecutorServiceDef oldExecutorService = executorService;
-    executorService = newExecutorService;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE,
-          oldExecutorService, executorService));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public NegotiatorDef getNegotiator()
-  {
-    if (negotiator != null && negotiator.eIsProxy())
-    {
-      InternalEObject oldNegotiator = (InternalEObject)negotiator;
-      negotiator = (NegotiatorDef)eResolveProxy(oldNegotiator);
-      if (negotiator != oldNegotiator)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR,
-              oldNegotiator, negotiator));
-        }
-      }
-    }
-    return negotiator;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public NegotiatorDef basicGetNegotiator()
-  {
-    return negotiator;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setNegotiator(NegotiatorDef newNegotiator)
-  {
-    NegotiatorDef oldNegotiator = negotiator;
-    negotiator = newNegotiator;
-    boolean oldNegotiatorESet = negotiatorESet;
-    negotiatorESet = true;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator,
-          negotiator, !oldNegotiatorESet));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetNegotiator()
-  {
-    NegotiatorDef oldNegotiator = negotiator;
-    boolean oldNegotiatorESet = negotiatorESet;
-    negotiator = null;
-    negotiatorESet = false;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator,
-          null, oldNegotiatorESet));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetNegotiator()
-  {
-    return negotiatorESet;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<ClientProtocolFactoryDef> getClientProtocolProvider()
-  {
-    if (clientProtocolProvider == null)
-    {
-      clientProtocolProvider = new EObjectResolvingEList.Unsettable<ClientProtocolFactoryDef>(
-          ClientProtocolFactoryDef.class, this, Net4jDefsPackage.CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER);
-    }
-    return clientProtocolProvider;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetClientProtocolProvider()
-  {
-    if (clientProtocolProvider != null)
-    {
-      ((InternalEList.Unsettable<?>)clientProtocolProvider).unset();
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetClientProtocolProvider()
-  {
-    return clientProtocolProvider != null && ((InternalEList.Unsettable<?>)clientProtocolProvider).isSet();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.CONNECTOR_DEF__USER_ID:
-      return getUserID();
-    case Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER:
-      if (resolve)
-      {
-        return getBufferProvider();
-      }
-      return basicGetBufferProvider();
-    case Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE:
-      if (resolve)
-      {
-        return getExecutorService();
-      }
-      return basicGetExecutorService();
-    case Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR:
-      if (resolve)
-      {
-        return getNegotiator();
-      }
-      return basicGetNegotiator();
-    case Net4jDefsPackage.CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER:
-      return getClientProtocolProvider();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.CONNECTOR_DEF__USER_ID:
-      setUserID((String)newValue);
-      return;
-    case Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER:
-      setBufferProvider((BufferProviderDef)newValue);
-      return;
-    case Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE:
-      setExecutorService((ExecutorServiceDef)newValue);
-      return;
-    case Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR:
-      setNegotiator((NegotiatorDef)newValue);
-      return;
-    case Net4jDefsPackage.CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER:
-      getClientProtocolProvider().clear();
-      getClientProtocolProvider().addAll((Collection<? extends ClientProtocolFactoryDef>)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.CONNECTOR_DEF__USER_ID:
-      unsetUserID();
-      return;
-    case Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER:
-      setBufferProvider((BufferProviderDef)null);
-      return;
-    case Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE:
-      setExecutorService((ExecutorServiceDef)null);
-      return;
-    case Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR:
-      unsetNegotiator();
-      return;
-    case Net4jDefsPackage.CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER:
-      unsetClientProtocolProvider();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.CONNECTOR_DEF__USER_ID:
-      return isSetUserID();
-    case Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER:
-      return bufferProvider != null;
-    case Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE:
-      return executorService != null;
-    case Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR:
-      return isSetNegotiator();
-    case Net4jDefsPackage.CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER:
-      return isSetClientProtocolProvider();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (userID: ");
-    if (userIDESet)
-    {
-      result.append(userID);
-    }
-    else
-    {
-      result.append("<unset>");
-    }
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * Configures a given {@link ITransportConfig}. It particularly sets
-   * <ul>
-   * <li>{@link IBufferProvider}</li>
-   * <li>{@link ExecutorService}</li>
-   * <li>{@link INegotiator}</li>
-   * <li>{@link IProtocolProvider}</li>
-   * </ul>
-   *
-   * @param config
-   *          the transport config
-   * @ADDED
-   */
-  protected void configure(ITransportConfig config)
-  {
-    config.setBufferProvider((IBufferProvider)getBufferProvider().getInstance());
-    config.setReceiveExecutor((ExecutorService)getExecutorService().getInstance());
-    if (isSetClientProtocolProvider())
-    {
-      config.setProtocolProvider(Net4jDefsUtil.createFactoriesProtocolProvider(getClientProtocolProvider()));
-    }
-    if (isSetNegotiator())
-    {
-      config.setNegotiator((INegotiator)getNegotiator().getInstance());
-    }
-  }
-
-  /**
-   * @ADDED
-   */
-  protected void configure(Connector connector)
-  {
-    if (isSetUserID())
-    {
-      connector.setUserID(getUserID());
-    }
-    configure(connector.getConfig());
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected void validateDefinition()
-  {
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER), "buffer provider not set!");
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE), "executor service not set!"); //
-    if (isSetClientProtocolProvider())
-    {
-      CheckUtil.checkState(getClientProtocolProvider().size() >= 1,
-          "client protocol provider is set but has no protocol factories!");
-    }
-
-  }
-
-} // ConnectorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java
deleted file mode 100644
index e16482704b..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.HTTPConnectorDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.http.common.IHTTPConnector;
-import org.eclipse.net4j.internal.http.HTTPClientConnector;
-import org.eclipse.net4j.util.CheckUtil;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>HTTP Connector Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl#getUrl <em>Url</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnectorDef
-{
-  /**
-   * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getUrl()
-   * @generated
-   * @ordered
-   */
-  protected static final String URL_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getUrl()
-   * @generated
-   * @ordered
-   */
-  protected String url = URL_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected HTTPConnectorDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.HTTP_CONNECTOR_DEF;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public String getUrl()
-  {
-    return url;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUrl(String newUrl)
-  {
-    String oldUrl = url;
-    url = newUrl;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL, oldUrl, url));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
-      return getUrl();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
-      setUrl((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
-      setUrl(URL_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL:
-      return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (url: ");
-    result.append(url);
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected IHTTPConnector createInstance()
-  {
-    HTTPClientConnector connector = new HTTPClientConnector();
-
-    configure(connector.getConfig());
-    connector.setURL(getUrl());
-    connector.activate();
-
-    return connector;
-  }
-
-  @Override
-  protected void validateDefinition()
-  {
-    super.validateDefinition();
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL), "url not set!");
-  }
-} // HTTPConnectorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java
deleted file mode 100644
index 8d9131e6e1..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.defs.JVMAcceptorDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.internal.jvm.JVMAcceptor;
-import org.eclipse.net4j.util.CheckUtil;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import java.util.concurrent.ExecutorService;
-
-public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDef
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   *
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected JVMAcceptorDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.JVM_ACCEPTOR_DEF;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME, oldName, name));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
-      return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
-      setName((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected Object createInstance()
-  {
-    JVMAcceptor jvmAcceptor = new JVMAcceptor();
-    jvmAcceptor.getConfig().setBufferProvider((IBufferProvider)getBufferProvider().getInstance());
-    jvmAcceptor.getConfig().setReceiveExecutor((ExecutorService)getExecutorService().getInstance());
-    jvmAcceptor.setName(getName());
-    return jvmAcceptor;
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected void validateDefinition()
-  {
-    super.validateDefinition();
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME), "name not set!");
-  }
-} // JVMAcceptorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java
deleted file mode 100644
index 3337c6e821..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.JVMConnectorDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.internal.jvm.JVMClientConnector;
-import org.eclipse.net4j.jvm.IJVMConnector;
-import org.eclipse.net4j.util.CheckUtil;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>JVM Connector Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnectorDef
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   *
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected JVMConnectorDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.JVM_CONNECTOR_DEF;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME, oldName, name));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
-      return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
-      setName((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected IJVMConnector createInstance()
-  {
-    JVMClientConnector connector = new JVMClientConnector();
-    configure(connector);
-
-    connector.setName(getName());
-    return connector;
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected void validateDefinition()
-  {
-    super.validateDefinition();
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME), "name not set!");
-  }
-
-} // JVMConnectorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java
deleted file mode 100644
index 0ca8f51f54..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.BufferPoolDef;
-import org.eclipse.net4j.defs.HTTPConnectorDef;
-import org.eclipse.net4j.defs.JVMAcceptorDef;
-import org.eclipse.net4j.defs.JVMConnectorDef;
-import org.eclipse.net4j.defs.Net4jDefsFactory;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.TCPAcceptorDef;
-import org.eclipse.net4j.defs.TCPConnectorDef;
-import org.eclipse.net4j.defs.TCPSelectorDef;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * @generated
- */
-public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public static Net4jDefsFactory init()
-  {
-    try
-    {
-      Net4jDefsFactory theNet4jDefsFactory = (Net4jDefsFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/NET4J/defs/1.0.0");
-      if (theNet4jDefsFactory != null)
-      {
-        return theNet4jDefsFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new Net4jDefsFactoryImpl();
-  }
-
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public Net4jDefsFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF:
-      return createTCPConnectorDef();
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF:
-      return createTCPAcceptorDef();
-    case Net4jDefsPackage.JVM_ACCEPTOR_DEF:
-      return createJVMAcceptorDef();
-    case Net4jDefsPackage.JVM_CONNECTOR_DEF:
-      return createJVMConnectorDef();
-    case Net4jDefsPackage.HTTP_CONNECTOR_DEF:
-      return createHTTPConnectorDef();
-    case Net4jDefsPackage.TCP_SELECTOR_DEF:
-      return createTCPSelectorDef();
-    case Net4jDefsPackage.BUFFER_POOL_DEF:
-      return createBufferPoolDef();
-    default:
-      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public TCPConnectorDef createTCPConnectorDef()
-  {
-    TCPConnectorDefImpl tcpConnectorDef = new TCPConnectorDefImpl();
-    return tcpConnectorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public TCPAcceptorDef createTCPAcceptorDef()
-  {
-    TCPAcceptorDefImpl tcpAcceptorDef = new TCPAcceptorDefImpl();
-    return tcpAcceptorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public JVMAcceptorDef createJVMAcceptorDef()
-  {
-    JVMAcceptorDefImpl jvmAcceptorDef = new JVMAcceptorDefImpl();
-    return jvmAcceptorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public JVMConnectorDef createJVMConnectorDef()
-  {
-    JVMConnectorDefImpl jvmConnectorDef = new JVMConnectorDefImpl();
-    return jvmConnectorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public HTTPConnectorDef createHTTPConnectorDef()
-  {
-    HTTPConnectorDefImpl httpConnectorDef = new HTTPConnectorDefImpl();
-    return httpConnectorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public TCPSelectorDef createTCPSelectorDef()
-  {
-    TCPSelectorDefImpl tcpSelectorDef = new TCPSelectorDefImpl();
-    return tcpSelectorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public BufferPoolDef createBufferPoolDef()
-  {
-    BufferPoolDefImpl bufferPoolDef = new BufferPoolDefImpl();
-    return bufferPoolDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public Net4jDefsPackage getNet4jDefsPackage()
-  {
-    return (Net4jDefsPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  @Deprecated
-  public static Net4jDefsPackage getPackage()
-  {
-    return Net4jDefsPackage.eINSTANCE;
-  }
-
-} // Net4jDefsFactoryImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java
deleted file mode 100644
index f672a77952..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java
+++ /dev/null
@@ -1,680 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.AcceptorDef;
-import org.eclipse.net4j.defs.BufferPoolDef;
-import org.eclipse.net4j.defs.BufferProviderDef;
-import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
-import org.eclipse.net4j.defs.ConnectorDef;
-import org.eclipse.net4j.defs.HTTPConnectorDef;
-import org.eclipse.net4j.defs.JVMAcceptorDef;
-import org.eclipse.net4j.defs.JVMConnectorDef;
-import org.eclipse.net4j.defs.Net4jDefsFactory;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.ProtocolProviderDef;
-import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
-import org.eclipse.net4j.defs.TCPAcceptorDef;
-import org.eclipse.net4j.defs.TCPConnectorDef;
-import org.eclipse.net4j.defs.TCPSelectorDef;
-import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * @generated
- */
-public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPackage
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass connectorDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass clientProtocolFactoryDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass tcpConnectorDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass acceptorDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass tcpAcceptorDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass jvmAcceptorDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass jvmConnectorDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass httpConnectorDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass tcpSelectorDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass serverProtocolFactoryDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass bufferProviderDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass bufferPoolDefEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass protocolProviderDefEClass = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
-   * EPackage.Registry} by the package package URI value.
-   * <p>
-   * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
-   * performs initialization of the package, or returns the registered package, if one already exists. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.net4j.defs.Net4jDefsPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private Net4jDefsPackageImpl()
-  {
-    super(eNS_URI, Net4jDefsFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   *
-   * <p>This method is used to initialize {@link Net4jDefsPackage#eINSTANCE} when that field is accessed.
-   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-   * <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static Net4jDefsPackage init()
-  {
-    if (isInited)
-    {
-      return (Net4jDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jDefsPackage.eNS_URI);
-    }
-
-    // Obtain or create and register package
-    Net4jDefsPackageImpl theNet4jDefsPackage = (Net4jDefsPackageImpl)(EPackage.Registry.INSTANCE
-        .get(eNS_URI) instanceof Net4jDefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-            : new Net4jDefsPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    Net4jUtilDefsPackage.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theNet4jDefsPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theNet4jDefsPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theNet4jDefsPackage.freeze();
-
-    // Update the registry and return the package
-    EPackage.Registry.INSTANCE.put(Net4jDefsPackage.eNS_URI, theNet4jDefsPackage);
-    return theNet4jDefsPackage;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getConnectorDef()
-  {
-    return connectorDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getConnectorDef_UserID()
-  {
-    return (EAttribute)connectorDefEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getConnectorDef_BufferProvider()
-  {
-    return (EReference)connectorDefEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getConnectorDef_ExecutorService()
-  {
-    return (EReference)connectorDefEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getConnectorDef_Negotiator()
-  {
-    return (EReference)connectorDefEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getConnectorDef_ClientProtocolProvider()
-  {
-    return (EReference)connectorDefEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getClientProtocolFactoryDef()
-  {
-    return clientProtocolFactoryDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getTCPConnectorDef()
-  {
-    return tcpConnectorDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getTCPConnectorDef_TcpSelectorDef()
-  {
-    return (EReference)tcpConnectorDefEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getTCPConnectorDef_Host()
-  {
-    return (EAttribute)tcpConnectorDefEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getTCPConnectorDef_Port()
-  {
-    return (EAttribute)tcpConnectorDefEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getAcceptorDef()
-  {
-    return acceptorDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getAcceptorDef_BufferProvider()
-  {
-    return (EReference)acceptorDefEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getAcceptorDef_ExecutorService()
-  {
-    return (EReference)acceptorDefEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getAcceptorDef_Negotiator()
-  {
-    return (EReference)acceptorDefEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getAcceptorDef_ServerProtocolProvider()
-  {
-    return (EReference)acceptorDefEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getTCPAcceptorDef()
-  {
-    return tcpAcceptorDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getTCPAcceptorDef_Host()
-  {
-    return (EAttribute)tcpAcceptorDefEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getTCPAcceptorDef_Port()
-  {
-    return (EAttribute)tcpAcceptorDefEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getTCPAcceptorDef_TcpSelectorDef()
-  {
-    return (EReference)tcpAcceptorDefEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getJVMAcceptorDef()
-  {
-    return jvmAcceptorDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJVMAcceptorDef_Name()
-  {
-    return (EAttribute)jvmAcceptorDefEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getJVMConnectorDef()
-  {
-    return jvmConnectorDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJVMConnectorDef_Name()
-  {
-    return (EAttribute)jvmConnectorDefEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getHTTPConnectorDef()
-  {
-    return httpConnectorDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getHTTPConnectorDef_Url()
-  {
-    return (EAttribute)httpConnectorDefEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getTCPSelectorDef()
-  {
-    return tcpSelectorDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getServerProtocolFactoryDef()
-  {
-    return serverProtocolFactoryDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getBufferProviderDef()
-  {
-    return bufferProviderDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getBufferPoolDef()
-  {
-    return bufferPoolDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getProtocolProviderDef()
-  {
-    return protocolProviderDefEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public Net4jDefsFactory getNet4jDefsFactory()
-  {
-    return (Net4jDefsFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated)
-    {
-      return;
-    }
-    isCreated = true;
-
-    // Create classes and their features
-    connectorDefEClass = createEClass(CONNECTOR_DEF);
-    createEAttribute(connectorDefEClass, CONNECTOR_DEF__USER_ID);
-    createEReference(connectorDefEClass, CONNECTOR_DEF__BUFFER_PROVIDER);
-    createEReference(connectorDefEClass, CONNECTOR_DEF__EXECUTOR_SERVICE);
-    createEReference(connectorDefEClass, CONNECTOR_DEF__NEGOTIATOR);
-    createEReference(connectorDefEClass, CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER);
-
-    clientProtocolFactoryDefEClass = createEClass(CLIENT_PROTOCOL_FACTORY_DEF);
-
-    tcpConnectorDefEClass = createEClass(TCP_CONNECTOR_DEF);
-    createEReference(tcpConnectorDefEClass, TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF);
-    createEAttribute(tcpConnectorDefEClass, TCP_CONNECTOR_DEF__HOST);
-    createEAttribute(tcpConnectorDefEClass, TCP_CONNECTOR_DEF__PORT);
-
-    acceptorDefEClass = createEClass(ACCEPTOR_DEF);
-    createEReference(acceptorDefEClass, ACCEPTOR_DEF__BUFFER_PROVIDER);
-    createEReference(acceptorDefEClass, ACCEPTOR_DEF__EXECUTOR_SERVICE);
-    createEReference(acceptorDefEClass, ACCEPTOR_DEF__NEGOTIATOR);
-    createEReference(acceptorDefEClass, ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER);
-
-    tcpAcceptorDefEClass = createEClass(TCP_ACCEPTOR_DEF);
-    createEAttribute(tcpAcceptorDefEClass, TCP_ACCEPTOR_DEF__HOST);
-    createEAttribute(tcpAcceptorDefEClass, TCP_ACCEPTOR_DEF__PORT);
-    createEReference(tcpAcceptorDefEClass, TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF);
-
-    jvmAcceptorDefEClass = createEClass(JVM_ACCEPTOR_DEF);
-    createEAttribute(jvmAcceptorDefEClass, JVM_ACCEPTOR_DEF__NAME);
-
-    jvmConnectorDefEClass = createEClass(JVM_CONNECTOR_DEF);
-    createEAttribute(jvmConnectorDefEClass, JVM_CONNECTOR_DEF__NAME);
-
-    httpConnectorDefEClass = createEClass(HTTP_CONNECTOR_DEF);
-    createEAttribute(httpConnectorDefEClass, HTTP_CONNECTOR_DEF__URL);
-
-    tcpSelectorDefEClass = createEClass(TCP_SELECTOR_DEF);
-
-    serverProtocolFactoryDefEClass = createEClass(SERVER_PROTOCOL_FACTORY_DEF);
-
-    bufferProviderDefEClass = createEClass(BUFFER_PROVIDER_DEF);
-
-    bufferPoolDefEClass = createEClass(BUFFER_POOL_DEF);
-
-    protocolProviderDefEClass = createEClass(PROTOCOL_PROVIDER_DEF);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized)
-    {
-      return;
-    }
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Obtain other dependent packages
-    Net4jUtilDefsPackage theNet4jUtilDefsPackage = (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE
-        .getEPackage(Net4jUtilDefsPackage.eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-    connectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    clientProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
-    tcpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
-    acceptorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    tcpAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
-    jvmAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
-    jvmConnectorDefEClass.getESuperTypes().add(getConnectorDef());
-    httpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
-    tcpSelectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    serverProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
-    bufferProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    bufferPoolDefEClass.getESuperTypes().add(getBufferProviderDef());
-    protocolProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(connectorDefEClass, ConnectorDef.class, "ConnectorDef", IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getConnectorDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, ConnectorDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConnectorDef_BufferProvider(), getBufferProviderDef(), null, "bufferProvider", null, 1, 1,
-        ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConnectorDef_ExecutorService(), theNet4jUtilDefsPackage.getExecutorServiceDef(), null,
-        "executorService", null, 1, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConnectorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null,
-        0, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConnectorDef_ClientProtocolProvider(), getClientProtocolFactoryDef(), null,
-        "clientProtocolProvider", null, 1, -1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(clientProtocolFactoryDefEClass, ClientProtocolFactoryDef.class, "ClientProtocolFactoryDef", IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTCPConnectorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1,
-        TCPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTCPConnectorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPConnectorDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTCPConnectorDef_Port(), ecorePackage.getEInt(), "port", null, 0, 1, TCPConnectorDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAcceptorDef_BufferProvider(), getBufferPoolDef(), null, "bufferProvider", null, 0, 1,
-        AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getAcceptorDef_ExecutorService(), theNet4jUtilDefsPackage.getThreadPoolDef(), null,
-        "executorService", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getAcceptorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null, 0,
-        1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getAcceptorDef_ServerProtocolProvider(), getServerProtocolFactoryDef(), null,
-        "serverProtocolProvider", null, 1, -1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(tcpAcceptorDefEClass, TCPAcceptorDef.class, "TCPAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getTCPAcceptorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPAcceptorDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTCPAcceptorDef_Port(), ecorePackage.getEInt(), "port", null, 1, 1, TCPAcceptorDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTCPAcceptorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1,
-        TCPAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(jvmAcceptorDefEClass, JVMAcceptorDef.class, "JVMAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getJVMAcceptorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMAcceptorDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(jvmConnectorDefEClass, JVMConnectorDef.class, "JVMConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getJVMConnectorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMConnectorDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(httpConnectorDefEClass, HTTPConnectorDef.class, "HTTPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getHTTPConnectorDef_Url(), ecorePackage.getEString(), "url", null, 0, 1, HTTPConnectorDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(tcpSelectorDefEClass, TCPSelectorDef.class, "TCPSelectorDef", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(serverProtocolFactoryDefEClass, ServerProtocolFactoryDef.class, "ServerProtocolFactoryDef", IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(bufferProviderDefEClass, BufferProviderDef.class, "BufferProviderDef", IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(bufferPoolDefEClass, BufferPoolDef.class, "BufferPoolDef", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(protocolProviderDefEClass, ProtocolProviderDef.class, "ProtocolProviderDef", IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} // Net4jDefsPackageImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java
deleted file mode 100644
index f626fa562d..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.ProtocolProviderDef;
-import org.eclipse.net4j.util.defs.impl.DefImpl;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Protocol Provider Def</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ProtocolProviderDefImpl extends DefImpl implements ProtocolProviderDef
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected ProtocolProviderDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.PROTOCOL_PROVIDER_DEF;
-  }
-
-} // ProtocolProviderDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
deleted file mode 100644
index a1516c2a1f..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Server Protocol Factory Def</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ServerProtocolFactoryDefImpl extends ProtocolProviderDefImpl implements ServerProtocolFactoryDef
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected ServerProtocolFactoryDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.SERVER_PROTOCOL_FACTORY_DEF;
-  }
-
-} // ServerProtocolFactoryDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java
deleted file mode 100644
index 1f137d0366..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.TCPAcceptorDef;
-import org.eclipse.net4j.defs.TCPSelectorDef;
-import org.eclipse.net4j.internal.tcp.TCPAcceptor;
-import org.eclipse.net4j.internal.tcp.TCPSelector;
-import org.eclipse.net4j.tcp.ITCPAcceptor;
-import org.eclipse.net4j.util.CheckUtil;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>TCP Acceptor Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getHost <em>Host</em>}</li>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getPort <em>Port</em>}</li>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDef
-{
-  /**
-   * The default value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   *
-   * @see #getHost()
-   * @generated
-   * @ordered
-   */
-  protected static final String HOST_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getHost() <em>Host</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getHost()
-   * @generated
-   * @ordered
-   */
-  protected String host = HOST_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   *
-   * @see #getPort()
-   * @generated
-   * @ordered
-   */
-  protected static final int PORT_EDEFAULT = 0;
-
-  /**
-   * The cached value of the '{@link #getPort() <em>Port</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getPort()
-   * @generated
-   * @ordered
-   */
-  protected int port = PORT_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTcpSelectorDef()
-   * @generated
-   * @ordered
-   */
-  protected TCPSelectorDef tcpSelectorDef;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected TCPAcceptorDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.TCP_ACCEPTOR_DEF;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public String getHost()
-  {
-    return host;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setHost(String newHost)
-  {
-    String oldHost = host;
-    host = newHost;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST, oldHost, host));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public int getPort()
-  {
-    return port;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPort(int newPort)
-  {
-    int oldPort = port;
-    port = newPort;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT, oldPort, port));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public TCPSelectorDef getTcpSelectorDef()
-  {
-    if (tcpSelectorDef != null && tcpSelectorDef.eIsProxy())
-    {
-      InternalEObject oldTcpSelectorDef = (InternalEObject)tcpSelectorDef;
-      tcpSelectorDef = (TCPSelectorDef)eResolveProxy(oldTcpSelectorDef);
-      if (tcpSelectorDef != oldTcpSelectorDef)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF,
-              oldTcpSelectorDef, tcpSelectorDef));
-        }
-      }
-    }
-    return tcpSelectorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public TCPSelectorDef basicGetTcpSelectorDef()
-  {
-    return tcpSelectorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTcpSelectorDef(TCPSelectorDef newTcpSelectorDef)
-  {
-    TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
-    tcpSelectorDef = newTcpSelectorDef;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF,
-          oldTcpSelectorDef, tcpSelectorDef));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
-      return getHost();
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
-      return getPort();
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
-      if (resolve)
-      {
-        return getTcpSelectorDef();
-      }
-      return basicGetTcpSelectorDef();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
-      setHost((String)newValue);
-      return;
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
-      setPort((Integer)newValue);
-      return;
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
-      setTcpSelectorDef((TCPSelectorDef)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
-      setHost(HOST_EDEFAULT);
-      return;
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
-      setPort(PORT_EDEFAULT);
-      return;
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
-      setTcpSelectorDef((TCPSelectorDef)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST:
-      return HOST_EDEFAULT == null ? host != null : !HOST_EDEFAULT.equals(host);
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT:
-      return port != PORT_EDEFAULT;
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
-      return tcpSelectorDef != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (host: ");
-    result.append(host);
-    result.append(", port: ");
-    result.append(port);
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected ITCPAcceptor createInstance()
-  {
-    TCPSelector tcpSelector = (TCPSelector)getTcpSelectorDef().getInstance();
-
-    TCPAcceptor tcpAcceptor = new TCPAcceptor();
-
-    tcpAcceptor.setStartSynchronously(true);
-    tcpAcceptor.setSynchronousStartTimeout(500l);
-    configure(tcpAcceptor.getConfig());
-    tcpAcceptor.setSelector(tcpSelector);
-
-    tcpAcceptor.setAddress(getHost());
-    tcpAcceptor.setPort(getPort());
-
-    return tcpAcceptor;
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected void validateDefinition()
-  {
-    super.validateDefinition();
-    CheckUtil.checkState(getTcpSelectorDef() != null, "tcp selector not set!");
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST), "host not set!");
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT), "port not set!");
-  }
-}
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java
deleted file mode 100644
index 856430a4b9..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.TCPConnectorDef;
-import org.eclipse.net4j.defs.TCPSelectorDef;
-import org.eclipse.net4j.internal.tcp.TCPClientConnector;
-import org.eclipse.net4j.tcp.ITCPConnector;
-import org.eclipse.net4j.tcp.ITCPSelector;
-import org.eclipse.net4j.util.CheckUtil;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>TCP Connector Def</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl#getHost <em>Host</em>}</li>
- * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl#getPort <em>Port</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnectorDef
-{
-  /**
-   * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTcpSelectorDef()
-   * @generated
-   * @ordered
-   */
-  protected TCPSelectorDef tcpSelectorDef;
-
-  /**
-   * The default value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   *
-   * @see #getHost()
-   * @generated
-   * @ordered
-   */
-  protected static final String HOST_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getHost() <em>Host</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getHost()
-   * @generated
-   * @ordered
-   */
-  protected String host = HOST_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   *
-   * @see #getPort()
-   * @generated
-   * @ordered
-   */
-  protected static final int PORT_EDEFAULT = 0;
-
-  /**
-   * The cached value of the '{@link #getPort() <em>Port</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getPort()
-   * @generated
-   * @ordered
-   */
-  protected int port = PORT_EDEFAULT;
-
-  /**
-   * This is true if the Port attribute has been set.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean portESet;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected TCPConnectorDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.TCP_CONNECTOR_DEF;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public TCPSelectorDef getTcpSelectorDef()
-  {
-    if (tcpSelectorDef != null && tcpSelectorDef.eIsProxy())
-    {
-      InternalEObject oldTcpSelectorDef = (InternalEObject)tcpSelectorDef;
-      tcpSelectorDef = (TCPSelectorDef)eResolveProxy(oldTcpSelectorDef);
-      if (tcpSelectorDef != oldTcpSelectorDef)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
-        }
-      }
-    }
-    return tcpSelectorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public TCPSelectorDef basicGetTcpSelectorDef()
-  {
-    return tcpSelectorDef;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTcpSelectorDef(TCPSelectorDef newTcpSelectorDef)
-  {
-    TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
-    tcpSelectorDef = newTcpSelectorDef;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF,
-          oldTcpSelectorDef, tcpSelectorDef));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public String getHost()
-  {
-    return host;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setHost(String newHost)
-  {
-    String oldHost = host;
-    host = newHost;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST, oldHost, host));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->gets the <b>port</b> of this connector. If the port was not set, the
-   * {@link ITCPConnector#DEFAULT_PORT} is returned<!-- end-user-doc -->
-   *
-   * @generated NOT
-   */
-  public int getPort()
-  {
-    if (isSetPort())
-    {
-      return getPortGen();
-    }
-    else
-    {
-      return ITCPConnector.DEFAULT_PORT;
-    }
-  }
-
-  /**
-   * @generated
-   */
-  public int getPortGen()
-  {
-    return port;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPort(int newPort)
-  {
-    int oldPort = port;
-    port = newPort;
-    boolean oldPortESet = portESet;
-    portESet = true;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort, port,
-          !oldPortESet));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetPort()
-  {
-    int oldPort = port;
-    boolean oldPortESet = portESet;
-    port = PORT_EDEFAULT;
-    portESet = false;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort,
-          PORT_EDEFAULT, oldPortESet));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetPort()
-  {
-    return portESet;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
-      if (resolve)
-      {
-        return getTcpSelectorDef();
-      }
-      return basicGetTcpSelectorDef();
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
-      return getHost();
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
-      return getPort();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
-      setTcpSelectorDef((TCPSelectorDef)newValue);
-      return;
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
-      setHost((String)newValue);
-      return;
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
-      setPort((Integer)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
-      setTcpSelectorDef((TCPSelectorDef)null);
-      return;
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
-      setHost(HOST_EDEFAULT);
-      return;
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
-      unsetPort();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
-      return tcpSelectorDef != null;
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
-      return HOST_EDEFAULT == null ? host != null : !HOST_EDEFAULT.equals(host);
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT:
-      return isSetPort();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (host: ");
-    result.append(host);
-    result.append(", port: ");
-    if (portESet)
-    {
-      result.append(port);
-    }
-    else
-    {
-      result.append("<unset>");
-    }
-    result.append(')');
-    return result.toString();
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected ITCPConnector createInstance()
-  {
-    TCPClientConnector connector = new TCPClientConnector();
-
-    configure(connector);
-    connector.setSelector((ITCPSelector)getTcpSelectorDef().getInstance());
-    connector.setHost(getHost());
-    connector.setPort(getPort());
-
-    return connector;
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected void validateDefinition()
-  {
-    super.validateDefinition();
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF), "tcp selector not set!");
-    CheckUtil.checkState(eIsSet(Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST), "host not set!"); //
-  }
-} // TCPConnectorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java
deleted file mode 100644
index 45a7fe3b1b..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.impl;
-
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.TCPSelectorDef;
-import org.eclipse.net4j.internal.tcp.TCPSelector;
-import org.eclipse.net4j.util.defs.impl.DefImpl;
-
-import org.eclipse.emf.ecore.EClass;
-
-public class TCPSelectorDefImpl extends DefImpl implements TCPSelectorDef
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected TCPSelectorDefImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jDefsPackage.Literals.TCP_SELECTOR_DEF;
-  }
-
-  /**
-   * Creates and returns a {@link TCPSelector}.
-   *
-   * @return a new tcp selector instance
-   * @generated NOT
-   */
-  @Override
-  public Object createInstance()
-  {
-    TCPSelector selector = new TCPSelector();
-    return selector;
-  }
-} // TCPSelectorDefImpl
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java
deleted file mode 100644
index c724676b32..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.util;
-
-import org.eclipse.net4j.defs.AcceptorDef;
-import org.eclipse.net4j.defs.BufferPoolDef;
-import org.eclipse.net4j.defs.BufferProviderDef;
-import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
-import org.eclipse.net4j.defs.ConnectorDef;
-import org.eclipse.net4j.defs.HTTPConnectorDef;
-import org.eclipse.net4j.defs.JVMAcceptorDef;
-import org.eclipse.net4j.defs.JVMConnectorDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.ProtocolProviderDef;
-import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
-import org.eclipse.net4j.defs.TCPAcceptorDef;
-import org.eclipse.net4j.defs.TCPConnectorDef;
-import org.eclipse.net4j.defs.TCPSelectorDef;
-import org.eclipse.net4j.util.defs.Def;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
- * method for each class of the model. <!-- end-user-doc -->
- * @see org.eclipse.net4j.defs.Net4jDefsPackage
- * @generated
- */
-public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected static Net4jDefsPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  public Net4jDefsAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Net4jDefsPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc --> This implementation
-   * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
-   * end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  @Override
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-  protected Net4jDefsSwitch<Adapter> modelSwitch = new Net4jDefsSwitch<Adapter>()
-  {
-    @Override
-    public Adapter caseConnectorDef(ConnectorDef object)
-    {
-      return createConnectorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseClientProtocolFactoryDef(ClientProtocolFactoryDef object)
-    {
-      return createClientProtocolFactoryDefAdapter();
-    }
-
-    @Override
-    public Adapter caseTCPConnectorDef(TCPConnectorDef object)
-    {
-      return createTCPConnectorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseAcceptorDef(AcceptorDef object)
-    {
-      return createAcceptorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseTCPAcceptorDef(TCPAcceptorDef object)
-    {
-      return createTCPAcceptorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseJVMAcceptorDef(JVMAcceptorDef object)
-    {
-      return createJVMAcceptorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseJVMConnectorDef(JVMConnectorDef object)
-    {
-      return createJVMConnectorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseHTTPConnectorDef(HTTPConnectorDef object)
-    {
-      return createHTTPConnectorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseTCPSelectorDef(TCPSelectorDef object)
-    {
-      return createTCPSelectorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseServerProtocolFactoryDef(ServerProtocolFactoryDef object)
-    {
-      return createServerProtocolFactoryDefAdapter();
-    }
-
-    @Override
-    public Adapter caseBufferProviderDef(BufferProviderDef object)
-    {
-      return createBufferProviderDefAdapter();
-    }
-
-    @Override
-    public Adapter caseBufferPoolDef(BufferPoolDef object)
-    {
-      return createBufferPoolDefAdapter();
-    }
-
-    @Override
-    public Adapter caseProtocolProviderDef(ProtocolProviderDef object)
-    {
-      return createProtocolProviderDefAdapter();
-    }
-
-    @Override
-    public Adapter caseDef(Def object)
-    {
-      return createDefAdapter();
-    }
-
-    @Override
-    public Adapter defaultCase(EObject object)
-    {
-      return createEObjectAdapter();
-    }
-  };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  @Override
-  public Adapter createAdapter(Notifier target)
-  {
-    return modelSwitch.doSwitch((EObject)target);
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ConnectorDef <em>Connector Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
-   * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.ConnectorDef
-   * @generated
-   */
-  public Adapter createConnectorDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef <em>Client Protocol Factory Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we
-   * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-   * end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.ClientProtocolFactoryDef
-   * @generated
-   */
-  public Adapter createClientProtocolFactoryDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.TCPConnectorDef <em>TCP Connector Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
-   * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-   * end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.TCPConnectorDef
-   * @generated
-   */
-  public Adapter createTCPConnectorDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.AcceptorDef <em>Acceptor Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
-   * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.AcceptorDef
-   * @generated
-   */
-  public Adapter createAcceptorDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.TCPAcceptorDef <em>TCP Acceptor Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
-   * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.TCPAcceptorDef
-   * @generated
-   */
-  public Adapter createTCPAcceptorDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.JVMAcceptorDef <em>JVM Acceptor Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
-   * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.JVMAcceptorDef
-   * @generated
-   */
-  public Adapter createJVMAcceptorDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.JVMConnectorDef <em>JVM Connector Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
-   * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-   * end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.JVMConnectorDef
-   * @generated
-   */
-  public Adapter createJVMConnectorDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.HTTPConnectorDef <em>HTTP Connector Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
-   * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-   * end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.HTTPConnectorDef
-   * @generated
-   */
-  public Adapter createHTTPConnectorDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.TCPSelectorDef <em>TCP Selector Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
-   * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.TCPSelectorDef
-   * @generated
-   */
-  public Adapter createTCPSelectorDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ServerProtocolFactoryDef <em>Server Protocol Factory Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we
-   * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-   * end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.ServerProtocolFactoryDef
-   * @generated
-   */
-  public Adapter createServerProtocolFactoryDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.BufferProviderDef <em>Buffer Provider Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
-   * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-   * end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.BufferProviderDef
-   * @generated
-   */
-  public Adapter createBufferProviderDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.BufferPoolDef <em>Buffer Pool Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
-   * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.BufferPoolDef
-   * @generated
-   */
-  public Adapter createBufferPoolDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef <em>Protocol Provider Def</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
-   * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-   * end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.defs.ProtocolProviderDef
-   * @generated
-   */
-  public Adapter createProtocolProviderDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
-   * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
-   * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   *
-   * @return the new adapter.
-   * @see org.eclipse.net4j.util.defs.Def
-   * @generated
-   */
-  public Adapter createDefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc --> This default implementation returns null. <!--
-   * end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} // Net4jDefsAdapterFactory
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java
deleted file mode 100644
index c9b4d2335f..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * Copyright (c) 2008-2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.util;
-
-import org.eclipse.net4j.defs.AcceptorDef;
-import org.eclipse.net4j.defs.BufferPoolDef;
-import org.eclipse.net4j.defs.BufferProviderDef;
-import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
-import org.eclipse.net4j.defs.ConnectorDef;
-import org.eclipse.net4j.defs.HTTPConnectorDef;
-import org.eclipse.net4j.defs.JVMAcceptorDef;
-import org.eclipse.net4j.defs.JVMConnectorDef;
-import org.eclipse.net4j.defs.Net4jDefsPackage;
-import org.eclipse.net4j.defs.ProtocolProviderDef;
-import org.eclipse.net4j.defs.ServerProtocolFactoryDef;
-import org.eclipse.net4j.defs.TCPAcceptorDef;
-import org.eclipse.net4j.defs.TCPConnectorDef;
-import org.eclipse.net4j.defs.TCPSelectorDef;
-import org.eclipse.net4j.util.defs.Def;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
- * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
- * returned, which is the result of the switch. <!-- end-user-doc -->
- *
- * @see org.eclipse.net4j.defs.Net4jDefsPackage
- * @generated
- */
-public class Net4jDefsSwitch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @generated
-   */
-  protected static Net4jDefsPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @generated
-   */
-  public Net4jDefsSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Net4jDefsPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  public T doSwitch(EObject theEObject)
-  {
-    return doSwitch(theEObject.eClass(), theEObject);
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(EClass theEClass, EObject theEObject)
-  {
-    if (theEClass.eContainer() == modelPackage)
-    {
-      return doSwitch(theEClass.getClassifierID(), theEObject);
-    }
-    else
-    {
-      List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-    case Net4jDefsPackage.CONNECTOR_DEF:
-    {
-      ConnectorDef connectorDef = (ConnectorDef)theEObject;
-      T result = caseConnectorDef(connectorDef);
-      if (result == null)
-      {
-        result = caseDef(connectorDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.CLIENT_PROTOCOL_FACTORY_DEF:
-    {
-      ClientProtocolFactoryDef clientProtocolFactoryDef = (ClientProtocolFactoryDef)theEObject;
-      T result = caseClientProtocolFactoryDef(clientProtocolFactoryDef);
-      if (result == null)
-      {
-        result = caseProtocolProviderDef(clientProtocolFactoryDef);
-      }
-      if (result == null)
-      {
-        result = caseDef(clientProtocolFactoryDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.TCP_CONNECTOR_DEF:
-    {
-      TCPConnectorDef tcpConnectorDef = (TCPConnectorDef)theEObject;
-      T result = caseTCPConnectorDef(tcpConnectorDef);
-      if (result == null)
-      {
-        result = caseConnectorDef(tcpConnectorDef);
-      }
-      if (result == null)
-      {
-        result = caseDef(tcpConnectorDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.ACCEPTOR_DEF:
-    {
-      AcceptorDef acceptorDef = (AcceptorDef)theEObject;
-      T result = caseAcceptorDef(acceptorDef);
-      if (result == null)
-      {
-        result = caseDef(acceptorDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.TCP_ACCEPTOR_DEF:
-    {
-      TCPAcceptorDef tcpAcceptorDef = (TCPAcceptorDef)theEObject;
-      T result = caseTCPAcceptorDef(tcpAcceptorDef);
-      if (result == null)
-      {
-        result = caseAcceptorDef(tcpAcceptorDef);
-      }
-      if (result == null)
-      {
-        result = caseDef(tcpAcceptorDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.JVM_ACCEPTOR_DEF:
-    {
-      JVMAcceptorDef jvmAcceptorDef = (JVMAcceptorDef)theEObject;
-      T result = caseJVMAcceptorDef(jvmAcceptorDef);
-      if (result == null)
-      {
-        result = caseAcceptorDef(jvmAcceptorDef);
-      }
-      if (result == null)
-      {
-        result = caseDef(jvmAcceptorDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.JVM_CONNECTOR_DEF:
-    {
-      JVMConnectorDef jvmConnectorDef = (JVMConnectorDef)theEObject;
-      T result = caseJVMConnectorDef(jvmConnectorDef);
-      if (result == null)
-      {
-        result = caseConnectorDef(jvmConnectorDef);
-      }
-      if (result == null)
-      {
-        result = caseDef(jvmConnectorDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.HTTP_CONNECTOR_DEF:
-    {
-      HTTPConnectorDef httpConnectorDef = (HTTPConnectorDef)theEObject;
-      T result = caseHTTPConnectorDef(httpConnectorDef);
-      if (result == null)
-      {
-        result = caseConnectorDef(httpConnectorDef);
-      }
-      if (result == null)
-      {
-        result = caseDef(httpConnectorDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.TCP_SELECTOR_DEF:
-    {
-      TCPSelectorDef tcpSelectorDef = (TCPSelectorDef)theEObject;
-      T result = caseTCPSelectorDef(tcpSelectorDef);
-      if (result == null)
-      {
-        result = caseDef(tcpSelectorDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.SERVER_PROTOCOL_FACTORY_DEF:
-    {
-      ServerProtocolFactoryDef serverProtocolFactoryDef = (ServerProtocolFactoryDef)theEObject;
-      T result = caseServerProtocolFactoryDef(serverProtocolFactoryDef);
-      if (result == null)
-      {
-        result = caseProtocolProviderDef(serverProtocolFactoryDef);
-      }
-      if (result == null)
-      {
-        result = caseDef(serverProtocolFactoryDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.BUFFER_PROVIDER_DEF:
-    {
-      BufferProviderDef bufferProviderDef = (BufferProviderDef)theEObject;
-      T result = caseBufferProviderDef(bufferProviderDef);
-      if (result == null)
-      {
-        result = caseDef(bufferProviderDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.BUFFER_POOL_DEF:
-    {
-      BufferPoolDef bufferPoolDef = (BufferPoolDef)theEObject;
-      T result = caseBufferPoolDef(bufferPoolDef);
-      if (result == null)
-      {
-        result = caseBufferProviderDef(bufferPoolDef);
-      }
-      if (result == null)
-      {
-        result = caseDef(bufferPoolDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    case Net4jDefsPackage.PROTOCOL_PROVIDER_DEF:
-    {
-      ProtocolProviderDef protocolProviderDef = (ProtocolProviderDef)theEObject;
-      T result = caseProtocolProviderDef(protocolProviderDef);
-      if (result == null)
-      {
-        result = caseDef(protocolProviderDef);
-      }
-      if (result == null)
-      {
-        result = defaultCase(theEObject);
-      }
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Connector Def</em>'. <!-- begin-user-doc -->
-   * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Connector Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseConnectorDef(ConnectorDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'. <!--
-   * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-   * end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseClientProtocolFactoryDef(ClientProtocolFactoryDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>TCP Connector Def</em>'. <!-- begin-user-doc
-   * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>TCP Connector Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseTCPConnectorDef(TCPConnectorDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Acceptor Def</em>'. <!-- begin-user-doc -->
-   * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Acceptor Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseAcceptorDef(AcceptorDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>TCP Acceptor Def</em>'. <!-- begin-user-doc
-   * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>TCP Acceptor Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseTCPAcceptorDef(TCPAcceptorDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>JVM Acceptor Def</em>'. <!-- begin-user-doc
-   * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>JVM Acceptor Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseJVMAcceptorDef(JVMAcceptorDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>JVM Connector Def</em>'. <!-- begin-user-doc
-   * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>JVM Connector Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseJVMConnectorDef(JVMConnectorDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>HTTP Connector Def</em>'. <!-- begin-user-doc
-   * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>HTTP Connector Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseHTTPConnectorDef(HTTPConnectorDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>TCP Selector Def</em>'. <!-- begin-user-doc
-   * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>TCP Selector Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseTCPSelectorDef(TCPSelectorDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Server Protocol Factory Def</em>'. <!--
-   * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-   * end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Server Protocol Factory Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseServerProtocolFactoryDef(ServerProtocolFactoryDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Buffer Provider Def</em>'. <!-- begin-user-doc
-   * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Buffer Provider Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseBufferProviderDef(BufferProviderDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Buffer Pool Def</em>'. <!-- begin-user-doc -->
-   * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Buffer Pool Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseBufferPoolDef(BufferPoolDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'. <!--
-   * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-   * end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseProtocolProviderDef(ProtocolProviderDef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
-   * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseDef(Def object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
-   * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
-   * anyway. <!-- end-user-doc -->
-   *
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  public T defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} // Net4jDefsSwitch
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
deleted file mode 100644
index 39c862fe0a..0000000000
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Andre Dietisheim - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.net4j.defs.util;
-
-import org.eclipse.net4j.FactoriesProtocolProvider;
-import org.eclipse.net4j.defs.Net4jDefsFactory;
-import org.eclipse.net4j.defs.ProtocolProviderDef;
-import org.eclipse.net4j.defs.TCPConnectorDef;
-import org.eclipse.net4j.protocol.IProtocolProvider;
-import org.eclipse.net4j.tcp.ITCPConnector;
-import org.eclipse.net4j.util.defs.Net4jUtilDefsFactory;
-import org.eclipse.net4j.util.factory.IFactory;
-
-import java.util.Iterator;
-import java.util.List;
-
-public class Net4jDefsUtil
-{
-  /**
-   * Creates the factories protocol provider. The current implementation uses a {@link FactoriesProtocolProvider}.
-   *
-   * @param clientProtocolFactoryDef
-   *          the client protocol factory definition
-   * @return the protocol provider
-   */
-  public static <PPD extends ProtocolProviderDef> IProtocolProvider createFactoriesProtocolProvider(
-      List<PPD> protocolFactoryDef)
-  {
-    FactoriesProtocolProvider protocolProvider = new FactoriesProtocolProvider();
-    for (Iterator<PPD> iterator = protocolFactoryDef.iterator(); iterator.hasNext();)
-    {
-      PPD protocolProviderDef = iterator.next();
-      protocolProvider.addFactory((IFactory)protocolProviderDef.getInstance());
-    }
-    return protocolProvider;
-  }
-
-  public static TCPConnectorDef createTCPConnectorDef(final String host)
-  {
-    return createTCPConnectorDef(host, ITCPConnector.DEFAULT_PORT);
-  }
-
-  public static TCPConnectorDef createTCPConnectorDef(final String host, final int port)
-  {
-    TCPConnectorDef tcpConnectorDef = Net4jDefsFactory.eINSTANCE.createTCPConnectorDef();
-
-    tcpConnectorDef.setHost(host);
-    tcpConnectorDef.setPort(port);
-    tcpConnectorDef.setBufferProvider(Net4jDefsFactory.eINSTANCE.createBufferPoolDef());
-    tcpConnectorDef.setExecutorService(Net4jUtilDefsFactory.eINSTANCE.createThreadPoolDef());
-    tcpConnectorDef.setTcpSelectorDef(Net4jDefsFactory.eINSTANCE.createTCPSelectorDef());
-
-    return tcpConnectorDef;
-  }
-}