This commit was manufactured by cvs2svn to create branch

'simon_pre_0_9'.

1631 files changed, 0 insertions, 137337 deletions

diff --git a/plugins/.cvsignore b/plugins/.cvsignore
deleted file mode 100644
index 3a4edf690c..0000000000
--- a/plugins/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
diff --git a/plugins/org.eclipse.emf.cdo.doc/.classpath b/plugins/org.eclipse.emf.cdo.doc/.classpath
deleted file mode 100644
index 91432ac3fa..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/.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=""/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.doc/.cvsignore b/plugins/org.eclipse.emf.cdo.doc/.cvsignore
deleted file mode 100644
index a32fe23c60..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-*.jar
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.doc/.project b/plugins/org.eclipse.emf.cdo.doc/.project
deleted file mode 100644
index 9b22cef109..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.cdo.doc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-	    <nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7a231641c1..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:45:34 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4270887083..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:45:34 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 63f0444025..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:08:52 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index cf70a33e7b..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:08:52 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
deleted file mode 100644
index 8e147738ae..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.doc; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.cdo.doc/about.html b/plugins/org.eclipse.emf.cdo.doc/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/about.html
+++ /dev/null
@@ -1,28 +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.emf.cdo.doc/about.ini b/plugins/org.eclipse.emf.cdo.doc/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/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.emf.cdo.doc/about.mappings b/plugins/org.eclipse.emf.cdo.doc/about.mappings
deleted file mode 100644
index 7d795dc23a..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/about.mappings
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file 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@
diff --git a/plugins/org.eclipse.emf.cdo.doc/about.properties b/plugins/org.eclipse.emf.cdo.doc/about.properties
deleted file mode 100644
index 2e542564c3..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 = CDO Documentation (Incubation)
-featureText = CDO Documentation\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/CDO
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.doc/build.properties b/plugins/org.eclipse.emf.cdo.doc/build.properties
deleted file mode 100644
index 847b666cf2..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-custom = true
diff --git a/plugins/org.eclipse.emf.cdo.doc/build.xml b/plugins/org.eclipse.emf.cdo.doc/build.xml
deleted file mode 100644
index 8f5a0a6ea9..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/build.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.emf.cdo.doc" default="build.jars" basedir=".">
-
-	<!-- Plug-in version.  This is a HACK.  Do not forget to update. -->
-	<property name="pluginVersion" value="0.8.0"/>
-
-	<property name="plugin" value="org.eclipse.emf.cdo"/>
-	<property name="docPlugin" value="org.eclipse.emf.cdo.doc"/>
-
-	<property name="filesToInclude" value="META-INF/,about.*,*.gif,*.png,plugin.*,doc.zip,toc.xml,index/**"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="true"/>
-	<property name="compilerArg" value=""/>
-
-	<echo message="Set javacSource and javacTarget = 1.5"/>
-	<property name="javacSource" value="1.5" />
-	<property name="javacTarget" value="1.5" />
-	
-	<path id="bc">
-		<fileset dir="${java.home}/lib">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="bc" />
-
-	<!-- new 060508 to make build work when using JDK1.5 source/target -->
-	<echo message="Set J2SE-1.5 = ${bootclasspath}"/>
-	<property name="J2SE-1.5" value="${bootclasspath}"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"><isset property="J2SE-1.5"/></condition>
-	<condition property="bundleJavacSource" value="1.5"><isset property="J2SE-1.5"/></condition>
-	<condition property="bundleJavacTarget" value="1.5"><isset property="J2SE-1.5"/></condition>
-
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/${docPlugin}">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: ${plugin} for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<zip destfile="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.jar" basedir="${temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}" filesonly="false" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: ${docPlugin}.">
-		<!-- Execute a shell script that will create an ant javadoc script and then run it for us -->
-		<exec executable="sh">
-			<arg value="build/antJavadoc.sh"/>
-			<arg value="${eclipse.home}/../eclipse"/>
-		</exec>
-		
-		<antcall target="build.index"/>
-		
-		<!-- Zip up all of the documentation artifacts - references(including javadoc), images, tutorials, etc. -->
-		<zip destfile="doc.zip" compress="true">
-			<!-- Add new folders for documentation zip here. -->
-			<zipfileset dir="references" prefix="references" excludes="**/impl,**/impl/**"/>
-			<zipfileset dir="images" prefix="images"/>
-			<zipfileset dir="tutorials" prefix="tutorials"/>
-		</zip>
-	</target>
-
-	<target name="build.index" depends="init" description="Builds search index for the plug-in" if="eclipse.running">
-		<help.buildHelpIndex manifest="plugin.xml" destination="."/>
-	</target>
-	
-	<target name="build.sources" depends="init">
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}"/>
-		<copy todir="${destination.temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}" includes="${filesToInclude}"/>
-		</copy>
-		<eclipse.versionReplacer 
-			path="${destination.temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}" 
-			version="${pluginVersion}.${forceContextQualifier}"/>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: ${docPlugin} of all the zips, jars and logs created.">
-		<delete file="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.jar"/>
-		<delete file="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.zip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: ${docPlugin}.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
-		</delete>
-		<zip destfile="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-</project>
diff --git a/plugins/org.eclipse.emf.cdo.doc/build/antJavadoc.sh b/plugins/org.eclipse.emf.cdo.doc/build/antJavadoc.sh
deleted file mode 100644
index 951912b392..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/build/antJavadoc.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/sh
-
-# BEGIN CUSTOMIZATIONS
-
-# The plugin name
-pluginName="org.eclipse.emf.cdo"; 
-
-# string labels for javadoc content
-windowTitle="CDO Javadoc";
-groupTitle="CDO";
-
-# files to exclude from javadoc process - use Ant syntax
-javadocExclusions="<exclude name=\"**/internal/**\"/> <exclude name=\"**/examples/**\"/> <exclude name=\"**/tests/**\"/>";
-
-# use 1.5
-export JAVA_HOME=/opt/sun-java2-5.0
-
-# END CUSTOMIZATIONS
-
-##########################################################################
-
-debug=0; if [ $debug -gt 0 ]; then echo "[antJd] debug: "$debug; fi
-
-if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
-export PATH=${PATH}:${ANT_HOME}/bin
-
-# current directory - all but the name of this script, no trailing slash
-currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [ $debug -gt 0 ]; then echo "[antJd] currentPath: "$currentPath; fi
-
-# path to $buildID/eclipse/plugins, no trailing slash
-pluginPath=${currentPath%/$pluginName*}; if [ $debug -gt 0 ]; then echo "[antJd] pluginName: "$pluginName; echo "[antJd] pluginPath: "$pluginPath; fi
-
-# ant script to create and then execute
-antScript=$currentPath"/javadoc.xml"; if [ $debug -gt 0 ]; then echo "[antJd] antScript: "$antScript; fi
-
-# The eclipse directory
-eclipseDir=`cd $1; echo $PWD`; if [ $debug -gt 0 ]; then echo "[antJd] eclipseDir: "$eclipseDir; fi
-
-# The destination directory
-destDir=$currentPath/../references/javadoc; mkdir -p $destDir; destDir=`cd $destDir; echo $PWD`; # resolve relative path
-if [ $debug -gt 0 ]; then echo "[antJd] destDir: "$destDir; fi
-
-hasToken=`grep -c "@plugin@" $antScript".template"`;
-if [ $hasToken -gt 0  ]; then
-	srcDir=$pluginPath/$pluginName.source/src; if [ $debug -gt 0 ]; then echo "[antJd] srcDir: "$srcDir; fi
-	if [ -d "$srcDir" ]; then
-		if [ `find $srcDir -name "*.java" | grep -c .` -eq 0 ]; then # must unpack zips first
-			if [ $debug -gt 0 ]; then echo "[antJd] Unpacking *src.zip"; fi
-			for f in `find $srcDir -name "*src.zip"`; do 
-				if [ $debug -gt 1 ]; then echo "[antJd] Unpack $f"; fi
-				unzip -q -d $srcDir $f; 
-			done
-		fi
-		if [ $debug -gt 0 ]; then echo "[antJd] *.java in srcDir: "; echo "-----------------"; echo `find $srcDir -type f -name '*.java'`; echo "-----------------"; fi
-		packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[ ]*//g' | dos2unix | sort | uniq | xargs | sed -e 's/ /:/g'`;
-		if [ $debug -gt 1 ]; then echo "[antJd] packages1: "$packages; fi
-		packages=`echo $packages | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`; # slash escape
-		if [ $debug -gt 1 ]; then echo "[antJd] packages2: "$packages; fi
-		cat $antScript.template | sed -e "s/\@plugin\@/$packages/g" > $antScript.template.tmp;
-	else 
-		echo "[antJd] ERROR! "$srcDir" does not exist!";
-		exit 1;
-  	fi
-else 
-	echo "[antJd] ERROR! "$currentPath"/javadoc.xml.template does not contain token @plugin@!";
-	exit 1;
-fi
-
-# Finds plugins in the Workspace:
-pluginDirs=`find $pluginPath -name "${pluginName}*" -maxdepth 1 -type d -printf '%T@ %p\n' | sort -n | cut -f2 -d' '`; 
-if [ $debug -gt 0 ]; then 
-	echo "[antJd] pluginDirs:"; 
-	for pluginDir in $pluginDirs; do echo "[antJd]   "$pluginDir; done
-fi
-
-### TODO?: missing emf/sdo/xsd plugins in $eclipseDir - need to copy them over or reference source so that all classes/packages (and thus @links) can be resolved
-
-# All the jars in the plugins directory
-classpath="."`find $eclipseDir/plugins -name "*.jar" -printf ":%p"`; if [ $debug -gt 0 ]; then echo "[antJd] classpath: "$classpath; fi
-
-# Calculates the packagesets and the calls to copyDocFiles
-packagesets="";
-copydocfiles="";
-for pluginDir in $pluginDirs; do
-	pluginDir=`echo $pluginDir | sed -e 's/\/runtime$//g'`;
-	srcDir=$pluginDir/src;
-	if [ $debug -gt 0 ]; then echo "[antJd] srcDir: "$srcDir; fi
-	if [ -d "$srcDir" ]; then
-		# define what to include when javadoc'ing here:
-		packagesets=$packagesets"<packageset dir=\"$srcDir\"> ";
-		packagesets=$packagesets"<exclude name=\"$srcDir/**/doc-files/**\"/> ";
-		packagesets=$packagesets""$javadocExclusions;
-		packagesets=$packagesets"</packageset>";
-		copydocfiles=$copydocfiles"<copyDocFiles pluginDir=\"$pluginDir\"/>";
-	fi
-done
-if [ $debug -gt 0 ]; then 
-	echo "[antJd] packagesets:";	echo $packagesets;
-	echo "[antJd] copydocfiles:";	echo $copydocfiles;
-fi
-	
-# Finds the proper org.eclipse.platform.doc.isv jar
-docjar=`find $eclipseDir/plugins/ -name "org.eclipse.platform.doc.isv*.jar" -printf "%f"`; if [ $debug -gt 1 ]; then echo "[antJd] docjar: "$docjar; fi
-
-if [ -f $antScript.template ]; then
-	true;
-else
-	cp $antScript.template $antScript.template.tmp;
-fi
-
-# do replacements in template
-if [ $debug -gt 1 ]; then echo "[antJd] Replace @packagesets@ in the template ..."; fi
-packagesets=`echo $packagesets | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`;
-sed -e "s/\@packagesets\@/${packagesets}/g" $antScript.template.tmp > $antScript.template.tmp2;
-
-if [ $debug -gt 1 ]; then echo "[antJd] Replace @copydocfiles@ in the template ..."; fi
-copydocfiles=`echo $copydocfiles | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`;
-sed -e "s/\@copydocfiles\@/${copydocfiles}/g" $antScript.template.tmp2 > $antScript;
-
-#run ant to do javadoc build
-ant -f $antScript \
-	-DdestDir="$destDir" \
-	-Dclasspath="$classpath" \
-	-DeclipseDir="$eclipseDir" \
-	-Ddocjar="$docjar" \
-	-DwindowTitle="$windowTitle" \
-	-DgroupTitle="$groupTitle" \
-	-Doverview="$currentPath/overview.html";
-
-# Clean up templates
-rm -f $antScript $antScript.template.tmp $antScript.template.tmp2;
diff --git a/plugins/org.eclipse.emf.cdo.doc/build/javadoc.xml.template b/plugins/org.eclipse.emf.cdo.doc/build/javadoc.xml.template
deleted file mode 100644
index b9726f85dd..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/build/javadoc.xml.template
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Plugin Javadoc" default="javadoc">
-	<property name="destDir"    value="doc"/>
-	<property name="classpath"  value="bin"/>
-	<property name="overview"   value="build/overview.html"/>
-	<property name="eclipseDir" value="."/>
-	<property name="docjar" value="org.eclipse.platform.doc.isv.jar"/>
-	
-	<!-- other properties that must be passed to this script include:
-		 windowTitle
-		 groupTitle 
-	-->
-	
-	<property environment="env"/>
-	<property name="javaHome" value="${env.JAVA_HOME}"/>
-	
-	<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
-	<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
-
-	<!-- TODO Enable linking to the platform javadoc -->
-	<!-- <target name="extractPlatformJavadoc" unless="platformJavadocExists">
-		<exec executable="find">
-		   <arg value="${eclipseDir}/.."/>
-		   <arg value="-type"/>
-		   <arg value="d"/>
-		   <arg value="-name"/>
-		   <arg value="javadoc"/>
-		</exec>
-		<unzip src="${eclipseDir}/@docjar@" dest="${javadoc.link.location}/platform/"/>
-	</target> -->
-
-	<!-- TODO Enable linking to the platform javadoc -->
-	<!-- <target name="javadoc" depends="extractPlatformJavadoc"> -->
-	
-	<target name="javadoc">
-		<javadoc 
-			destdir="${destDir}" 
-			classpath="${classpath}"
-			overview="${overview}"
-
-			windowtitle="${windowTitle}"
-			footer="Copyright (c) 2004 - 2008 Eike Stepper, Germany.&lt;br&gt; All Rights Reserved."
-
-			access="protected" 
-			additionalparam="-breakiterator -tag model:X -tag generated:X -tag ordered:X"
-			author="false"
-			breakiterator="true"
-			charset="UTF-8"
-			docencoding="UTF-8"
-			nodeprecated="false"
-			nodeprecatedlist="false" 
-			noindex="false" 
-			nonavbar="false" 
-			notree="false" 
-			source="1.5"
-			splitindex="true" 
-			use="true" 
-			version="true"> 
-				<arg value="-J-Xmx180m"/>
-				
-				<link offline="true" href="http://java.sun.com/j2se/1.4/docs/api/" packagelistLoc="${javaHome}/docs/api/"/>
-				<!-- TODO Enable link to platform documentation -->
-				<!-- <link offline="true" href="/help/topic/org.eclipse.platform.doc.isv/reference/api/" packagelistLoc="${javadoc.link.location}/platform/reference/api/"/> -->
-				
-				<tag name="ignore"     description="ignore" enabled="false"/>
-				<tag name="generated"  description="ignore" enabled="false"/>
-				<tag name="model"      description="ignore" enabled="false"/>
-				<tag name="modifiable" description="ignore" enabled="false"/>
-				<tag name="extends"    description="ignore" enabled="false"/>
-				<tag name="implements" description="ignore" enabled="false"/>
-				<tag name="ordered"    description="ignore" enabled="false"/>
-
-				<!-- If you add a @ plugin @ below, don't forget to update the antjavadoc.sh file -->
-
-				<group title="${groupTitle}" packages="@plugin@"/>
-				
-				<!-- If you add a @ plugin @ above, don't forget to update the antjavadoc.sh file -->
-
-				@packagesets@
-				
-		</javadoc>
-		
-		<!-- make sure the doc-files are copied -->
-		<macrodef name="copyDocFiles">
-			<attribute name="pluginDir"/>
-			<sequential>
-				<copy todir="${destDir}" failonerror="false">
-				        <fileset dir="@{pluginDir}/src" includes="**/doc-files/**"/>
-				</copy>		
-			</sequential>
-		</macrodef>
-
-		@copydocfiles@
-
-	</target>
-</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.doc/build/overview.html b/plugins/org.eclipse.emf.cdo.doc/build/overview.html
deleted file mode 100644
index 32c3292c73..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/build/overview.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<!--
-/**
- * <copyright>
- *
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- *
- * </copyright>
- *
- */
--->
-</head>
-<meta http-equiv="Content-Type"
-content="text/html; charset=utf-8" />
-<body bgcolor="white">
-<!--
-This plug-in provides 
-an <a href="org/eclipse/cdo/helper/package-summary.html#details">API</a>
-for cdo.
--->
-<!-- The summary links point here when the contents are "copied". -->
-<!--
-<a name="details"></a>
-Please refer to 
-the
-<a href="org/eclipse/cdo/helper/package-summary.html#details">org.eclipse.emf.cdo.helper</a> 
-and
-<a href="org/eclipse/cdo/parser/package-summary.html#details">org.eclipse.emf.cdo.parser</a> 
-package documentation for API details.
--->
-</body>
-</html>
diff --git a/plugins/org.eclipse.emf.cdo.doc/copyright.txt b/plugins/org.eclipse.emf.cdo.doc/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.doc/epl-v10.html b/plugins/org.eclipse.emf.cdo.doc/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.doc/images/.cvsignore b/plugins/org.eclipse.emf.cdo.doc/images/.cvsignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/images/.cvsignore
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.doc/license.html b/plugins/org.eclipse.emf.cdo.doc/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.doc/modeling32.png b/plugins/org.eclipse.emf.cdo.doc/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.doc/plugin.properties b/plugins/org.eclipse.emf.cdo.doc/plugin.properties
deleted file mode 100644
index 5dff58a193..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Documentation (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.doc/plugin.xml b/plugins/org.eclipse.emf.cdo.doc/plugin.xml
deleted file mode 100644
index fdc5998935..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.help.toc">
-      <toc file="toc.xml" primary="true"/>
-      <index path="index"/>
-   </extension>
-   
-</plugin>
-
diff --git a/plugins/org.eclipse.emf.cdo.doc/references/.cvsignore b/plugins/org.eclipse.emf.cdo.doc/references/.cvsignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/references/.cvsignore
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.doc/toc.xml b/plugins/org.eclipse.emf.cdo.doc/toc.xml
deleted file mode 100644
index 224049aba0..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/toc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="CDO Table of Contents">
-	<topic label="Javadoc" href="references/javadoc/index.html"/>
-</toc>
diff --git a/plugins/org.eclipse.emf.cdo.doc/tutorials/.cvsignore b/plugins/org.eclipse.emf.cdo.doc/tutorials/.cvsignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/tutorials/.cvsignore
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/.classpath b/plugins/org.eclipse.emf.cdo.edit/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/.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.emf.cdo.edit/.cvsignore b/plugins/org.eclipse.emf.cdo.edit/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.emf.cdo.edit/.project b/plugins/org.eclipse.emf.cdo.edit/.project
deleted file mode 100644
index 4cefbd7111..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.cdo.edit</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8ebc8d8452..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:45:49 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 3114e9abc8..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:45:49 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 5ef17555f2..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:09:00 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index b3588aec81..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:09:00 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 8cccc521ee..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.edit; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.emf.cdo.eresource.provider.EresourceEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo;visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.edit;version="0.8.0",
- org.eclipse.emf.cdo.eresource.provider;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.edit/about.html b/plugins/org.eclipse.emf.cdo.edit/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/about.html
+++ /dev/null
@@ -1,28 +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.emf.cdo.edit/build.properties b/plugins/org.eclipse.emf.cdo.edit/build.properties
deleted file mode 100644
index 109227717d..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.emf.cdo.edit/copyright.txt b/plugins/org.eclipse.emf.cdo.edit/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.edit/epl-v10.html b/plugins/org.eclipse.emf.cdo.edit/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EAnnotation.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EAnnotation.gif
deleted file mode 100644
index accf314bb3..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EAnnotation.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EAttribute.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EAttribute.gif
deleted file mode 100644
index c5e047b325..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EAttribute.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EClass.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EClass.gif
deleted file mode 100644
index 4c29533ccf..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EClass.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EDataType.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EDataType.gif
deleted file mode 100644
index d523a96589..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EDataType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EEnum.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EEnum.gif
deleted file mode 100644
index 6d944d72a8..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EEnum.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EEnumLiteral.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EEnumLiteral.gif
deleted file mode 100644
index 3052dce139..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EEnumLiteral.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EFactory.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EFactory.gif
deleted file mode 100644
index b5ff106252..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EFactory.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EGenericType.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EGenericType.gif
deleted file mode 100644
index 1cd7fa09f3..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EGenericType.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EObject.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EObject.gif
deleted file mode 100644
index 1623e88e3d..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EObject.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EOperation.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EOperation.gif
deleted file mode 100644
index 6844bf8a90..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EOperation.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EPackage.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EPackage.gif
deleted file mode 100644
index 6d944d72a8..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EPackage.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EParameter.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EParameter.gif
deleted file mode 100644
index 4ae0144c11..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EParameter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EReference.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EReference.gif
deleted file mode 100644
index 19b38abf6c..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_EReference.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_ETypeParameter.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_ETypeParameter.gif
deleted file mode 100644
index b5ff106252..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResource_contents_ETypeParameter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif
deleted file mode 100644
index a3908bcf7b..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.edit/license.html b/plugins/org.eclipse.emf.cdo.edit/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.edit/plugin.properties
deleted file mode 100644
index 38ba0af5e2..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/plugin.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Edit Support (Incubation)
-providerName = Eclipse.org
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_CDOResource_type = CDO Resource
-_UI_Unknown_type = Object
-
-_UI_Unknown_datatype= Value
-
-_UI_CDOResource_resourceSet_feature = Resource Set
-_UI_CDOResource_uRI_feature = URI
-_UI_CDOResource_contents_feature = Contents
-_UI_CDOResource_modified_feature = Modified
-_UI_CDOResource_loaded_feature = Loaded
-_UI_CDOResource_trackingModification_feature = Tracking Modification
-_UI_CDOResource_errors_feature = Errors
-_UI_CDOResource_warnings_feature = Warnings
-_UI_CDOResource_path_feature = Path
-_UI_Unknown_feature = Unspecified
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
-_UI_CDOResource_timeStamp_feature = Time Stamp
diff --git a/plugins/org.eclipse.emf.cdo.edit/plugin.xml b/plugins/org.eclipse.emf.cdo.edit/plugin.xml
deleted file mode 100644
index f6f11a0b28..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/plugin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-    
-  <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-    <factory 
-       uri = "http://www.eclipse.org/emf/CDO/resource/1.0.0" 
-       class = "org.eclipse.emf.cdo.eresource.provider.EresourceItemProviderAdapterFactory" 
-       supportedTypes = 
-         "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-          org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-          org.eclipse.emf.edit.provider.ITreeItemContentProvider
-          org.eclipse.emf.edit.provider.IItemLabelProvider
-          org.eclipse.emf.edit.provider.IItemPropertySource" />
-  </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
deleted file mode 100644
index 0bd668db26..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.edit;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class CDOItemProviderAdapter extends ItemProviderAdapter
-{
-  public CDOItemProviderAdapter(AdapterFactory adapterFactory)
-  {
-    super(adapterFactory);
-  }
-
-  @Override
-  @SuppressWarnings("deprecation")
-  public boolean hasChildren(Object object)
-  {
-    Collection<? extends EStructuralFeature> anyChildrenFeatures = getChildrenFeatures(object);
-    if (anyChildrenFeatures.isEmpty())
-    {
-      anyChildrenFeatures = getChildrenReferences(object);
-    }
-
-    EObject eObject = (EObject)object;
-    for (EStructuralFeature feature : anyChildrenFeatures)
-    {
-      if (feature.isMany())
-      {
-        List<?> children = (List<?>)eObject.eGet(feature);
-        if (!children.isEmpty())
-        {
-          return true;
-        }
-      }
-      else
-      {
-        if (eObject.eIsSet(feature))
-        {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
deleted file mode 100644
index 02d2dad4b3..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.eresource.provider;
-
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.eresource.EresourcePackage;
-import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResource} object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class CDOResourceItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
-{
-  /**
-   * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public CDOResourceItemProvider(AdapterFactory adapterFactory)
-  {
-    super(adapterFactory);
-  }
-
-  /**
-   * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-  {
-    if (itemPropertyDescriptors == null)
-    {
-      super.getPropertyDescriptors(object);
-
-      addURIPropertyDescriptor(object);
-      addModifiedPropertyDescriptor(object);
-      addLoadedPropertyDescriptor(object);
-      addTrackingModificationPropertyDescriptor(object);
-      addTimeStampPropertyDescriptor(object);
-      addPathPropertyDescriptor(object);
-    }
-    return itemPropertyDescriptors;
-  }
-
-  /**
-   * This adds a property descriptor for the URI feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addURIPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_uRI_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResource_uRI_feature", "_UI_CDOResource_type"),
-        EresourcePackage.Literals.CDO_RESOURCE__URI, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
-  }
-
-  /**
-   * This adds a property descriptor for the Modified feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addModifiedPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_modified_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResource_modified_feature", "_UI_CDOResource_type"),
-        EresourcePackage.Literals.CDO_RESOURCE__MODIFIED, false, false, false,
-        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-  }
-
-  /**
-   * This adds a property descriptor for the Loaded feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addLoadedPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_loaded_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResource_loaded_feature", "_UI_CDOResource_type"),
-        EresourcePackage.Literals.CDO_RESOURCE__LOADED, false, false, false,
-        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-  }
-
-  /**
-   * This adds a property descriptor for the Tracking Modification feature. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   */
-  protected void addTrackingModificationPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_trackingModification_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_CDOResource_trackingModification_feature",
-            "_UI_CDOResource_type"), EresourcePackage.Literals.CDO_RESOURCE__TRACKING_MODIFICATION, true, false, false,
-        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-  }
-
-  /**
-   * This adds a property descriptor for the Time Stamp feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addTimeStampPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_timeStamp_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResource_timeStamp_feature", "_UI_CDOResource_type"),
-        EresourcePackage.Literals.CDO_RESOURCE__TIME_STAMP, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
-  }
-
-  /**
-   * This adds a property descriptor for the Path feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addPathPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_CDOResource_path_feature"), getString(
-        "_UI_PropertyDescriptor_description", "_UI_CDOResource_path_feature", "_UI_CDOResource_type"),
-        EresourcePackage.Literals.CDO_RESOURCE__PATH, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
-  }
-
-  /**
-   * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-   * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-   * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-  {
-    if (childrenFeatures == null)
-    {
-      super.getChildrenFeatures(object);
-      childrenFeatures.add(EresourcePackage.Literals.CDO_RESOURCE__CONTENTS);
-    }
-    return childrenFeatures;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EStructuralFeature getChildFeature(Object object, Object child)
-  {
-    // Check the type of the specified child object and return the proper feature to use for
-    // adding (see {@link AddCommand}) it as a child.
-
-    return super.getChildFeature(object, child);
-  }
-
-  /**
-   * This returns CDOResource.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object getImage(Object object)
-  {
-    return overlayImage(object, getResourceLocator().getImage("full/obj16/CDOResource"));
-  }
-
-  /**
-   * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated NOT
-   */
-  @Override
-  public String getText(Object object)
-  {
-    CDOResource resource = (CDOResource)object;
-    return CDOProtocolConstants.PROTOCOL_NAME + ":" + resource.getPath();
-  }
-
-  /**
-   * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
-   * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void notifyChanged(Notification notification)
-  {
-    updateChildren(notification);
-
-    switch (notification.getFeatureID(CDOResource.class))
-    {
-    case EresourcePackage.CDO_RESOURCE__RESOURCE_SET:
-    case EresourcePackage.CDO_RESOURCE__URI:
-    case EresourcePackage.CDO_RESOURCE__MODIFIED:
-    case EresourcePackage.CDO_RESOURCE__LOADED:
-    case EresourcePackage.CDO_RESOURCE__TRACKING_MODIFICATION:
-    case EresourcePackage.CDO_RESOURCE__ERRORS:
-    case EresourcePackage.CDO_RESOURCE__WARNINGS:
-    case EresourcePackage.CDO_RESOURCE__TIME_STAMP:
-    case EresourcePackage.CDO_RESOURCE__PATH:
-      fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-      return;
-    case EresourcePackage.CDO_RESOURCE__CONTENTS:
-      fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-      return;
-    }
-    super.notifyChanged(notification);
-  }
-
-  /**
-   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
-   * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated NOT
-   */
-  @Override
-  protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-  {
-  }
-
-  /**
-   * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public ResourceLocator getResourceLocator()
-  {
-    return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-  }
-
-}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java
deleted file mode 100644
index 6ca82c8ffb..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.eresource.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-/**
- * This is the central singleton for the Eresource edit plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public final class EresourceEditPlugin extends EMFPlugin
-{
-  /**
-   * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final EresourceEditPlugin INSTANCE = new EresourceEditPlugin();
-
-  /**
-   * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private static Implementation plugin;
-
-  /**
-   * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EresourceEditPlugin()
-  {
-    super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, });
-  }
-
-  /**
-   * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the singleton instance.
-   * @generated
-   */
-  @Override
-  public ResourceLocator getPluginResourceLocator()
-  {
-    return plugin;
-  }
-
-  /**
-   * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the singleton instance.
-   * @generated
-   */
-  public static Implementation getPlugin()
-  {
-    return plugin;
-  }
-
-  /**
-   * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static class Implementation extends EclipsePlugin
-  {
-    /**
-     * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public Implementation()
-    {
-      super();
-
-      // Remember the static instance.
-      //
-      plugin = this;
-    }
-  }
-
-}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
deleted file mode 100644
index c6cf41d0ae..0000000000
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.eresource.provider;
-
-import org.eclipse.emf.cdo.eresource.EresourcePackage;
-import org.eclipse.emf.cdo.eresource.util.EresourceAdapterFactory;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The adapters generated by this
- * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable, IChildCreationExtender
-{
-  /**
-   * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  protected ComposedAdapterFactory parentAdapterFactory;
-
-  /**
-   * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-  /**
-   * This helps manage the child creation extenders. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
-      EresourceEditPlugin.INSTANCE, EresourcePackage.eNS_URI);
-
-  /**
-   * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-  /**
-   * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EresourceItemProviderAdapterFactory()
-  {
-    supportedTypes.add(IEditingDomainItemProvider.class);
-    supportedTypes.add(IStructuredItemContentProvider.class);
-    supportedTypes.add(ITreeItemContentProvider.class);
-    supportedTypes.add(IItemLabelProvider.class);
-    supportedTypes.add(IItemPropertySource.class);
-  }
-
-  /**
-   * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.eresource.CDOResource} instances. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected CDOResourceItemProvider cdoResourceItemProvider;
-
-  /**
-   * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResource}. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Adapter createCDOResourceAdapter()
-  {
-    if (cdoResourceItemProvider == null)
-    {
-      cdoResourceItemProvider = new CDOResourceItemProvider(this);
-    }
-
-    return cdoResourceItemProvider;
-  }
-
-  /**
-   * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public ComposeableAdapterFactory getRootAdapterFactory()
-  {
-    return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-  }
-
-  /**
-   * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
-  {
-    this.parentAdapterFactory = parentAdapterFactory;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean isFactoryForType(Object type)
-  {
-    return supportedTypes.contains(type) || super.isFactoryForType(type);
-  }
-
-  /**
-   * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Adapter adapt(Notifier notifier, Object type)
-  {
-    return super.adapt(notifier, this);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object adapt(Object object, Object type)
-  {
-    if (isFactoryForType(type))
-    {
-      Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class) || (((Class<?>)type).isInstance(adapter)))
-      {
-        return adapter;
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public List<IChildCreationExtender> getChildCreationExtenders()
-  {
-    return childCreationExtenderManager.getChildCreationExtenders();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain)
-  {
-    return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public ResourceLocator getResourceLocator()
-  {
-    return childCreationExtenderManager;
-  }
-
-  /**
-   * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void addListener(INotifyChangedListener notifyChangedListener)
-  {
-    changeNotifier.addListener(notifyChangedListener);
-  }
-
-  /**
-   * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void removeListener(INotifyChangedListener notifyChangedListener)
-  {
-    changeNotifier.removeListener(notifyChangedListener);
-  }
-
-  /**
-   * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  public void fireNotifyChanged(Notification notification)
-  {
-    changeNotifier.fireNotifyChanged(notification);
-
-    if (parentAdapterFactory != null)
-    {
-      parentAdapterFactory.fireNotifyChanged(notification);
-    }
-  }
-
-  /**
-   * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void dispose()
-  {
-    if (cdoResourceItemProvider != null) cdoResourceItemProvider.dispose();
-  }
-
-}
diff --git a/plugins/org.eclipse.emf.cdo.examples/.classpath b/plugins/org.eclipse.emf.cdo.examples/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/.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.emf.cdo.examples/.cvsignore b/plugins/org.eclipse.emf.cdo.examples/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.emf.cdo.examples/.options b/plugins/org.eclipse.emf.cdo.examples/.options
deleted file mode 100644
index 8054983edb..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.emf.cdo.examples/debug = true
diff --git a/plugins/org.eclipse.emf.cdo.examples/.project b/plugins/org.eclipse.emf.cdo.examples/.project
deleted file mode 100644
index e04447b6e5..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.cdo.examples</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e81264b48a..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:46:00 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 199978c3fe..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,66 +0,0 @@
-#Sat Feb 23 10:46:00 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-internal.default.compliance=default
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 38bd7eebd6..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:09:08 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index fff614c50c..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:09:08 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
deleted file mode 100644
index 193e388ba6..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.emf.cdo.examples;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.emf.cdo.internal.examples.bundle.OM$Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.cdo;visibility:=reexport,
- org.eclipse.net4j.tcp;visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples/about.html b/plugins/org.eclipse.emf.cdo.examples/about.html
deleted file mode 100644
index f2decc3a0d..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/about.html
+++ /dev/null
@@ -1,70 +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>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-
-  <head>
-
-    <meta content="text/html; charset=ISO-8859-1"
-     http-equiv="Content-Type"/>
-
-    <title>About</title>
-
-  </head>
-
-  <body lang="EN-US">
-
-    <h2>About This Content</h2>
-
-    <p>May 17, 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&apos;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.</p>
-
-  </body>
-
-</html>
-
diff --git a/plugins/org.eclipse.emf.cdo.examples/about.ini b/plugins/org.eclipse.emf.cdo.examples/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/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.emf.cdo.examples/about.mappings b/plugins/org.eclipse.emf.cdo.examples/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/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.emf.cdo.examples/about.properties b/plugins/org.eclipse.emf.cdo.examples/about.properties
deleted file mode 100644
index 4503a6bc72..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 = CDO Examples (Incubation)
-featureText = CDO Examples \n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/CDO
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.examples/build.properties b/plugins/org.eclipse.emf.cdo.examples/build.properties
deleted file mode 100644
index 7e27ae404a..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.properties,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png,\
-               .
-source.. = src/
-jars.compile.order = examples.jar
diff --git a/plugins/org.eclipse.emf.cdo.examples/copyright.txt b/plugins/org.eclipse.emf.cdo.examples/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.examples/epl-v10.html b/plugins/org.eclipse.emf.cdo.examples/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.examples/license.html b/plugins/org.eclipse.emf.cdo.examples/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.examples/modeling32.png b/plugins/org.eclipse.emf.cdo.examples/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.examples/plugin.properties b/plugins/org.eclipse.emf.cdo.examples/plugin.properties
deleted file mode 100644
index 259835a8cc..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Examples (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/internal/examples/bundle/OM.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/internal/examples/bundle/OM.java
deleted file mode 100644
index 3429544879..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/internal/examples/bundle/OM.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.examples.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.emf.cdo.examples"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.classpath b/plugins/org.eclipse.emf.cdo.migrator/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/.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.emf.cdo.migrator/.cvsignore b/plugins/org.eclipse.emf.cdo.migrator/.cvsignore
deleted file mode 100644
index 5298e8d079..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-mixin-bin
-doc
-text
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.project b/plugins/org.eclipse.emf.cdo.migrator/.project
deleted file mode 100644
index 1f3916e520..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.cdo.migrator</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 705269f971..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,272 +0,0 @@
-#Sat Feb 23 10:46:08 CET 2008
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 6b1be04a4c..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:46:08 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 77dae488d2..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:09:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 2c46241b5f..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:09:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
deleted file mode 100644
index f352cfd52c..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.migrator;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.emf.importer;bundle-version="[2.4.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.migrator;version="0.8.0",
- org.eclipse.emf.cdo.migrator.actions;version="0.8.0",
- org.eclipse.emf.cdo.migrator.wizards;version="0.8.0"
diff --git a/plugins/org.eclipse.emf.cdo.migrator/about.html b/plugins/org.eclipse.emf.cdo.migrator/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/about.html
+++ /dev/null
@@ -1,28 +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.emf.cdo.migrator/build.properties b/plugins/org.eclipse.emf.cdo.migrator/build.properties
deleted file mode 100644
index 32ecdea01e..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.xml,\
-               icons/
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.emf.cdo.migrator/copyright.txt b/plugins/org.eclipse.emf.cdo.migrator/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.migrator/epl-v10.html b/plugins/org.eclipse.emf.cdo.migrator/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.migrator/icons/.cvsignore b/plugins/org.eclipse.emf.cdo.migrator/icons/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.migrator/icons/full/.cvsignore b/plugins/org.eclipse.emf.cdo.migrator/icons/full/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/icons/full/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/.cvsignore b/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/CDOModelFile.gif b/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/CDOModelFile.gif
deleted file mode 100644
index dad78b27a8..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/icons/full/obj16/CDOModelFile.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.migrator/license.html b/plugins/org.eclipse.emf.cdo.migrator/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.migrator/plugin.properties b/plugins/org.eclipse.emf.cdo.migrator/plugin.properties
deleted file mode 100644
index 13177204e8..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/plugin.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Migrator (Incubation)
-providerName = Eclipse.org
-
-_UI_CDOImporter_label = Ecore model (CDO Native)
-_UI_CDOImporter_description = Create the Ecore model based on other Ecore or EMOF models
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.migrator/plugin.xml b/plugins/org.eclipse.emf.cdo.migrator/plugin.xml
deleted file mode 100644
index 6fad0a5dd5..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/plugin.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-  <extension point="org.eclipse.emf.importer.modelImporterDescriptors">
-    <modelImporterDescriptor 
-    	id="org.eclipse.emf.importer.cdo" 
-    	name="%_UI_CDOImporter_label" 
-    	icon="icons/full/obj16/CDOModelFile.gif" 
-    	extensions="ecore,emof" 
-    	description="%_UI_CDOImporter_description" 
-    	wizard="org.eclipse.emf.cdo.migrator.wizards.CDOImporterWizard" />
-  </extension>
-  
-  <extension
-        point="org.eclipse.ui.popupMenus">
-     <objectContribution
-           id="org.eclipse.emf.cdo.migrator.MigrateContribution"
-           nameFilter="*.genmodel"
-           objectClass="org.eclipse.core.resources.IFile">
-        <menu
-              id="org.eclipse.emf.cdo.migrator.menu1"
-              label="CDO"
-              path="additions">
-           <separator
-                 name="group1">
-           </separator>
-        </menu>
-        <action
-              class="org.eclipse.emf.cdo.migrator.actions.MigrateAction"
-              enablesFor="1"
-              id="org.eclipse.emf.cdo.migrator.MigrateAction"
-              label="Migrate EMF Model"
-              menubarPath="org.eclipse.emf.cdo.migrator.menu1/group1">
-        </action>
-     </objectContribution>
-  </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOImporter.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOImporter.java
deleted file mode 100644
index eb02e6c3c0..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOImporter.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.migrator;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.DiagnosticException;
-import org.eclipse.emf.common.util.Monitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.converter.ConverterPlugin;
-import org.eclipse.emf.converter.util.ConverterUtil;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.importer.ModelImporter;
-
-import org.eclipse.core.resources.IProject;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class CDOImporter extends ModelImporter
-{
-  public static final String IMPORTER_ID = "org.eclipse.emf.importer.cdo";
-
-  public CDOImporter()
-  {
-  }
-
-  @Override
-  public String getID()
-  {
-    return IMPORTER_ID;
-  }
-
-  @Override
-  protected Diagnostic doComputeEPackages(Monitor monitor) throws Exception
-  {
-    Diagnostic diagnostic = Diagnostic.OK_INSTANCE;
-
-    List<URI> locationURIs = getModelLocationURIs();
-    if (locationURIs.isEmpty())
-    {
-      diagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.migrator", 0,
-          "Specify a valid Ecore model and try loading again", null);
-    }
-    else
-    {
-      monitor.beginTask("", 2);
-      monitor.subTask(MessageFormat.format("Loading {0}", locationURIs));
-
-      ResourceSet ecoreResourceSet = createResourceSet();
-      for (URI ecoreModelLocation : locationURIs)
-      {
-        ecoreResourceSet.getResource(ecoreModelLocation, true);
-      }
-      EcoreUtil.resolveAll(ecoreResourceSet);
-
-      for (Resource resource : ecoreResourceSet.getResources())
-      {
-        getEPackages().addAll(
-            EcoreUtil.<EPackage> getObjectsByType(resource.getContents(), EcorePackage.Literals.EPACKAGE));
-      }
-
-      BasicDiagnostic diagnosticChain = new BasicDiagnostic(ConverterPlugin.ID, ConverterUtil.ACTION_MESSAGE_NONE,
-          "Problems were detected while validating and converting the Ecore models", null);
-      for (EPackage ePackage : getEPackages())
-      {
-        Diagnostician.INSTANCE.validate(ePackage, diagnosticChain);
-      }
-      if (diagnosticChain.getSeverity() != Diagnostic.OK)
-      {
-        diagnostic = diagnosticChain;
-      }
-    }
-    return diagnostic;
-  }
-
-  @Override
-  public void addToResource(EPackage ePackage, ResourceSet resourceSet)
-  {
-    if (ePackage.eResource() != null && getGenModel().eResource() != null)
-    {
-      URI ePackageURI = ePackage.eResource().getURI();
-      URI genModelURI = getGenModel().eResource().getURI();
-
-      if (!ePackageURI.trimSegments(1).equals(genModelURI.trimSegments(1)))
-      {
-        ePackage.eResource().getContents().remove(ePackage);
-      }
-    }
-    super.addToResource(ePackage, resourceSet);
-  }
-
-  @Override
-  protected void adjustGenModel(Monitor monitor)
-  {
-    super.adjustGenModel(monitor);
-
-    GenModel genModel = getGenModel();
-    URI genModelURI = createFileURI(getGenModelPath().toString());
-    for (URI uri : getModelLocationURIs())
-    {
-      genModel.getForeignModel().add(makeRelative(uri, genModelURI).toString());
-    }
-
-    IProject project = getWorkspaceRoot().getProject(getModelProjectName());
-    CDOMigrator.adjustGenModel(genModel, project);
-  }
-
-  @Override
-  protected void handleOriginalGenModel() throws DiagnosticException
-  {
-    URI genModelURI = getOriginalGenModel().eResource().getURI();
-    StringBuffer text = new StringBuffer();
-    for (String value : getOriginalGenModel().getForeignModel())
-    {
-      if (value.endsWith(".ecore") || value.endsWith(".emof"))
-      {
-        text.append(makeAbsolute(URI.createURI(value), genModelURI).toString());
-        text.append(" ");
-      }
-    }
-
-    if (text.length() == 0)
-    {
-      List<URI> locations = new UniqueEList<URI>();
-      for (GenPackage genPackage : getOriginalGenModel().getGenPackages())
-      {
-        URI ecoreURI = genPackage.getEcorePackage().eResource().getURI();
-        if (locations.add(ecoreURI))
-        {
-          text.append(makeAbsolute(URI.createURI(ecoreURI.toString()), genModelURI).toString());
-          text.append(" ");
-        }
-      }
-    }
-
-    setModelLocation(text.toString().trim());
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOMigrator.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOMigrator.java
deleted file mode 100644
index 06a2490f58..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOMigrator.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.migrator;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenDelegationKind;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.WrappedException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-/**
- * @author Eike Stepper
- */
-public abstract class CDOMigrator
-{
-  public static final String ROOT_EXTENDS_CLASS = "org.eclipse.emf.internal.cdo.CDOObjectImpl";
-
-  public static final String ROOT_EXTENDS_INTERFACE = "org.eclipse.emf.cdo.CDOObject";
-
-  public static final String PLUGIN_VARIABLE = "CDO=org.eclipse.emf.cdo";
-
-  public static final String CDO_MF_CONTENTS = "This is a marker file for bundles with CDO native models.\n";
-
-  private CDOMigrator()
-  {
-  }
-
-  public static String adjustGenModel(GenModel genModel, IProject project)
-  {
-    StringBuilder builder = new StringBuilder();
-
-    if (genModel.getFeatureDelegation() != GenDelegationKind.REFLECTIVE_LITERAL)
-    {
-      genModel.setFeatureDelegation(GenDelegationKind.REFLECTIVE_LITERAL);
-      builder.append("Set Feature Delegation = ");
-      builder.append(GenDelegationKind.REFLECTIVE_LITERAL);
-      builder.append("\n");
-    }
-
-    if (!ROOT_EXTENDS_CLASS.equals(genModel.getRootExtendsClass()))
-    {
-      genModel.setRootExtendsClass(ROOT_EXTENDS_CLASS);
-      builder.append("Set Root Extends Class = ");
-      builder.append(ROOT_EXTENDS_CLASS);
-      builder.append("\n");
-    }
-
-    if (!ROOT_EXTENDS_INTERFACE.equals(genModel.getRootExtendsInterface()))
-    {
-      genModel.setRootExtendsInterface(ROOT_EXTENDS_INTERFACE);
-      builder.append("Set Root Extends Interface = ");
-      builder.append(ROOT_EXTENDS_INTERFACE);
-      builder.append("\n");
-    }
-
-    EList<String> pluginVariables = genModel.getModelPluginVariables();
-    if (!pluginVariables.contains(PLUGIN_VARIABLE))
-    {
-      pluginVariables.add(PLUGIN_VARIABLE);
-      builder.append("Added Model Plugin Variables = ");
-      builder.append(PLUGIN_VARIABLE);
-      builder.append("\n");
-    }
-
-    IFolder folder = project.getFolder("META-INF");
-    if (!folder.exists())
-    {
-      try
-      {
-        folder.create(true, true, new NullProgressMonitor());
-        builder.append("Created META-INF folder\n");
-      }
-      catch (CoreException ex)
-      {
-        throw new WrappedException(ex);
-      }
-    }
-
-    IFile file = folder.getFile("CDO.MF");
-    if (!file.exists())
-    {
-      try
-      {
-        InputStream contents = new ByteArrayInputStream(CDO_MF_CONTENTS.getBytes());
-        file.create(contents, true, new NullProgressMonitor());
-        builder.append("Created CDO.MF marker file\n");
-      }
-      catch (CoreException ex)
-      {
-        throw new WrappedException(ex);
-      }
-    }
-
-    return builder.length() == 0 ? null : builder.toString();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/actions/MigrateAction.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/actions/MigrateAction.java
deleted file mode 100644
index 9a5899283c..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/actions/MigrateAction.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.migrator.actions;
-
-import org.eclipse.emf.cdo.migrator.CDOMigrator;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class MigrateAction implements IObjectActionDelegate
-{
-  @SuppressWarnings("unused")
-  private IAction action;
-
-  private ISelection selection;
-
-  public MigrateAction()
-  {
-  }
-
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-    this.action = action;
-    this.selection = selection;
-  }
-
-  public void setActivePart(IAction action, IWorkbenchPart targetPart)
-  {
-    this.action = action;
-  }
-
-  public void run(IAction action)
-  {
-    new Job("Migrating EMF model")
-    {
-      @Override
-      protected IStatus run(IProgressMonitor monitor)
-      {
-        try
-        {
-          IFile file = getFile();
-          if (file == null)
-          {
-            showMessage("The selected element is not a *.genmodel file.", true);
-          }
-          else
-          {
-            GenModel genModel = getGenModel(file);
-            if (genModel == null)
-            {
-              showMessage("The selected file does not contain a generator model.", true);
-            }
-            else
-            {
-              String msg = CDOMigrator.adjustGenModel(genModel, file.getProject());
-              if (msg == null)
-              {
-                showMessage("The selected generator model was already migrated.", false);
-              }
-              else
-              {
-                genModel.eResource().save(null);
-                showMessage("The selected generator model has been migrated:\n\n" + msg, false);
-              }
-            }
-          }
-        }
-        catch (Exception ex)
-        {
-          return new Status(IStatus.ERROR, "org.eclipse.emf.cdo.migrator", "Problem while migrating EMF model", ex);
-        }
-
-        return Status.OK_STATUS;
-      }
-    }.schedule();
-  }
-
-  protected IFile getFile()
-  {
-    if (selection instanceof IStructuredSelection)
-    {
-      Object element = ((IStructuredSelection)selection).getFirstElement();
-      if (element instanceof IFile)
-      {
-        IFile file = (IFile)element;
-        if ("genmodel".equals(file.getFileExtension()))
-        {
-          return file;
-        }
-      }
-    }
-
-    return null;
-  }
-
-  protected GenModel getGenModel(IFile file)
-  {
-    ResourceSet resourceSet = new ResourceSetImpl();
-
-    Map<String, Object> map = resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();
-    map.put("*", new XMIResourceFactoryImpl());
-
-    URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), false);
-    Resource resource = resourceSet.getResource(uri, true);
-
-    EList<EObject> contents = resource.getContents();
-    if (!contents.isEmpty())
-    {
-      EObject object = contents.get(0);
-      if (object instanceof GenModel)
-      {
-        return (GenModel)object;
-      }
-    }
-
-    return null;
-  }
-
-  protected void showMessage(final String msg, final boolean error)
-  {
-    try
-    {
-      final Display display = PlatformUI.getWorkbench().getDisplay();
-      display.syncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            final Shell shell = new Shell(display);
-            if (error)
-            {
-              MessageDialog.openError(shell, "CDO Migrator", msg);
-            }
-            else
-            {
-              MessageDialog.openInformation(shell, "CDO Migrator", msg);
-            }
-          }
-          catch (RuntimeException ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/wizards/CDOImporterWizard.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/wizards/CDOImporterWizard.java
deleted file mode 100644
index 7bef613225..0000000000
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/wizards/CDOImporterWizard.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.migrator.wizards;
-
-import org.eclipse.emf.cdo.migrator.CDOImporter;
-
-import org.eclipse.emf.converter.ModelConverter;
-import org.eclipse.emf.importer.ui.contribution.base.ModelImporterDetailPage;
-import org.eclipse.emf.importer.ui.contribution.base.ModelImporterPackagePage;
-import org.eclipse.emf.importer.ui.contribution.base.ModelImporterWizard;
-
-/**
- * @author Eike Stepper
- */
-public class CDOImporterWizard extends ModelImporterWizard
-{
-  public CDOImporterWizard()
-  {
-  }
-
-  @Override
-  protected ModelConverter createModelConverter()
-  {
-    return new CDOImporter();
-  }
-
-  @Override
-  public void addPages()
-  {
-    ModelImporterDetailPage detailPage = new ModelImporterDetailPage(getModelImporter(), "EcoreModel");
-    detailPage.setTitle("Ecore &Import");
-    detailPage
-        .setDescription(detailPage.showGenModel() ? "Specify one or more \'.ecore\' or \'.emof\' URIs, try to load them, and choose a file name for the generator model"
-            : "Specify one or more \'.ecore\' or \'.emof\' URIs and try to load them");
-    addPage(detailPage);
-
-    ModelImporterPackagePage packagePage = new ModelImporterPackagePage(getModelImporter(), "EcorePackages");
-    packagePage.setShowReferencedGenModels(true);
-    addPage(packagePage);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
deleted file mode 100644
index be6f2da67a..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.server.db;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.emf.cdo.server.internal.db.bundle.OM$Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db;visibility:=reexport,
- org.eclipse.emf.cdo.server;visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.server.db;version="0.8.0",
- org.eclipse.emf.cdo.server.internal.db;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.server.db/plugin.properties b/plugins/org.eclipse.emf.cdo.server.db/plugin.properties
deleted file mode 100644
index 8bc566e4e4..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Server DB (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IAttributeMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IAttributeMapping.java
deleted file mode 100644
index c1096e8a2e..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IAttributeMapping.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.db;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-
-import org.eclipse.net4j.db.ddl.IDBField;
-
-import java.sql.ResultSet;
-
-/**
- * @author Eike Stepper
- */
-public interface IAttributeMapping extends IFeatureMapping
-{
-  public IDBField getField();
-
-  public void appendValue(StringBuilder builder, InternalCDORevision revision);
-
-  public void extractValue(ResultSet resultSet, int column, InternalCDORevision revision);
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IClassMapping.java
deleted file mode 100644
index f550050b40..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IClassMapping.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.db;
-
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-
-import org.eclipse.net4j.db.ddl.IDBTable;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public interface IClassMapping
-{
-  public IMappingStrategy getMappingStrategy();
-
-  public CDOClass getCDOClass();
-
-  public IDBTable getTable();
-
-  public Set<IDBTable> getAffectedTables();
-
-  public List<IAttributeMapping> getAttributeMappings();
-
-  public List<IReferenceMapping> getReferenceMappings();
-
-  public IAttributeMapping getAttributeMapping(CDOFeature feature);
-
-  public IReferenceMapping getReferenceMapping(CDOFeature feature);
-
-  public void writeRevision(IDBStoreWriter storeWriter, CDORevision revision);
-
-  public void readRevision(IDBStoreReader storeReader, CDORevision revision, int referenceChunk);
-
-  public void readRevisionByTime(IDBStoreReader storeReader, CDORevision revision, long timeStamp, int referenceChunk);
-
-  public void readRevisionByVersion(IDBStoreReader storeReader, CDORevision revision, int version, int referenceChunk);
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreReader.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreReader.java
deleted file mode 100644
index baedfa3bce..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IDBStoreReader.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.db;
-
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-import org.eclipse.emf.cdo.server.IStoreReader;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBStoreReader extends IDBStoreAccessor, IStoreReader
-{
-  public CDOClassRef readClassRef(int classID);
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IFeatureMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IFeatureMapping.java
deleted file mode 100644
index ea7be38c52..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IFeatureMapping.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.db;
-
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-
-/**
- * @author Eike Stepper
- */
-public interface IFeatureMapping
-{
-  public IClassMapping getClassMapping();
-
-  public CDOFeature getFeature();
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java
deleted file mode 100644
index 549d162c8d..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.db;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-
-import org.eclipse.net4j.util.io.CloseableIterator;
-
-import java.sql.Connection;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public interface IMappingStrategy
-{
-  public String getType();
-
-  public IDBStore getStore();
-
-  public void setStore(IDBStore store);
-
-  public Map<String, String> getProperties();
-
-  public void setProperties(Map<String, String> properties);
-
-  public IClassMapping getClassMapping(CDOClass cdoClass);
-
-  public CloseableIterator<CDOID> readObjectIDs(IDBStoreReader storeReader, boolean withTypes);
-
-  public CDOClassRef readObjectType(IDBStoreReader storeReader, CDOID id);
-
-  public CDOID readResourceID(IDBStoreReader storeReader, String path);
-
-  public String readResourcePath(IDBStoreReader storeReader, CDOID id);
-
-  /**
-   * Must return the maximum CDOID value .
-   */
-  public long repairAfterCrash(Connection connection);
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IObjectTypeCache.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IObjectTypeCache.java
deleted file mode 100644
index 3be4f8df5f..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IObjectTypeCache.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.db;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-
-/**
- * @author Eike Stepper
- */
-public interface IObjectTypeCache
-{
-  public CDOClassRef getObjectType(IDBStoreReader storeReader, CDOID id);
-
-  public void putObjectType(IDBStoreWriter storeWriter, CDOID id, CDOClass type);
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IReferenceMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IReferenceMapping.java
deleted file mode 100644
index 48578b33d5..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IReferenceMapping.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.db;
-
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.IStoreChunkReader.Chunk;
-
-import org.eclipse.net4j.db.ddl.IDBTable;
-
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public interface IReferenceMapping extends IFeatureMapping
-{
-  public IDBTable getTable();
-
-  public void writeReference(IDBStoreWriter storeWriter, CDORevision revision);
-
-  public void readReference(IDBStoreReader storeReader, CDORevision revision, int referenceChunk);
-
-  public void readChunks(IDBStoreChunkReader chunkReader, List<Chunk> chunks, String string);
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java
deleted file mode 100644
index e3d00d433f..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.server.db.IAttributeMapping;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.ddl.IDBField;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AttributeMapping extends FeatureMapping implements IAttributeMapping
-{
-  private IDBField field;
-
-  public AttributeMapping(ClassMapping classMapping, CDOFeature feature)
-  {
-    super(classMapping, feature);
-    field = classMapping.addField(feature, classMapping.getTable());
-  }
-
-  public IDBField getField()
-  {
-    return field;
-  }
-
-  public void appendValue(StringBuilder builder, InternalCDORevision revision)
-  {
-    IDBAdapter dbAdapter = getDBAdapter();
-    Object value = getRevisionValue(revision);
-    dbAdapter.appendValue(builder, field, value);
-  }
-
-  protected Object getRevisionValue(InternalCDORevision revision)
-  {
-    CDOFeature feature = getFeature();
-    return revision.getValue(feature);
-  }
-
-  public void extractValue(ResultSet resultSet, int column, InternalCDORevision revision)
-  {
-    try
-    {
-      Object value = getResultSetValue(resultSet, column);
-      if (resultSet.wasNull())
-      {
-        value = null;
-      }
-
-      revision.setValue(getFeature(), value);
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  protected abstract Object getResultSetValue(ResultSet resultSet, int column) throws SQLException;
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMString extends AttributeMapping
-  {
-    public AMString(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      return resultSet.getString(column);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMShort extends AttributeMapping
-  {
-    public AMShort(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      return resultSet.getShort(column);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMObject extends AttributeMapping
-  {
-    public AMObject(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      long id = resultSet.getLong(column);
-      if (resultSet.wasNull())
-      {
-        return null;
-      }
-
-      return CDOIDUtil.createCDOID(id);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMLong extends AttributeMapping
-  {
-    public AMLong(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      return resultSet.getLong(column);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMInteger extends AttributeMapping
-  {
-    public AMInteger(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      return resultSet.getInt(column);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMFloat extends AttributeMapping
-  {
-    public AMFloat(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      return resultSet.getFloat(column);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMDouble extends AttributeMapping
-  {
-    public AMDouble(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      return resultSet.getDouble(column);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMDate extends AttributeMapping
-  {
-    public AMDate(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      // TODO Is getDate() correct?
-      return resultSet.getDate(column);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMCharacter extends AttributeMapping
-  {
-    public AMCharacter(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      String str = resultSet.getString(column);
-      if (resultSet.wasNull())
-      {
-        return null;
-      }
-
-      return str.charAt(0);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMByte extends AttributeMapping
-  {
-    public AMByte(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      return resultSet.getByte(column);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class AMBoolean extends AttributeMapping
-  {
-    public AMBoolean(ClassMapping classMapping, CDOFeature feature)
-    {
-      super(classMapping, feature);
-    }
-
-    @Override
-    protected Object getResultSetValue(ResultSet resultSet, int column) throws SQLException
-    {
-      return resultSet.getBoolean(column);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
deleted file mode 100644
index af6bd8684e..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
-
-/**
- * @author Eike Stepper
- */
-public class CDODBSchema extends DBSchema
-{
-  public static final CDODBSchema INSTANCE = new CDODBSchema();
-
-  /**
-   * DBTable cdo_repository
-   */
-  public static final IDBTable REPOSITORY = INSTANCE.addTable("cdo_repository");
-
-  public static final IDBField REPOSITORY_STARTS = //
-  REPOSITORY.addField("starts", DBType.BIGINT);
-
-  public static final IDBField REPOSITORY_STARTED = //
-  REPOSITORY.addField("started", DBType.BIGINT);
-
-  public static final IDBField REPOSITORY_STOPPED = //
-  REPOSITORY.addField("stopped", DBType.BIGINT);
-
-  public static final IDBField REPOSITORY_NEXT_CDOID = //
-  REPOSITORY.addField("next_cdoid", DBType.BIGINT);
-
-  public static final IDBField REPOSITORY_NEXT_METAID = //
-  REPOSITORY.addField("next_metaid", DBType.BIGINT);
-
-  /**
-   * DBTable cdo_packages
-   */
-  public static final IDBTable PACKAGES = INSTANCE.addTable("cdo_packages");
-
-  public static final IDBField PACKAGES_ID = //
-  PACKAGES.addField("id", DBType.INTEGER);
-
-  public static final IDBField PACKAGES_URI = //
-  PACKAGES.addField("uri", DBType.VARCHAR, 255);
-
-  public static final IDBField PACKAGES_NAME = //
-  PACKAGES.addField("name", DBType.VARCHAR, 255);
-
-  public static final IDBField PACKAGES_ECORE = //
-  PACKAGES.addField("ecore", DBType.CLOB);
-
-  public static final IDBField PACKAGES_DYNAMIC = //
-  PACKAGES.addField("dynamic", DBType.BOOLEAN);
-
-  public static final IDBField PACKAGES_RANGE_LB = //
-  PACKAGES.addField("range_lb", DBType.BIGINT);
-
-  public static final IDBField PACKAGES_RANGE_UB = //
-  PACKAGES.addField("range_ub", DBType.BIGINT);
-
-  public static final IDBField PACKAGES_PARENT = //
-  PACKAGES.addField("parent", DBType.VARCHAR, 255);
-
-  public static final IDBIndex INDEX_PACKAGES_PK = //
-  PACKAGES.addIndex(IDBIndex.Type.PRIMARY_KEY, PACKAGES_ID);
-
-  public static final IDBIndex INDEX_PACKAGES_URI = //
-  PACKAGES.addIndex(IDBIndex.Type.UNIQUE, PACKAGES_URI);
-
-  /**
-   * DBTable cdo_classes
-   */
-  public static final IDBTable CLASSES = INSTANCE.addTable("cdo_classes");
-
-  public static final IDBField CLASSES_ID = //
-  CLASSES.addField("id", DBType.INTEGER);
-
-  public static final IDBField CLASSES_PACKAGE = //
-  CLASSES.addField("package", DBType.INTEGER);
-
-  public static final IDBField CLASSES_CLASSIFIER = //
-  CLASSES.addField("classifier", DBType.INTEGER);
-
-  public static final IDBField CLASSES_NAME = //
-  CLASSES.addField("name", DBType.VARCHAR, 255);
-
-  public static final IDBField CLASSES_ABSTRACT = //
-  CLASSES.addField("abstract", DBType.BOOLEAN);
-
-  public static final IDBIndex INDEX_CLASSES_PK = //
-  CLASSES.addIndex(IDBIndex.Type.PRIMARY_KEY, CLASSES_ID);
-
-  /**
-   * DBTable cdo_supertypes
-   */
-  public static final IDBTable SUPERTYPES = INSTANCE.addTable("cdo_supertypes");
-
-  public static final IDBField SUPERTYPES_TYPE = //
-  SUPERTYPES.addField("type_id", DBType.INTEGER);
-
-  public static final IDBField SUPERTYPES_SUPERTYPE_PACKAGE = //
-  SUPERTYPES.addField("supertype_package", DBType.VARCHAR, 255);
-
-  public static final IDBField SUPERTYPES_SUPERTYPE_CLASSIFIER = //
-  SUPERTYPES.addField("supertype_classifier", DBType.INTEGER);
-
-  public static final IDBIndex INDEX_SUPERTYPES_PK = //
-  SUPERTYPES.addIndex(IDBIndex.Type.PRIMARY_KEY, SUPERTYPES_TYPE);
-
-  /**
-   * DBTable cdo_features
-   */
-  public static final IDBTable FEATURES = INSTANCE.addTable("cdo_features");
-
-  public static final IDBField FEATURES_ID = //
-  FEATURES.addField("id", DBType.INTEGER);
-
-  public static final IDBField FEATURES_CLASS = //
-  FEATURES.addField("class", DBType.INTEGER);
-
-  public static final IDBField FEATURES_FEATURE = //
-  FEATURES.addField("feature", DBType.INTEGER);
-
-  public static final IDBField FEATURES_NAME = //
-  FEATURES.addField("name", DBType.VARCHAR, 255);
-
-  public static final IDBField FEATURES_TYPE = //
-  FEATURES.addField("type", DBType.INTEGER);
-
-  public static final IDBField FEATURES_REFERENCE_PACKAGE = //
-  FEATURES.addField("reference_package", DBType.VARCHAR, 255);
-
-  public static final IDBField FEATURES_REFERENCE_CLASSIFIER = //
-  FEATURES.addField("reference_classifier", DBType.INTEGER);
-
-  public static final IDBField FEATURES_MANY = //
-  FEATURES.addField("many", DBType.BOOLEAN);
-
-  public static final IDBField FEATURES_CONTAINMENT = //
-  FEATURES.addField("containment", DBType.BOOLEAN);
-
-  public static final IDBField FEATURES_INDEX = //
-  FEATURES.addField("idx", DBType.INTEGER);
-
-  public static final IDBIndex INDEX_FEATURES_PK = //
-  FEATURES.addIndex(IDBIndex.Type.PRIMARY_KEY, FEATURES_ID);
-
-  /**
-   * Name of object table
-   */
-  public static final String CDO_OBJECTS = "cdo_objects";
-
-  /**
-   * Field names of attribute tables
-   */
-  public static final String ATTRIBUTES_ID = "cdo_id";
-
-  public static final String ATTRIBUTES_VERSION = "cdo_version";
-
-  public static final String ATTRIBUTES_CLASS = "cdo_class";
-
-  public static final String ATTRIBUTES_CREATED = "cdo_created";
-
-  public static final String ATTRIBUTES_REVISED = "cdo_revised";
-
-  public static final String ATTRIBUTES_RESOURCE = "cdo_resource";
-
-  public static final String ATTRIBUTES_CONTAINER = "cdo_container";
-
-  public static final String ATTRIBUTES_FEATURE = "cdo_feature";
-
-  /**
-   * Field names of reference tables
-   */
-  public static final String REFERENCES_FEATURE = "cdo_feature";
-
-  public static final String REFERENCES_SOURCE = "cdo_source";
-
-  public static final String REFERENCES_VERSION = "cdo_version";
-
-  public static final String REFERENCES_IDX = "cdo_idx";
-
-  public static final String REFERENCES_TARGET = "cdo_target";
-
-  private CDODBSchema()
-  {
-    super("CDO");
-  }
-
-  static
-  {
-    INSTANCE.lock();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassMapping.java
deleted file mode 100644
index 2074131edd..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassMapping.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOType;
-import org.eclipse.emf.cdo.protocol.model.resource.CDOResourceClass;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.db.IAttributeMapping;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStore;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-import org.eclipse.emf.cdo.server.db.IDBStoreWriter;
-import org.eclipse.emf.cdo.server.db.IReferenceMapping;
-import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.ImplementationError;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ClassMapping implements IClassMapping
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, ClassMapping.class);
-
-  private MappingStrategy mappingStrategy;
-
-  private CDOClass cdoClass;
-
-  private IDBTable table;
-
-  private Set<IDBTable> affectedTables = new HashSet<IDBTable>();
-
-  private List<IAttributeMapping> attributeMappings;
-
-  private List<IReferenceMapping> referenceMappings;
-
-  private String selectPrefix;
-
-  private String selectPrefixWithVersion;
-
-  public ClassMapping(MappingStrategy mappingStrategy, CDOClass cdoClass, CDOFeature[] features)
-  {
-    this.mappingStrategy = mappingStrategy;
-    this.cdoClass = cdoClass;
-
-    table = addTable(cdoClass.getName());
-    initTable(table, hasFullRevisionInfo());
-    if (features != null)
-    {
-      attributeMappings = createAttributeMappings(features);
-      referenceMappings = createReferenceMappings(features);
-
-      // Special handling of CDOResource table
-      CDOResourceClass resourceClass = cdoClass.getPackageManager().getCDOResourcePackage().getCDOResourceClass();
-      if (cdoClass == resourceClass)
-      {
-        // Create a unique ids to prevent duplicate resource paths
-        for (IAttributeMapping attributeMapping : attributeMappings)
-        {
-          if (attributeMapping.getFeature() == resourceClass.getCDOPathFeature())
-          {
-            IDBField versionField = table.getField(CDODBSchema.ATTRIBUTES_VERSION);
-            IDBField pathField = attributeMapping.getField();
-            pathField.setPrecision(760);// MYSQL key limitation 767
-            pathField.setNotNull(true);
-
-            // Create a unique ids to prevent duplicate resource paths
-            table.addIndex(IDBIndex.Type.UNIQUE, versionField, pathField);
-            break;
-          }
-        }
-      }
-    }
-
-    selectPrefix = createSelectPrefix(false);
-    selectPrefixWithVersion = createSelectPrefix(true);
-  }
-
-  public MappingStrategy getMappingStrategy()
-  {
-    return mappingStrategy;
-  }
-
-  public CDOClass getCDOClass()
-  {
-    return cdoClass;
-  }
-
-  public IDBTable getTable()
-  {
-    return table;
-  }
-
-  public Set<IDBTable> getAffectedTables()
-  {
-    return affectedTables;
-  }
-
-  protected void initTable(IDBTable table, boolean full)
-  {
-    table.addField(CDODBSchema.ATTRIBUTES_ID, DBType.BIGINT, true);
-    table.addField(CDODBSchema.ATTRIBUTES_VERSION, DBType.INTEGER, true);
-    if (full)
-    {
-      table.addField(CDODBSchema.ATTRIBUTES_CLASS, DBType.INTEGER, true);
-      table.addField(CDODBSchema.ATTRIBUTES_CREATED, DBType.BIGINT, true);
-      table.addField(CDODBSchema.ATTRIBUTES_REVISED, DBType.BIGINT, true);
-      table.addField(CDODBSchema.ATTRIBUTES_RESOURCE, DBType.BIGINT, true);
-      table.addField(CDODBSchema.ATTRIBUTES_CONTAINER, DBType.BIGINT, true);
-      table.addField(CDODBSchema.ATTRIBUTES_FEATURE, DBType.INTEGER, true);
-    }
-  }
-
-  protected void appendRevisionInfos(StringBuilder builder, InternalCDORevision revision, boolean full)
-  {
-    builder.append(CDOIDUtil.getLong(revision.getID()));
-    builder.append(", ");
-    builder.append(revision.getVersion());
-    if (full)
-    {
-      builder.append(", ");
-      builder.append(ServerInfo.getDBID(revision.getCDOClass()));
-      builder.append(", ");
-      builder.append(revision.getCreated());
-      builder.append(", ");
-      builder.append(revision.getRevised());
-      builder.append(", ");
-      builder.append(CDOIDUtil.getLong(revision.getResourceID()));
-      builder.append(", ");
-      builder.append(CDOIDUtil.getLong(revision.getContainerID()));
-      builder.append(", ");
-      builder.append(revision.getContainingFeatureID());
-    }
-  }
-
-  protected int sqlUpdate(IDBStoreWriter storeWriter, String sql) throws DBException
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace(sql);
-    }
-
-    try
-    {
-      Statement statement = storeWriter.getStatement();
-      return statement.executeUpdate(sql);
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  protected String mangleTableName(String name, int attempt)
-  {
-    return getDBAdapter().mangleTableName(name, attempt);
-  }
-
-  protected String mangleFieldName(String name, int attempt)
-  {
-    return getDBAdapter().mangleFieldName(name, attempt);
-  }
-
-  protected IDBTable addTable(String name)
-  {
-    for (int attempt = 0;; ++attempt)
-    {
-      String tableName = mangleTableName(name, attempt);
-
-      try
-      {
-        IDBTable table = mappingStrategy.getStore().getDBSchema().addTable(tableName);
-        affectedTables.add(table);
-        return table;
-      }
-      catch (DBException ex)
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.format("{0}. attempt to add table: {1} ({2})", attempt + 1, tableName, ex.getMessage());
-        }
-      }
-    }
-  }
-
-  protected IDBField addField(CDOFeature cdoFeature, IDBTable table) throws DBException
-  {
-    DBType fieldType = getDBType(cdoFeature);
-    int fieldLength = getDBLength(cdoFeature);
-    for (int attempt = 0;; ++attempt)
-    {
-      String fieldName = mangleFieldName(cdoFeature.getName(), attempt);
-
-      try
-      {
-        IDBField field = table.addField(fieldName, fieldType, fieldLength);
-        affectedTables.add(table);
-        return field;
-      }
-      catch (DBException ex)
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.format("{0}. attempt to add field: {1} ({2})", attempt + 1, fieldName, ex.getMessage());
-        }
-      }
-    }
-  }
-
-  protected DBType getDBType(CDOFeature cdoFeature)
-  {
-    return DBStore.getDBType(cdoFeature.getType());
-  }
-
-  protected int getDBLength(CDOFeature cdoFeature)
-  {
-    // Derby: The maximum length for a VARCHAR string is 32,672 characters.
-    CDOType type = cdoFeature.getType();
-    return type == CDOType.STRING || type == CDOType.CUSTOM ? 32672 : IDBField.DEFAULT;
-  }
-
-  protected IDBAdapter getDBAdapter()
-  {
-    IDBStore store = mappingStrategy.getStore();
-    return store.getDBAdapter();
-  }
-
-  protected String createSelectPrefix(boolean readVersion)
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append("SELECT ");
-
-    if (hasFullRevisionInfo())
-    {
-      if (readVersion)
-      {
-        builder.append(CDODBSchema.ATTRIBUTES_VERSION);
-        builder.append(", ");
-      }
-
-      builder.append(CDODBSchema.ATTRIBUTES_CREATED);
-      builder.append(", ");
-      builder.append(CDODBSchema.ATTRIBUTES_REVISED);
-      builder.append(", ");
-      builder.append(CDODBSchema.ATTRIBUTES_RESOURCE);
-      builder.append(", ");
-      builder.append(CDODBSchema.ATTRIBUTES_CONTAINER);
-      builder.append(", ");
-      builder.append(CDODBSchema.ATTRIBUTES_FEATURE);
-    }
-    else
-    {
-      if (attributeMappings == null)
-      {
-        // Only references
-        return null;
-      }
-    }
-
-    if (attributeMappings != null)
-    {
-      for (IAttributeMapping attributeMapping : attributeMappings)
-      {
-        builder.append(", ");
-        builder.append(attributeMapping.getField());
-      }
-    }
-
-    builder.append(" FROM ");
-    builder.append(table);
-    builder.append(" WHERE ");
-    builder.append(CDODBSchema.ATTRIBUTES_ID);
-    builder.append("=");
-    return builder.toString();
-  }
-
-  public List<IAttributeMapping> getAttributeMappings()
-  {
-    return attributeMappings;
-  }
-
-  public List<IReferenceMapping> getReferenceMappings()
-  {
-    return referenceMappings;
-  }
-
-  public IReferenceMapping getReferenceMapping(CDOFeature feature)
-  {
-    // TODO Optimize this?
-    for (IReferenceMapping referenceMapping : referenceMappings)
-    {
-      if (referenceMapping.getFeature() == feature)
-      {
-        return referenceMapping;
-      }
-    }
-
-    return null;
-  }
-
-  public IAttributeMapping getAttributeMapping(CDOFeature feature)
-  {
-    // TODO Optimize this?
-    for (IAttributeMapping attributeMapping : attributeMappings)
-    {
-      if (attributeMapping.getFeature() == feature)
-      {
-        return attributeMapping;
-      }
-    }
-
-    return null;
-  }
-
-  protected List<IAttributeMapping> createAttributeMappings(CDOFeature[] features)
-  {
-    List<IAttributeMapping> attributeMappings = new ArrayList<IAttributeMapping>();
-    for (CDOFeature feature : features)
-    {
-      if (feature.isReference())
-      {
-        if (!feature.isMany())
-        {
-          attributeMappings.add(createToOneReferenceMapping(feature));
-        }
-      }
-      else
-      {
-        attributeMappings.add(createAttributeMapping(feature));
-      }
-    }
-
-    return attributeMappings.isEmpty() ? null : attributeMappings;
-  }
-
-  protected List<IReferenceMapping> createReferenceMappings(CDOFeature[] features)
-  {
-    List<IReferenceMapping> referenceMappings = new ArrayList<IReferenceMapping>();
-    for (CDOFeature feature : features)
-    {
-      if (feature.isReference() && feature.isMany())
-      {
-        referenceMappings.add(createReferenceMapping(feature));
-      }
-    }
-
-    return referenceMappings.isEmpty() ? null : referenceMappings;
-  }
-
-  protected AttributeMapping createAttributeMapping(CDOFeature feature)
-  {
-    CDOType type = feature.getType();
-    if (type == CDOType.BOOLEAN || type == CDOType.BOOLEAN_OBJECT)
-    {
-      return new AttributeMapping.AMBoolean(this, feature);
-    }
-    else if (type == CDOType.BYTE || type == CDOType.BYTE_OBJECT)
-    {
-      return new AttributeMapping.AMByte(this, feature);
-    }
-    else if (type == CDOType.CHAR || type == CDOType.CHARACTER_OBJECT)
-    {
-      return new AttributeMapping.AMCharacter(this, feature);
-    }
-    else if (type == CDOType.DATE)
-    {
-      return new AttributeMapping.AMDate(this, feature);
-    }
-    else if (type == CDOType.DOUBLE || type == CDOType.DOUBLE_OBJECT)
-    {
-      return new AttributeMapping.AMDouble(this, feature);
-    }
-    else if (type == CDOType.FLOAT || type == CDOType.FLOAT_OBJECT)
-    {
-      return new AttributeMapping.AMFloat(this, feature);
-    }
-    else if (type == CDOType.INT || type == CDOType.INTEGER_OBJECT)
-    {
-      return new AttributeMapping.AMInteger(this, feature);
-    }
-    else if (type == CDOType.LONG || type == CDOType.LONG_OBJECT)
-    {
-      return new AttributeMapping.AMLong(this, feature);
-    }
-    else if (type == CDOType.OBJECT)
-    {
-      return new AttributeMapping.AMObject(this, feature);
-    }
-    else if (type == CDOType.SHORT || type == CDOType.SHORT_OBJECT)
-    {
-      return new AttributeMapping.AMShort(this, feature);
-    }
-    else if (type == CDOType.STRING || type == CDOType.CUSTOM)
-    {
-      return new AttributeMapping.AMString(this, feature);
-    }
-
-    throw new ImplementationError("Unrecognized CDOType: " + type);
-  }
-
-  protected ToOneReferenceMapping createToOneReferenceMapping(CDOFeature feature)
-  {
-    return new ToOneReferenceMapping(this, feature);
-  }
-
-  protected ReferenceMapping createReferenceMapping(CDOFeature feature)
-  {
-    return new ReferenceMapping(this, feature, ToMany.PER_REFERENCE);
-  }
-
-  protected abstract boolean hasFullRevisionInfo();
-
-  public void writeRevision(IDBStoreWriter storeWriter, CDORevision revision)
-  {
-    if (revision.getVersion() >= 2 && hasFullRevisionInfo())
-    {
-      writeRevisedRow(storeWriter, (InternalCDORevision)revision);
-    }
-
-    if (attributeMappings != null)
-    {
-      writeAttributes(storeWriter, (InternalCDORevision)revision);
-    }
-
-    if (referenceMappings != null)
-    {
-      writeReferences(storeWriter, (InternalCDORevision)revision);
-    }
-  }
-
-  protected void writeRevisedRow(IDBStoreWriter storeWriter, InternalCDORevision revision)
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append("UPDATE ");
-    builder.append(table);
-    builder.append(" SET ");
-    builder.append(CDODBSchema.ATTRIBUTES_REVISED);
-    builder.append("=");
-    builder.append(revision.getCreated() - 1);
-    builder.append(" WHERE ");
-    builder.append(CDODBSchema.ATTRIBUTES_ID);
-    builder.append("=");
-    builder.append(CDOIDUtil.getLong(revision.getID()));
-    builder.append(" AND ");
-    builder.append(CDODBSchema.ATTRIBUTES_VERSION);
-    builder.append("=");
-    builder.append(revision.getVersion() - 1);
-    sqlUpdate(storeWriter, builder.toString());
-  }
-
-  protected void writeAttributes(IDBStoreWriter storeWriter, InternalCDORevision revision)
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append("INSERT INTO ");
-    builder.append(table);
-    builder.append(" VALUES (");
-    appendRevisionInfos(builder, revision, hasFullRevisionInfo());
-
-    for (IAttributeMapping attributeMapping : attributeMappings)
-    {
-      builder.append(", ");
-      attributeMapping.appendValue(builder, revision);
-    }
-
-    builder.append(")");
-    sqlUpdate(storeWriter, builder.toString());
-  }
-
-  protected void writeReferences(IDBStoreWriter storeWriter, InternalCDORevision revision)
-  {
-    for (IReferenceMapping referenceMapping : referenceMappings)
-    {
-      referenceMapping.writeReference(storeWriter, revision);
-    }
-  }
-
-  public void readRevision(IDBStoreReader storeReader, CDORevision revision, int referenceChunk)
-  {
-    String where = CDODBSchema.ATTRIBUTES_REVISED + "=0";
-    readRevision(storeReader, (InternalCDORevision)revision, where, true, referenceChunk);
-  }
-
-  public void readRevisionByTime(IDBStoreReader storeReader, CDORevision revision, long timeStamp, int referenceChunk)
-  {
-    StringBuilder where = new StringBuilder();
-    where.append("(");
-    where.append(CDODBSchema.ATTRIBUTES_REVISED);
-    where.append("=0 OR ");
-    where.append(CDODBSchema.ATTRIBUTES_REVISED);
-    where.append(">=");
-    where.append(timeStamp);
-    where.append(") AND ");
-    where.append(timeStamp);
-    where.append(">=");
-    where.append(CDODBSchema.ATTRIBUTES_CREATED);
-    readRevision(storeReader, (InternalCDORevision)revision, where.toString(), true, referenceChunk);
-  }
-
-  public void readRevisionByVersion(IDBStoreReader storeReader, CDORevision revision, int version, int referenceChunk)
-  {
-    String where = CDODBSchema.ATTRIBUTES_VERSION + "=" + version;
-    readRevision(storeReader, (InternalCDORevision)revision, where, false, referenceChunk);
-  }
-
-  protected void readRevision(IDBStoreReader storeReader, InternalCDORevision revision, String where,
-      boolean readVersion, int referenceChunk)
-  {
-    if (attributeMappings != null)
-    {
-      readAttributes(storeReader, revision, where, readVersion);
-    }
-
-    if (referenceMappings != null)
-    {
-      readReferences(storeReader, revision, referenceChunk);
-    }
-  }
-
-  protected void readAttributes(IDBStoreReader storeReader, InternalCDORevision revision, String where,
-      boolean readVersion)
-  {
-    long id = CDOIDUtil.getLong(revision.getID());
-    StringBuilder builder = new StringBuilder(readVersion ? selectPrefixWithVersion : selectPrefix);
-    builder.append(id);
-    if (where != null)
-    {
-      builder.append(" AND ");
-      builder.append(where);
-    }
-
-    String sql = builder.toString();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace(sql);
-    }
-
-    ResultSet resultSet = null;
-
-    try
-    {
-      resultSet = storeReader.getStatement().executeQuery(sql);
-      if (!resultSet.next())
-      {
-        throw new IllegalStateException("Revision not found: " + id);
-      }
-
-      int i = 1;
-      if (hasFullRevisionInfo())
-      {
-        if (readVersion)
-        {
-          revision.setVersion(resultSet.getInt(i++));
-        }
-
-        revision.setCreated(resultSet.getLong(i++));
-        revision.setRevised(resultSet.getLong(i++));
-        revision.setResourceID(CDOIDUtil.createCDOID(resultSet.getLong(i++)));
-        revision.setContainerID(CDOIDUtil.createCDOID(resultSet.getLong(i++)));
-        revision.setContainingFeatureID(resultSet.getInt(i++));
-      }
-
-      if (attributeMappings != null)
-      {
-        for (IAttributeMapping attributeMapping : attributeMappings)
-        {
-          attributeMapping.extractValue(resultSet, i++, revision);
-        }
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      DBUtil.close(resultSet);
-    }
-  }
-
-  protected void readReferences(IDBStoreReader storeReader, InternalCDORevision revision, int referenceChunk)
-  {
-    for (IReferenceMapping referenceMapping : referenceMappings)
-    {
-      referenceMapping.readReference(storeReader, revision, referenceChunk);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassServerInfo.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassServerInfo.java
deleted file mode 100644
index ea8a5dab5c..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassServerInfo.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-
-import org.eclipse.net4j.util.ImplementationError;
-
-/**
- * @author Eike Stepper
- */
-public final class ClassServerInfo extends ServerInfo
-{
-  public static final int CDO_OBJECT_CLASS_DBID = -1;
-
-  public static final int CDO_RESOURCE_CLASS_DBID = -2;
-
-  private IClassMapping classMapping;
-
-  private ClassServerInfo(int id)
-  {
-    super(id);
-  }
-
-  public static ClassServerInfo setDBID(CDOClass cdoClass, int id)
-  {
-    ClassServerInfo serverInfo = new ClassServerInfo(id);
-    ((InternalCDOClass)cdoClass).setServerInfo(serverInfo);
-    return serverInfo;
-  }
-
-  /**
-   * Should only be called from {@link MappingStrategy#getClassMapping(CDOClass)}.
-   */
-  public static IClassMapping getClassMapping(CDOClass cdoClass)
-  {
-    ClassServerInfo serverInfo = getServerInfo(cdoClass);
-    return serverInfo == null ? null : serverInfo.classMapping;
-  }
-
-  public static void setClassMapping(CDOClass cdoClass, IClassMapping classMapping)
-  {
-    ClassServerInfo serverInfo = getServerInfo(cdoClass);
-    if (serverInfo == null)
-    {
-      throw new ImplementationError("No serverInfo for class " + cdoClass);
-    }
-
-    serverInfo.classMapping = classMapping;
-  }
-
-  protected static ClassServerInfo getServerInfo(CDOClass cdoClass)
-  {
-    ClassServerInfo serverInfo = (ClassServerInfo)cdoClass.getServerInfo();
-    if (serverInfo == null)
-    {
-      if (cdoClass.isRoot())
-      {
-        serverInfo = setDBID(cdoClass, CDO_OBJECT_CLASS_DBID);
-      }
-      else if (cdoClass.isResource())
-      {
-        serverInfo = setDBID(cdoClass, CDO_RESOURCE_CLASS_DBID);
-      }
-    }
-
-    return serverInfo;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
deleted file mode 100644
index b9bca939b8..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.server.LongIDStore;
-import org.eclipse.emf.cdo.protocol.model.CDOType;
-import org.eclipse.emf.cdo.server.ISession;
-import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.StoreUtil;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStore;
-import org.eclipse.emf.cdo.server.db.IMappingStrategy;
-import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.IDBConnectionProvider;
-import org.eclipse.net4j.db.ddl.IDBSchema;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.DataSourceConnectionProvider;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
-import org.eclipse.net4j.util.ImplementationError;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import javax.sql.DataSource;
-
-import java.sql.Connection;
-import java.text.MessageFormat;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class DBStore extends LongIDStore implements IDBStore
-{
-  public static final String TYPE = "db";
-
-  private IMappingStrategy mappingStrategy;
-
-  private IDBSchema dbSchema;
-
-  private IDBAdapter dbAdapter;
-
-  private IDBConnectionProvider dbConnectionProvider;
-
-  private int nextPackageID;
-
-  private int nextClassID;
-
-  private int nextFeatureID;
-
-  public DBStore()
-  {
-    super(TYPE);
-  }
-
-  public IMappingStrategy getMappingStrategy()
-  {
-    return mappingStrategy;
-  }
-
-  public void setMappingStrategy(IMappingStrategy mappingStrategy)
-  {
-    this.mappingStrategy = mappingStrategy;
-    mappingStrategy.setStore(this);
-  }
-
-  public IDBAdapter getDBAdapter()
-  {
-    return dbAdapter;
-  }
-
-  public void setDbAdapter(IDBAdapter dbAdapter)
-  {
-    this.dbAdapter = dbAdapter;
-  }
-
-  public IDBConnectionProvider getDBConnectionProvider()
-  {
-    return dbConnectionProvider;
-  }
-
-  public void setDbConnectionProvider(IDBConnectionProvider dbConnectionProvider)
-  {
-    this.dbConnectionProvider = dbConnectionProvider;
-  }
-
-  public void setDataSource(DataSource dataSource)
-  {
-    dbConnectionProvider = new DataSourceConnectionProvider(dataSource);
-  }
-
-  public synchronized IDBSchema getDBSchema()
-  {
-    // TODO Better synchronization or eager init
-    if (dbSchema == null)
-    {
-      dbSchema = createSchema();
-    }
-
-    return dbSchema;
-  }
-
-  @Override
-  public boolean hasAuditingSupport()
-  {
-    return true;
-  }
-
-  @Override
-  public boolean hasBranchingSupport()
-  {
-    return false;
-  }
-
-  @Override
-  public boolean hasWriteDeltaSupport()
-  {
-    return false;
-  }
-
-  @Override
-  public DBStoreReader getReader(ISession session)
-  {
-    return (DBStoreReader)super.getReader(session);
-  }
-
-  @Override
-  public DBStoreReader createReader(ISession session) throws DBException
-  {
-    return new DBStoreReader(this, session);
-  }
-
-  @Override
-  public DBStoreWriter getWriter(IView view)
-  {
-    return (DBStoreWriter)super.getWriter(view);
-  }
-
-  @Override
-  public DBStoreWriter createWriter(IView view) throws DBException
-  {
-    return new DBStoreWriter(this, view);
-  }
-
-  public synchronized int getNextPackageID()
-  {
-    // TODO Better synchronization
-    return nextPackageID++;
-  }
-
-  public synchronized int getNextClassID()
-  {
-    // TODO Better synchronization
-    return nextClassID++;
-  }
-
-  public synchronized int getNextFeatureID()
-  {
-    // TODO Better synchronization
-    return nextFeatureID++;
-  }
-
-  public Connection getConnection()
-  {
-    Connection connection = dbConnectionProvider.getConnection();
-    if (connection == null)
-    {
-      throw new DBException("No connection from connection provider: " + dbConnectionProvider);
-    }
-
-    return connection;
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    checkNull(mappingStrategy, "mappingStrategy is null");
-    checkNull(dbAdapter, "dbAdapter is null");
-    checkNull(dbConnectionProvider, "dbConnectionProvider is null");
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    Connection connection = null;
-
-    try
-    {
-      connection = getConnection();
-      Set<IDBTable> createdTables = CDODBSchema.INSTANCE.create(dbAdapter, dbConnectionProvider);
-      if (createdTables.contains(CDODBSchema.REPOSITORY))
-      {
-        // First start
-        DBUtil.insertRow(connection, dbAdapter, CDODBSchema.REPOSITORY, 1, getStartupTime(), 0, CRASHED, CRASHED);
-
-        MappingStrategy mappingStrategy = (MappingStrategy)getMappingStrategy();
-
-        IClassMapping resourceClassMapping = mappingStrategy.getResourceClassMapping();
-        Set<IDBTable> tables = resourceClassMapping.getAffectedTables();
-        if (dbAdapter.createTables(tables, connection).size() != tables.size())
-        {
-          throw new DBException("CDOResource tables not completely created");
-        }
-      }
-      else
-      {
-        // Restart
-        long lastObjectID = DBUtil.selectMaximumLong(connection, CDODBSchema.REPOSITORY_NEXT_CDOID);
-        setLastMetaID(DBUtil.selectMaximumLong(connection, CDODBSchema.REPOSITORY_NEXT_METAID));
-        if (lastObjectID == CRASHED || getLastMetaID() == CRASHED)
-        {
-          OM.LOG.warn("Detected restart after crash");
-        }
-
-        setLastObjectID(lastObjectID);
-
-        StringBuilder builder = new StringBuilder();
-        builder.append("UPDATE ");
-        builder.append(CDODBSchema.REPOSITORY);
-        builder.append(" SET ");
-        builder.append(CDODBSchema.REPOSITORY_STARTS);
-        builder.append("=");
-        builder.append(CDODBSchema.REPOSITORY_STARTS);
-        builder.append("+1, ");
-        builder.append(CDODBSchema.REPOSITORY_STARTED);
-        builder.append("=");
-        builder.append(getStartupTime());
-        builder.append(", ");
-        builder.append(CDODBSchema.REPOSITORY_STOPPED);
-        builder.append("=0, ");
-        builder.append(CDODBSchema.REPOSITORY_NEXT_CDOID);
-        builder.append("=");
-        builder.append(CRASHED);
-        builder.append(", ");
-        builder.append(CDODBSchema.REPOSITORY_NEXT_METAID);
-        builder.append("=");
-        builder.append(CRASHED);
-
-        String sql = builder.toString();
-        int count = DBUtil.update(connection, sql);
-        if (count == 0)
-        {
-          throw new DBException("No row updated in table " + CDODBSchema.REPOSITORY);
-        }
-      }
-
-      nextPackageID = DBUtil.selectMaximumInt(connection, CDODBSchema.PACKAGES_ID) + 1;
-      nextClassID = DBUtil.selectMaximumInt(connection, CDODBSchema.CLASSES_ID) + 1;
-      nextFeatureID = DBUtil.selectMaximumInt(connection, CDODBSchema.FEATURES_ID) + 1;
-      LifecycleUtil.activate(mappingStrategy);
-    }
-    finally
-    {
-      DBUtil.close(connection);
-    }
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    Connection connection = null;
-
-    try
-    {
-      connection = getConnection();
-
-      LifecycleUtil.deactivate(mappingStrategy);
-
-      StringBuilder builder = new StringBuilder();
-      builder.append("UPDATE ");
-      builder.append(CDODBSchema.REPOSITORY);
-      builder.append(" SET ");
-      builder.append(CDODBSchema.REPOSITORY_STOPPED);
-      builder.append("=");
-      builder.append(getShutdownTime());
-      builder.append(", ");
-      builder.append(CDODBSchema.REPOSITORY_NEXT_CDOID);
-      builder.append("=");
-      builder.append(getLastObjectID());
-      builder.append(", ");
-      builder.append(CDODBSchema.REPOSITORY_NEXT_METAID);
-      builder.append("=");
-      builder.append(getRepository().getLastMetaID());
-
-      String sql = builder.toString();
-      int count = DBUtil.update(connection, sql);
-      if (count == 0)
-      {
-        throw new DBException("No row updated in table " + CDODBSchema.REPOSITORY);
-      }
-    }
-    finally
-    {
-      DBUtil.close(connection);
-    }
-
-    super.doDeactivate();
-  }
-
-  @Override
-  public void repairAfterCrash()
-  {
-    DBStoreReader storeReader = getReader(null);
-    StoreUtil.setReader(storeReader);
-
-    try
-    {
-      Connection connection = storeReader.getConnection();
-      long maxObjectID = mappingStrategy.repairAfterCrash(connection);
-      setLastMetaID(DBUtil.selectMaximumLong(connection, CDODBSchema.PACKAGES_RANGE_UB));
-
-      OM.LOG.info(MessageFormat.format("Repaired after crash: maxObjectID={0}, maxMetaID={1}", maxObjectID,
-          getLastMetaID()));
-      setLastObjectID(maxObjectID);
-    }
-    finally
-    {
-      storeReader.release();
-      StoreUtil.setReader(null);
-    }
-  }
-
-  protected IDBSchema createSchema()
-  {
-    String name = getRepository().getName();
-    return new DBSchema(name);
-  }
-
-  protected long getStartupTime()
-  {
-    return System.currentTimeMillis();
-  }
-
-  protected long getShutdownTime()
-  {
-    return System.currentTimeMillis();
-  }
-
-  public static DBType getDBType(CDOType type)
-  {
-    if (type == CDOType.BOOLEAN || type == CDOType.BOOLEAN_OBJECT)
-    {
-      return DBType.BOOLEAN;
-    }
-    else if (type == CDOType.BYTE || type == CDOType.BYTE_OBJECT)
-    {
-      return DBType.SMALLINT;
-    }
-    else if (type == CDOType.CHAR || type == CDOType.CHARACTER_OBJECT)
-    {
-      return DBType.CHAR;
-    }
-    else if (type == CDOType.DATE)
-    {
-      return DBType.DATE;
-    }
-    else if (type == CDOType.DOUBLE || type == CDOType.DOUBLE_OBJECT)
-    {
-      return DBType.DOUBLE;
-    }
-    else if (type == CDOType.FLOAT || type == CDOType.FLOAT_OBJECT)
-    {
-      return DBType.FLOAT;
-    }
-    else if (type == CDOType.INT || type == CDOType.INTEGER_OBJECT)
-    {
-      return DBType.INTEGER;
-    }
-    else if (type == CDOType.LONG || type == CDOType.LONG_OBJECT)
-    {
-      return DBType.BIGINT;
-    }
-    else if (type == CDOType.OBJECT)
-    {
-      return DBType.BIGINT;
-    }
-    else if (type == CDOType.SHORT || type == CDOType.SHORT_OBJECT)
-    {
-      return DBType.SMALLINT;
-    }
-    else if (type == CDOType.STRING || type == CDOType.CUSTOM)
-    {
-      return DBType.VARCHAR;
-    }
-
-    throw new ImplementationError("Unrecognized CDOType: " + type);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
deleted file mode 100644
index e99a08aeae..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.server.StoreAccessor;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.server.ISession;
-import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStoreAccessor;
-import org.eclipse.emf.cdo.server.db.IMappingStrategy;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.ddl.IDBTable;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor
-{
-  private Connection connection;
-
-  private Statement statement;
-
-  protected DBStoreAccessor(DBStore store, ISession session) throws DBException
-  {
-    super(store, session);
-    initConnection();
-  }
-
-  protected DBStoreAccessor(DBStore store, IView view) throws DBException
-  {
-    super(store, view);
-    initConnection();
-  }
-
-  protected void initConnection()
-  {
-    try
-    {
-      connection = getStore().getDBConnectionProvider().getConnection();
-      connection.setAutoCommit(isReader());
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  @Override
-  protected void doRelease() throws DBException
-  {
-    DBUtil.close(statement);
-    DBUtil.close(connection);
-  }
-
-  @Override
-  public DBStore getStore()
-  {
-    return (DBStore)super.getStore();
-  }
-
-  public Connection getConnection()
-  {
-    return connection;
-  }
-
-  public Statement getStatement()
-  {
-    if (statement == null)
-    {
-      try
-      {
-        statement = getConnection().createStatement();
-      }
-      catch (SQLException ex)
-      {
-        throw new DBException(ex);
-      }
-    }
-
-    return statement;
-  }
-
-  public PreparedStatement prepareStatement(String sql)
-  {
-    try
-    {
-      return getConnection().prepareStatement(sql);
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  /**
-   * TODO Move this somehow to DBAdapter
-   */
-  protected Boolean getBoolean(Object value)
-  {
-    if (value == null)
-    {
-      return null;
-    }
-
-    if (value instanceof Boolean)
-    {
-      return (Boolean)value;
-    }
-
-    if (value instanceof Number)
-    {
-      return ((Number)value).intValue() != 0;
-    }
-
-    throw new IllegalArgumentException("Not a boolean value: " + value);
-  }
-
-  protected Set<IDBTable> mapPackages(CDOPackage... cdoPackages)
-  {
-    Set<IDBTable> affectedTables = new HashSet<IDBTable>();
-    if (cdoPackages != null && cdoPackages.length != 0)
-    {
-      for (CDOPackage cdoPackage : cdoPackages)
-      {
-        Set<IDBTable> tables = mapClasses(cdoPackage.getClasses());
-        affectedTables.addAll(tables);
-      }
-    }
-
-    return affectedTables;
-  }
-
-  protected Set<IDBTable> mapClasses(CDOClass... cdoClasses)
-  {
-    Set<IDBTable> affectedTables = new HashSet<IDBTable>();
-    if (cdoClasses != null && cdoClasses.length != 0)
-    {
-      IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
-      for (CDOClass cdoClass : cdoClasses)
-      {
-        IClassMapping mapping = mappingStrategy.getClassMapping(cdoClass);
-        if (mapping != null)
-        {
-          affectedTables.addAll(mapping.getAffectedTables());
-        }
-      }
-    }
-
-    return affectedTables;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java
deleted file mode 100644
index d056a05da4..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreChunkReader.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.server.StoreChunkReader;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStoreChunkReader;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-import org.eclipse.emf.cdo.server.db.IMappingStrategy;
-import org.eclipse.emf.cdo.server.db.IReferenceMapping;
-
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class DBStoreChunkReader extends StoreChunkReader implements IDBStoreChunkReader
-{
-  private IReferenceMapping referenceMapping;
-
-  private StringBuilder builder = new StringBuilder();
-
-  public DBStoreChunkReader(IDBStoreReader storeReader, CDORevision revision, CDOFeature feature)
-  {
-    super(storeReader, revision, feature);
-    IMappingStrategy mappingStrategy = storeReader.getStore().getMappingStrategy();
-    IClassMapping mapping = mappingStrategy.getClassMapping(revision.getCDOClass());
-    referenceMapping = mapping.getReferenceMapping(feature);
-  }
-
-  @Override
-  public DBStoreReader getStoreReader()
-  {
-    return (DBStoreReader)super.getStoreReader();
-  }
-
-  @Override
-  public void addSimpleChunk(int index)
-  {
-    super.addSimpleChunk(index);
-    builder.append(" AND ");
-    builder.append(CDODBSchema.REFERENCES_IDX);
-    builder.append("=");
-    builder.append(index);
-  }
-
-  @Override
-  public void addRangedChunk(int fromIndex, int toIndex)
-  {
-    super.addRangedChunk(fromIndex, toIndex);
-    builder.append(" AND ");
-    builder.append(CDODBSchema.REFERENCES_IDX);
-    builder.append(" BETWEEN ");
-    builder.append(fromIndex);
-    builder.append(" AND ");
-    builder.append(toIndex);
-  }
-
-  public List<Chunk> executeRead()
-  {
-    List<Chunk> chunks = getChunks();
-    referenceMapping.readChunks(this, chunks, builder.toString());
-    return chunks;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreReader.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreReader.java
deleted file mode 100644
index d6e291b13c..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreReader.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.protocol.id.CDOIDMetaImpl;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
-import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
-import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage;
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange;
-import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOModelUtil;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo;
-import org.eclipse.emf.cdo.protocol.model.CDOType;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil;
-import org.eclipse.emf.cdo.server.IPackageManager;
-import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.server.IRevisionManager;
-import org.eclipse.emf.cdo.server.ISession;
-import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-import org.eclipse.emf.cdo.server.db.IMappingStrategy;
-import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBRowHandler;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.io.CloseableIterator;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * @author Eike Stepper
- */
-public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, DBStoreReader.class);
-
-  public DBStoreReader(DBStore store, ISession session) throws DBException
-  {
-    super(store, session);
-  }
-
-  protected DBStoreReader(DBStore store, IView view) throws DBException
-  {
-    super(store, view);
-  }
-
-  public DBStoreChunkReader createChunkReader(CDORevision revision, CDOFeature feature)
-  {
-    return new DBStoreChunkReader(this, revision, feature);
-  }
-
-  public Collection<CDOPackageInfo> readPackageInfos()
-  {
-    final Collection<CDOPackageInfo> result = new ArrayList<CDOPackageInfo>(0);
-    IDBRowHandler rowHandler = new IDBRowHandler()
-    {
-      public boolean handle(int row, final Object... values)
-      {
-        String packageURI = (String)values[0];
-        boolean dynamic = getBoolean(values[1]);
-        long lowerBound = (Long)values[2];
-        long upperBound = (Long)values[3];
-        CDOIDMetaRange metaIDRange = lowerBound == 0 ? null : CDOIDUtil.createMetaRange(new CDOIDMetaImpl(lowerBound),
-            (int)(upperBound - lowerBound) + 1);
-        String parentURI = (String)values[4];
-
-        result.add(new CDOPackageInfo(packageURI, dynamic, metaIDRange, parentURI));
-        return true;
-      }
-    };
-
-    DBUtil.select(getConnection(), rowHandler, CDODBSchema.PACKAGES_URI, CDODBSchema.PACKAGES_DYNAMIC,
-        CDODBSchema.PACKAGES_RANGE_LB, CDODBSchema.PACKAGES_RANGE_UB, CDODBSchema.PACKAGES_PARENT);
-    return result;
-  }
-
-  public void readPackage(CDOPackage cdoPackage)
-  {
-    String where = CDODBSchema.PACKAGES_URI.getName() + " = '" + cdoPackage.getPackageURI() + "'";
-    Object[] values = DBUtil.select(getConnection(), where, CDODBSchema.PACKAGES_ID, CDODBSchema.PACKAGES_NAME,
-        CDODBSchema.PACKAGES_ECORE);
-    PackageServerInfo.setDBID(cdoPackage, (Integer)values[0]);
-    ((InternalCDOPackage)cdoPackage).setName((String)values[1]);
-    ((InternalCDOPackage)cdoPackage).setEcore((String)values[2]);
-    readClasses(cdoPackage);
-    mapPackages(cdoPackage);
-  }
-
-  protected void readClasses(final CDOPackage cdoPackage)
-  {
-    IDBRowHandler rowHandler = new IDBRowHandler()
-    {
-      public boolean handle(int row, Object... values)
-      {
-        int classID = (Integer)values[0];
-        int classifierID = (Integer)values[1];
-        String name = (String)values[2];
-        boolean isAbstract = getBoolean(values[3]);
-        CDOClass cdoClass = CDOModelUtil.createClass(cdoPackage, classifierID, name, isAbstract);
-        ClassServerInfo.setDBID(cdoClass, classID);
-        ((InternalCDOPackage)cdoPackage).addClass(cdoClass);
-        readSuperTypes(cdoClass, classID);
-        readFeatures(cdoClass, classID);
-        return true;
-      }
-    };
-
-    String where = CDODBSchema.CLASSES_PACKAGE.getName() + "=" + ServerInfo.getDBID(cdoPackage);
-    DBUtil.select(getConnection(), rowHandler, where, CDODBSchema.CLASSES_ID, CDODBSchema.CLASSES_CLASSIFIER,
-        CDODBSchema.CLASSES_NAME, CDODBSchema.CLASSES_ABSTRACT);
-  }
-
-  protected void readSuperTypes(final CDOClass cdoClass, int classID)
-  {
-    IDBRowHandler rowHandler = new IDBRowHandler()
-    {
-      public boolean handle(int row, Object... values)
-      {
-        String packageURI = (String)values[0];
-        int classifierID = (Integer)values[1];
-        ((InternalCDOClass)cdoClass).addSuperType(CDOModelUtil.createClassRef(packageURI, classifierID));
-        return true;
-      }
-    };
-
-    String where = CDODBSchema.SUPERTYPES_TYPE.getName() + "=" + classID;
-    DBUtil.select(getConnection(), rowHandler, where, CDODBSchema.SUPERTYPES_SUPERTYPE_PACKAGE,
-        CDODBSchema.SUPERTYPES_SUPERTYPE_CLASSIFIER);
-  }
-
-  protected void readFeatures(final CDOClass cdoClass, int classID)
-  {
-    IDBRowHandler rowHandler = new IDBRowHandler()
-    {
-      public boolean handle(int row, Object... values)
-      {
-        int featureID = (Integer)values[1];
-        String name = (String)values[2];
-        CDOType type = CDOModelUtil.getType((Integer)values[3]);
-        boolean many = getBoolean(values[6]);
-
-        CDOFeature feature;
-        if (type == CDOType.OBJECT)
-        {
-          String packageURI = (String)values[4];
-          int classifierID = (Integer)values[5];
-          boolean containment = getBoolean(values[7]);
-          CDOClassRef classRef = CDOModelUtil.createClassRef(packageURI, classifierID);
-          CDOClassProxy referenceType = new CDOClassProxy(classRef, cdoClass.getPackageManager());
-          feature = CDOModelUtil.createReference(cdoClass, featureID, name, referenceType, many, containment);
-        }
-        else
-        {
-          feature = CDOModelUtil.createAttribute(cdoClass, featureID, name, type, many);
-        }
-
-        FeatureServerInfo.setDBID(feature, (Integer)values[0]);
-        ((InternalCDOClass)cdoClass).addFeature(feature);
-        return true;
-      }
-    };
-
-    String where = CDODBSchema.FEATURES_CLASS.getName() + "=" + classID;
-    DBUtil.select(getConnection(), rowHandler, where, CDODBSchema.FEATURES_ID, CDODBSchema.FEATURES_FEATURE,
-        CDODBSchema.FEATURES_NAME, CDODBSchema.FEATURES_TYPE, CDODBSchema.FEATURES_REFERENCE_PACKAGE,
-        CDODBSchema.FEATURES_REFERENCE_CLASSIFIER, CDODBSchema.FEATURES_MANY, CDODBSchema.FEATURES_CONTAINMENT);
-  }
-
-  public String readPackageURI(int packageID)
-  {
-    String where = CDODBSchema.PACKAGES_ID.getName() + "=" + packageID;
-    Object[] uri = DBUtil.select(getConnection(), where, CDODBSchema.PACKAGES_URI);
-    return (String)uri[0];
-  }
-
-  public CloseableIterator<CDOID> readObjectIDs(boolean withTypes)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Selecting object IDs");
-    }
-
-    return getStore().getMappingStrategy().readObjectIDs(this, withTypes);
-  }
-
-  public CDOClassRef readObjectType(CDOID id)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Selecting object type: {0}", id);
-    }
-
-    return getStore().getMappingStrategy().readObjectType(this, id);
-  }
-
-  public CDOClassRef readClassRef(int classID)
-  {
-    String where = CDODBSchema.CLASSES_ID.getName() + "=" + classID;
-    Object[] res = DBUtil.select(getConnection(), where, CDODBSchema.CLASSES_CLASSIFIER, CDODBSchema.CLASSES_PACKAGE);
-    int classifierID = (Integer)res[0];
-    String packageURI = readPackageURI((Integer)res[1]);
-    return CDOModelUtil.createClassRef(packageURI, classifierID);
-  }
-
-  public CDORevision readRevision(CDOID id, int referenceChunk)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Selecting revision: {0}", id);
-    }
-
-    IRevisionManager revisionManager = getStore().getRepository().getRevisionManager();
-    CDOClass cdoClass = getObjectType(id);
-    InternalCDORevision revision = (InternalCDORevision)CDORevisionUtil.create(revisionManager, cdoClass, id);
-
-    IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
-    IClassMapping mapping = mappingStrategy.getClassMapping(cdoClass);
-    mapping.readRevision(this, revision, referenceChunk);
-    return revision;
-  }
-
-  public CDORevision readRevisionByTime(CDOID id, int referenceChunk, long timeStamp)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Selecting revision: {0}, timestamp={1,date} {1,time}", id, timeStamp);
-    }
-
-    IRevisionManager revisionManager = getStore().getRepository().getRevisionManager();
-    CDOClass cdoClass = getObjectType(id);
-    InternalCDORevision revision = (InternalCDORevision)CDORevisionUtil.create(revisionManager, cdoClass, id);
-
-    IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
-    IClassMapping mapping = mappingStrategy.getClassMapping(cdoClass);
-    mapping.readRevisionByTime(this, revision, timeStamp, referenceChunk);
-    return revision;
-  }
-
-  public CDORevision readRevisionByVersion(CDOID id, int referenceChunk, int version)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Selecting revision: {0}, version={1}", id, version);
-    }
-
-    IRevisionManager revisionManager = getStore().getRepository().getRevisionManager();
-    CDOClass cdoClass = getObjectType(id);
-    InternalCDORevision revision = (InternalCDORevision)CDORevisionUtil.create(revisionManager, cdoClass, id);
-
-    IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
-    IClassMapping mapping = mappingStrategy.getClassMapping(cdoClass);
-    mapping.readRevisionByVersion(this, revision, version, referenceChunk);
-    return revision;
-  }
-
-  public CDOID readResourceID(String path)
-  {
-    IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
-    return mappingStrategy.readResourceID(this, path);
-  }
-
-  public String readResourcePath(CDOID id)
-  {
-    IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
-    return mappingStrategy.readResourcePath(this, id);
-  }
-
-  protected CDOClass getObjectType(CDOID id)
-  {
-    IRepository repository = getStore().getRepository();
-    IPackageManager packageManager = repository.getPackageManager();
-    CDOClassRef type = readObjectType(id);
-    return type.resolve(packageManager);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
deleted file mode 100644
index 19000cc706..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
-import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
-import org.eclipse.emf.cdo.protocol.id.CDOIDMeta;
-import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStoreWriter;
-import org.eclipse.emf.cdo.server.db.IMappingStrategy;
-import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class DBStoreWriter extends DBStoreReader implements IDBStoreWriter
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, DBStoreWriter.class);
-
-  public DBStoreWriter(DBStore store, IView view) throws DBException
-  {
-    super(store, view);
-  }
-
-  @Override
-  public void commit(CommitContext context)
-  {
-    super.commit(context);
-
-    try
-    {
-      getConnection().commit();
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  @Override
-  public void rollback(CommitContext context)
-  {
-    super.rollback(context);
-
-    try
-    {
-      getConnection().rollback();
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  @Override
-  protected void writePackages(CDOPackage... cdoPackages)
-  {
-    super.writePackages(cdoPackages);
-    Set<IDBTable> affectedTables = mapPackages(cdoPackages);
-    getStore().getDBAdapter().createTables(affectedTables, getConnection());
-  }
-
-  @Override
-  protected void writePackage(CDOPackage cdoPackage)
-  {
-    int id = getStore().getNextPackageID();
-    PackageServerInfo.setDBID(cdoPackage, id);
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Writing package: {0} --> {1}", cdoPackage, id);
-    }
-
-    String packageURI = cdoPackage.getPackageURI();
-    String name = cdoPackage.getName();
-    String ecore = cdoPackage.getEcore();
-    boolean dynamic = cdoPackage.isDynamic();
-    CDOIDMetaRange metaIDRange = cdoPackage.getMetaIDRange();
-    long lowerBound = metaIDRange == null ? 0L : ((CDOIDMeta)metaIDRange.getLowerBound()).getLongValue();
-    long upperBound = metaIDRange == null ? 0L : ((CDOIDMeta)metaIDRange.getUpperBound()).getLongValue();
-    String parentURI = cdoPackage.getParentURI();
-
-    String sql = "INSERT INTO " + CDODBSchema.PACKAGES + " VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
-    DBUtil.trace(sql);
-    PreparedStatement pstmt = null;
-
-    try
-    {
-      pstmt = getConnection().prepareStatement(sql);
-      pstmt.setInt(1, id);
-      pstmt.setString(2, packageURI);
-      pstmt.setString(3, name);
-      pstmt.setString(4, ecore);
-      pstmt.setBoolean(5, dynamic);
-      pstmt.setLong(6, lowerBound);
-      pstmt.setLong(7, upperBound);
-      pstmt.setString(8, parentURI);
-
-      if (pstmt.execute())
-      {
-        throw new DBException("No result set expected");
-      }
-
-      if (pstmt.getUpdateCount() == 0)
-      {
-        throw new DBException("No row inserted into table " + CDODBSchema.PACKAGES);
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      DBUtil.close(pstmt);
-    }
-
-    super.writePackage(cdoPackage);
-  }
-
-  @Override
-  protected void writeClass(InternalCDOClass cdoClass)
-  {
-    int id = getStore().getNextClassID();
-    ClassServerInfo.setDBID(cdoClass, id);
-
-    CDOPackage cdoPackage = cdoClass.getContainingPackage();
-    int packageID = ServerInfo.getDBID(cdoPackage);
-    int classifierID = cdoClass.getClassifierID();
-    String name = cdoClass.getName();
-    boolean isAbstract = cdoClass.isAbstract();
-    DBUtil.insertRow(getConnection(), getStore().getDBAdapter(), CDODBSchema.CLASSES, id, packageID, classifierID,
-        name, isAbstract);
-
-    super.writeClass(cdoClass);
-  }
-
-  @Override
-  protected void writeSuperType(InternalCDOClass type, CDOClassProxy superType)
-  {
-    int id = ClassServerInfo.getDBID(type);
-    String packageURI = superType.getPackageURI();
-    int classifierID = superType.getClassifierID();
-    DBUtil.insertRow(getConnection(), getStore().getDBAdapter(), CDODBSchema.SUPERTYPES, id, packageURI, classifierID);
-  }
-
-  @Override
-  protected void writeFeature(CDOFeature feature)
-  {
-    int id = getStore().getNextFeatureID();
-    FeatureServerInfo.setDBID(feature, id);
-
-    int classID = ServerInfo.getDBID(feature.getContainingClass());
-    String name = feature.getName();
-    int featureID = feature.getFeatureID();
-    int type = feature.getType().getTypeID();
-    CDOClassProxy reference = feature.getReferenceTypeProxy();
-    String packageURI = reference == null ? null : reference.getPackageURI();
-    int classifierID = reference == null ? 0 : reference.getClassifierID();
-    boolean many = feature.isMany();
-    boolean containment = feature.isContainment();
-    int idx = feature.getFeatureIndex();
-    DBUtil.insertRow(getConnection(), getStore().getDBAdapter(), CDODBSchema.FEATURES, id, classID, featureID, name,
-        type, packageURI, classifierID, many, containment, idx);
-  }
-
-  @Override
-  protected void writeRevision(CDORevision revision)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Writing revision: {0}", revision);
-    }
-
-    CDOClass cdoClass = revision.getCDOClass();
-    IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
-    IClassMapping mapping = mappingStrategy.getClassMapping(cdoClass);
-    mapping.writeRevision(this, revision);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureMapping.java
deleted file mode 100644
index af708c910d..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureMapping.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-
-import org.eclipse.net4j.db.IDBAdapter;
-
-/**
- * @author Eike Stepper
- */
-public class FeatureMapping
-{
-  private ClassMapping classMapping;
-
-  private CDOFeature feature;
-
-  public FeatureMapping(ClassMapping classMapping, CDOFeature feature)
-  {
-    this.classMapping = classMapping;
-    this.feature = feature;
-  }
-
-  public ClassMapping getClassMapping()
-  {
-    return classMapping;
-  }
-
-  public CDOFeature getFeature()
-  {
-    return feature;
-  }
-
-  protected IDBAdapter getDBAdapter()
-  {
-    return getClassMapping().getMappingStrategy().getStore().getDBAdapter();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java
deleted file mode 100644
index c4a9fccc28..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-
-/**
- * @author Eike Stepper
- */
-public final class FeatureServerInfo extends ServerInfo
-{
-  private FeatureServerInfo(int id)
-  {
-    super(id);
-  }
-
-  public static FeatureServerInfo setDBID(CDOFeature cdoFeature, int id)
-  {
-    FeatureServerInfo serverInfo = new FeatureServerInfo(id);
-    ((InternalCDOFeature)cdoFeature).setServerInfo(serverInfo);
-    return serverInfo;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java
deleted file mode 100644
index fadd25c0c9..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.db.IDBStoreWriter;
-
-/**
- * @author Eike Stepper
- */
-public class HorizontalClassMapping extends ClassMapping
-{
-  public HorizontalClassMapping(HorizontalMappingStrategy mappingStrategy, CDOClass cdoClass)
-  {
-    super(mappingStrategy, cdoClass, cdoClass.getAllFeatures());
-  }
-
-  @Override
-  public HorizontalMappingStrategy getMappingStrategy()
-  {
-    return (HorizontalMappingStrategy)super.getMappingStrategy();
-  }
-
-  @Override
-  public void writeRevision(IDBStoreWriter storeWriter, CDORevision revision)
-  {
-    super.writeRevision(storeWriter, revision);
-    if (revision.getVersion() == 1)
-    {
-      CDOID id = revision.getID();
-      CDOClass type = revision.getCDOClass();
-      getMappingStrategy().getObjectTypeCache().putObjectType(storeWriter, id, type);
-    }
-  }
-
-  @Override
-  protected boolean hasFullRevisionInfo()
-  {
-    return true;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
deleted file mode 100644
index d084e3e1a6..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.server.IPackageManager;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStore;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-import org.eclipse.emf.cdo.server.db.IObjectTypeCache;
-import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class HorizontalMappingStrategy extends MappingStrategy
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HorizontalMappingStrategy.class);
-
-  private IObjectTypeCache objectTypeCache;
-
-  public HorizontalMappingStrategy()
-  {
-  }
-
-  public String getType()
-  {
-    return "horizontal";
-  }
-
-  public IObjectTypeCache getObjectTypeCache()
-  {
-    return objectTypeCache;
-  }
-
-  public void setObjectTypeCache(IObjectTypeCache objectTypeCache)
-  {
-    this.objectTypeCache = objectTypeCache;
-  }
-
-  public CDOClassRef readObjectType(IDBStoreReader storeReader, CDOID id)
-  {
-    return objectTypeCache.getObjectType(storeReader, id);
-  }
-
-  protected CDOClassRef readObjectTypeFromClassesWithObjectInfo(IDBStoreReader storeReader, CDOID id)
-  {
-    String prefix = "SELECT DISTINCT " + CDODBSchema.ATTRIBUTES_CLASS + " FROM ";
-    String suffix = " WHERE " + CDODBSchema.ATTRIBUTES_ID + "=" + id;
-    for (CDOClass cdoClass : getClassesWithObjectInfo())
-    {
-      IClassMapping mapping = getClassMapping(cdoClass);
-      if (mapping != null)
-      {
-        IDBTable table = mapping.getTable();
-        if (table != null)
-        {
-          String sql = prefix + table + suffix;
-          if (TRACER.isEnabled())
-          {
-            TRACER.trace(sql);
-          }
-          ResultSet resultSet = null;
-
-          try
-          {
-            resultSet = storeReader.getStatement().executeQuery(sql);
-            if (resultSet.next())
-            {
-              int classID = resultSet.getInt(1);
-              return getClassRef(storeReader, classID);
-            }
-          }
-          catch (SQLException ex)
-          {
-            throw new DBException(ex);
-          }
-          finally
-          {
-            DBUtil.close(resultSet);
-          }
-        }
-      }
-    }
-
-    throw new DBException("No object with id " + id);
-  }
-
-  @Override
-  protected IClassMapping createClassMapping(CDOClass cdoClass)
-  {
-    if (cdoClass.isAbstract())
-    {
-      return null;
-    }
-
-    return new HorizontalClassMapping(this, cdoClass);
-  }
-
-  @Override
-  protected List<CDOClass> getClassesWithObjectInfo()
-  {
-    List<CDOClass> result = new ArrayList<CDOClass>();
-    IPackageManager packageManager = getStore().getRepository().getPackageManager();
-    for (CDOPackage cdoPackage : packageManager.getPackages())
-    {
-      for (CDOClass cdoClass : cdoPackage.getConcreteClasses())
-      {
-        if (!cdoClass.isRoot())
-        {
-          result.add(cdoClass);
-        }
-      }
-    }
-
-    return result;
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    if (objectTypeCache == null)
-    {
-      objectTypeCache = createObjectTypeCache(getStore());
-      LifecycleUtil.activate(objectTypeCache);
-    }
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    LifecycleUtil.deactivate(objectTypeCache);
-    objectTypeCache = null;
-    super.doDeactivate();
-  }
-
-  protected IObjectTypeCache createObjectTypeCache(IDBStore store)
-  {
-    ObjectTypeCache cache = new ObjectTypeCache();
-    cache.setMappingStrategy(this);
-    return cache;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
deleted file mode 100644
index c8d8c929f7..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-import org.eclipse.emf.cdo.protocol.model.resource.CDOPathFeature;
-import org.eclipse.emf.cdo.protocol.model.resource.CDOResourceClass;
-import org.eclipse.emf.cdo.server.IPackageManager;
-import org.eclipse.emf.cdo.server.db.IAttributeMapping;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStore;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-import org.eclipse.emf.cdo.server.db.IMappingStrategy;
-import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.io.CloseableIterator;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public abstract class MappingStrategy extends Lifecycle implements IMappingStrategy
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, MappingStrategy.class);
-
-  public static final String PROP_TO_MANY_REFERENCE_MAPPING = "toManyReferenceMapping";
-
-  public static final String PROP_TO_ONE_REFERENCE_MAPPING = "toOneReferenceMapping";
-
-  private IDBStore store;
-
-  private Map<String, String> properties;
-
-  private Map<Object, IDBTable> referenceTables = new HashMap<Object, IDBTable>();
-
-  private Map<Integer, CDOClassRef> classRefs = new HashMap<Integer, CDOClassRef>();
-
-  private IClassMapping resourceClassMapping;
-
-  private IAttributeMapping resourcePathMapping;
-
-  private IDBTable resourceTable;
-
-  private IDBField resourceIDField;
-
-  private IDBField resourcePathField;
-
-  public MappingStrategy()
-  {
-  }
-
-  public IDBStore getStore()
-  {
-    return store;
-  }
-
-  public void setStore(IDBStore store)
-  {
-    this.store = store;
-  }
-
-  public synchronized Map<String, String> getProperties()
-  {
-    if (properties == null)
-    {
-      properties = new HashMap<String, String>();
-    }
-
-    return properties;
-  }
-
-  public synchronized void setProperties(Map<String, String> properties)
-  {
-    this.properties = properties;
-  }
-
-  public ToMany getToMany()
-  {
-    String value = getProperties().get(PROP_TO_MANY_REFERENCE_MAPPING);
-    return value == null ? ToMany.PER_REFERENCE : ToMany.valueOf(value);
-  }
-
-  public ToOne getToOne()
-  {
-    String value = getProperties().get(PROP_TO_ONE_REFERENCE_MAPPING);
-    return value == null ? ToOne.LIKE_ATTRIBUTES : ToOne.valueOf(value);
-  }
-
-  public Map<Object, IDBTable> getReferenceTables()
-  {
-    return referenceTables;
-  }
-
-  public CDOClassRef getClassRef(IDBStoreReader storeReader, int classID)
-  {
-    CDOClassRef classRef = classRefs.get(classID);
-    if (classRef == null)
-    {
-      if (classID == ClassServerInfo.CDO_RESOURCE_CLASS_DBID)
-      {
-        IPackageManager packageManager = getStore().getRepository().getPackageManager();
-        CDOResourceClass resourceClass = packageManager.getCDOResourcePackage().getCDOResourceClass();
-        classRef = resourceClass.createClassRef();
-      }
-      else
-      {
-        classRef = storeReader.readClassRef(classID);
-      }
-
-      classRefs.put(classID, classRef);
-    }
-
-    return classRef;
-  }
-
-  public IClassMapping getClassMapping(CDOClass cdoClass)
-  {
-    IClassMapping mapping = ClassServerInfo.getClassMapping(cdoClass);
-    if (mapping == NoClassMapping.INSTANCE)
-    {
-      return null;
-    }
-
-    if (mapping == null)
-    {
-      mapping = createClassMapping(cdoClass);
-      ClassServerInfo.setClassMapping(cdoClass, mapping == null ? NoClassMapping.INSTANCE : mapping);
-    }
-
-    return mapping;
-  }
-
-  public IClassMapping getResourceClassMapping()
-  {
-    if (resourceClassMapping == null)
-    {
-      initResourceInfos();
-    }
-
-    return resourceClassMapping;
-  }
-
-  public IAttributeMapping getResourcePathMapping()
-  {
-    if (resourcePathMapping == null)
-    {
-      initResourceInfos();
-    }
-
-    return resourcePathMapping;
-  }
-
-  public IDBTable getResourceTable()
-  {
-    if (resourceTable == null)
-    {
-      initResourceInfos();
-    }
-
-    return resourceTable;
-  }
-
-  public IDBField getResourceIDField()
-  {
-    if (resourceIDField == null)
-    {
-      initResourceInfos();
-    }
-
-    return resourceIDField;
-  }
-
-  public IDBField getResourcePathField()
-  {
-    if (resourcePathField == null)
-    {
-      initResourceInfos();
-    }
-
-    return resourcePathField;
-  }
-
-  protected void initResourceInfos()
-  {
-    IPackageManager packageManager = getStore().getRepository().getPackageManager();
-    CDOResourceClass resourceClass = packageManager.getCDOResourcePackage().getCDOResourceClass();
-    CDOPathFeature pathFeature = packageManager.getCDOResourcePackage().getCDOResourceClass().getCDOPathFeature();
-
-    resourceClassMapping = getClassMapping(resourceClass);
-    resourcePathMapping = resourceClassMapping.getAttributeMapping(pathFeature);
-
-    resourceTable = resourceClassMapping.getTable();
-    resourceIDField = resourceTable.getField(CDODBSchema.ATTRIBUTES_ID);
-    resourcePathField = resourcePathMapping.getField();
-  }
-
-  public CloseableIterator<CDOID> readObjectIDs(final IDBStoreReader storeReader, final boolean withTypes)
-  {
-    List<CDOClass> classes = getClassesWithObjectInfo();
-    final Iterator<CDOClass> classIt = classes.iterator();
-    return new ObjectIDIterator(this, storeReader, withTypes)
-    {
-      @Override
-      protected ResultSet getNextResultSet()
-      {
-        while (classIt.hasNext())
-        {
-          CDOClass cdoClass = classIt.next();
-          IClassMapping mapping = getClassMapping(cdoClass);
-          if (mapping != null)
-          {
-            IDBTable table = mapping.getTable();
-            if (table != null)
-            {
-              StringBuilder builder = new StringBuilder();
-              builder.append("SELECT DISTINCT ");
-              builder.append(CDODBSchema.ATTRIBUTES_ID);
-              if (withTypes)
-              {
-                builder.append(", ");
-                builder.append(CDODBSchema.ATTRIBUTES_CLASS);
-              }
-
-              builder.append(" FROM ");
-              builder.append(table);
-              String sql = builder.toString();
-
-              try
-              {
-                return storeReader.getStatement().executeQuery(sql);
-              }
-              catch (SQLException ex)
-              {
-                throw new DBException(ex);
-              }
-            }
-          }
-        }
-
-        return null;
-      }
-    };
-  }
-
-  public CDOID readResourceID(IDBStoreReader storeReader, String path)
-  {
-    IDBTable resourceTable = getResourceTable();
-    IDBField selectField = getResourceIDField();
-    IDBField whereField = getResourcePathField();
-    return (CDOID)readResourceInfo(storeReader, resourceTable, selectField, whereField, path);
-  }
-
-  public String readResourcePath(IDBStoreReader storeReader, CDOID id)
-  {
-    IDBTable resourceTable = getResourceTable();
-    IDBField selectField = getResourcePathField();
-    IDBField whereField = getResourceIDField();
-    Object whereValue = CDOIDUtil.getLong(id);
-    return (String)readResourceInfo(storeReader, resourceTable, selectField, whereField, whereValue);
-  }
-
-  protected Object readResourceInfo(IDBStoreReader storeReader, IDBTable resourceTable, IDBField selectField,
-      IDBField whereField, Object whereValue)
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append("SELECT ");
-    builder.append(selectField);
-    builder.append(" FROM ");
-    builder.append(resourceTable);
-    builder.append(" WHERE ");
-    builder.append(whereField);
-    builder.append("=");
-    getStore().getDBAdapter().appendValue(builder, whereField, whereValue);
-
-    String sql = builder.toString();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace(sql);
-    }
-
-    ResultSet resultSet = null;
-
-    try
-    {
-      Statement statement = storeReader.getStatement();
-      statement.setMaxRows(1); // Reset by DBUtil.close(resultSet)
-
-      resultSet = statement.executeQuery(sql);
-      if (!resultSet.next())
-      {
-        return null;
-      }
-
-      if (whereValue instanceof CDOID)
-      {
-        String path = resultSet.getString(1);
-        return path;
-      }
-
-      long id = resultSet.getLong(1);
-      return CDOIDUtil.createCDOID(id);
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      DBUtil.close(resultSet);
-    }
-  }
-
-  public long repairAfterCrash(Connection connection)
-  {
-    long maxCDOID = 0L;
-    for (CDOClass idClass : getClassesWithObjectInfo())
-    {
-      IClassMapping classMapping = getClassMapping(idClass);
-      IDBTable table = classMapping.getTable();
-      IDBField idField = table.getField(CDODBSchema.ATTRIBUTES_ID);
-      long classMaxCDOID = DBUtil.selectMaximumLong(connection, idField);
-      if (TRACER.isEnabled())
-      {
-        TRACER.format("Max CDOID of table {0}: {1}", table, classMaxCDOID);
-      }
-
-      maxCDOID = Math.max(maxCDOID, classMaxCDOID);
-    }
-
-    return maxCDOID + 2L;
-  }
-
-  @Override
-  public String toString()
-  {
-    return getType();
-  }
-
-  /**
-   * The implementation of this method must take care of creating a unique ids to prevent duplicate resource paths.
-   */
-  protected abstract IClassMapping createClassMapping(CDOClass cdoClass);
-
-  protected abstract List<CDOClass> getClassesWithObjectInfo();
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    checkState(store, "store");
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/NoClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/NoClassMapping.java
deleted file mode 100644
index 6b4544117c..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/NoClassMapping.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.db.IAttributeMapping;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-import org.eclipse.emf.cdo.server.db.IDBStoreWriter;
-import org.eclipse.emf.cdo.server.db.IMappingStrategy;
-import org.eclipse.emf.cdo.server.db.IReferenceMapping;
-
-import org.eclipse.net4j.db.ddl.IDBTable;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class NoClassMapping implements IClassMapping
-{
-  public static final IClassMapping INSTANCE = new NoClassMapping();
-
-  private NoClassMapping()
-  {
-  }
-
-  public IMappingStrategy getMappingStrategy()
-  {
-    return null;
-  }
-
-  public CDOClass getCDOClass()
-  {
-    return null;
-  }
-
-  public IDBTable getTable()
-  {
-    return null;
-  }
-
-  public Set<IDBTable> getAffectedTables()
-  {
-    return Collections.emptySet();
-  }
-
-  public List<IAttributeMapping> getAttributeMappings()
-  {
-    return null;
-  }
-
-  public List<IReferenceMapping> getReferenceMappings()
-  {
-    return null;
-  }
-
-  public IAttributeMapping getAttributeMapping(CDOFeature feature)
-  {
-    return null;
-  }
-
-  public IReferenceMapping getReferenceMapping(CDOFeature feature)
-  {
-    return null;
-  }
-
-  public void writeRevision(IDBStoreWriter storeWriter, CDORevision revision)
-  {
-  }
-
-  public void readRevision(IDBStoreReader storeReader, CDORevision revision, int referenceChunk)
-  {
-  }
-
-  public void readRevisionByTime(IDBStoreReader storeReader, CDORevision revision, long timeStamp, int referenceChunk)
-  {
-  }
-
-  public void readRevisionByVersion(IDBStoreReader storeReader, CDORevision revision, int version, int referenceChunk)
-  {
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectIDIterator.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectIDIterator.java
deleted file mode 100644
index 94e3fe994a..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectIDIterator.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDObject;
-import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.util.io.CloseableIterator;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ObjectIDIterator implements CloseableIterator<CDOID>
-{
-  private MappingStrategy mappingStrategy;
-
-  private IDBStoreReader storeReader;
-
-  private boolean withTypes;
-
-  private ResultSet currentResultSet;
-
-  private CDOID nextID;
-
-  /**
-   * Creates an iterator over all objects in a store. It is important to {@link #dispose()} of this iterator after usage
-   * to properly close internal result sets.
-   */
-  public ObjectIDIterator(MappingStrategy mappingStrategy, IDBStoreReader storeReader, boolean withTypes)
-  {
-    this.mappingStrategy = mappingStrategy;
-    this.storeReader = storeReader;
-    this.withTypes = withTypes;
-  }
-
-  public void close() throws IOException
-  {
-    DBUtil.close(currentResultSet);
-  }
-
-  public MappingStrategy getMappingStrategy()
-  {
-    return mappingStrategy;
-  }
-
-  public IDBStoreReader getStoreReader()
-  {
-    return storeReader;
-  }
-
-  public boolean isWithTypes()
-  {
-    return withTypes;
-  }
-
-  public boolean hasNext()
-  {
-    nextID = null;
-    for (;;)
-    {
-      if (currentResultSet == null)
-      {
-        currentResultSet = getNextResultSet();
-        if (currentResultSet == null)
-        {
-          return false;
-        }
-      }
-
-      try
-      {
-        if (currentResultSet.next())
-        {
-          long id = currentResultSet.getLong(1);
-          nextID = CDOIDUtil.createCDOID(id);
-          if (withTypes && nextID instanceof CDOIDObject)
-          {
-            int classID = currentResultSet.getInt(2);
-            CDOClassRef classRef = mappingStrategy.getClassRef(storeReader, classID);
-            nextID = ((CDOIDObject)nextID).asLegacy(classRef);
-          }
-
-          return true;
-        }
-
-        DBUtil.close(currentResultSet);
-        currentResultSet = null;
-      }
-      catch (SQLException ex)
-      {
-        throw new DBException(ex);
-      }
-    }
-  }
-
-  public CDOID next()
-  {
-    return nextID;
-  }
-
-  public void remove()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  protected abstract ResultSet getNextResultSet();
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectTypeCache.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectTypeCache.java
deleted file mode 100644
index fd1435ebc1..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectTypeCache.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-import org.eclipse.emf.cdo.server.db.IDBStoreWriter;
-import org.eclipse.emf.cdo.server.db.IObjectTypeCache;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBSchema;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * @author Eike Stepper
- */
-public class ObjectTypeCache extends Lifecycle implements IObjectTypeCache
-{
-  private MappingStrategy mappingStrategy;
-
-  private IDBTable table;
-
-  private IDBField idField;
-
-  private IDBField typeField;
-
-  private transient Object initializeLock = new Object();
-
-  public ObjectTypeCache()
-  {
-  }
-
-  public MappingStrategy getMappingStrategy()
-  {
-    return mappingStrategy;
-  }
-
-  public void setMappingStrategy(MappingStrategy mappingStrategy)
-  {
-    this.mappingStrategy = mappingStrategy;
-  }
-
-  public CDOClassRef getObjectType(IDBStoreReader storeReader, CDOID id)
-  {
-    Statement statement = storeReader.getStatement();
-    initialize(statement);
-
-    StringBuilder builder = new StringBuilder();
-    builder.append("SELECT ");
-    builder.append(typeField);
-    builder.append(" FROM ");
-    builder.append(table);
-    builder.append(" WHERE ");
-    builder.append(idField);
-    builder.append("=");
-    builder.append(CDOIDUtil.getLong(id));
-    String sql = builder.toString();
-    DBUtil.trace(sql);
-
-    ResultSet resultSet = null;
-
-    try
-    {
-      resultSet = statement.executeQuery(sql);
-      if (!resultSet.next())
-      {
-        throw new DBException("ClassID for CDOID " + id + " not found");
-      }
-
-      int classID = resultSet.getInt(1);
-      return mappingStrategy.getClassRef(storeReader, classID);
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      DBUtil.close(resultSet);
-    }
-  }
-
-  public void putObjectType(IDBStoreWriter storeWriter, CDOID id, CDOClass type)
-  {
-    Statement statement = storeWriter.getStatement();
-    initialize(statement);
-
-    StringBuilder builder = new StringBuilder();
-    builder.append("INSERT INTO ");
-    builder.append(table);
-    builder.append(" VALUES (");
-    builder.append(CDOIDUtil.getLong(id));
-    builder.append(", ");
-    builder.append(ClassServerInfo.getDBID(type));
-    builder.append(")");
-    String sql = builder.toString();
-    DBUtil.trace(sql);
-
-    try
-    {
-      statement.execute(sql);
-      if (statement.getUpdateCount() != 1)
-      {
-        throw new DBException("Object type not inserted: " + id + " -> " + type);
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  private void initialize(Statement statement)
-  {
-    synchronized (initializeLock)
-    {
-      if (table == null)
-      {
-        IDBSchema schema = mappingStrategy.getStore().getDBSchema();
-        table = schema.addTable(CDODBSchema.CDO_OBJECTS);
-        idField = table.addField(CDODBSchema.ATTRIBUTES_ID, DBType.BIGINT);
-        typeField = table.addField(CDODBSchema.ATTRIBUTES_CLASS, DBType.INTEGER);
-        table.addIndex(IDBIndex.Type.PRIMARY_KEY, idField);
-
-        IDBAdapter dbAdapter = mappingStrategy.getStore().getDBAdapter();
-        dbAdapter.createTable(table, statement);
-      }
-    }
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    checkState(mappingStrategy, "mappingStrategy");
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    table = null;
-    idField = null;
-    typeField = null;
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/PackageServerInfo.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/PackageServerInfo.java
deleted file mode 100644
index 73f04217ff..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/PackageServerInfo.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-
-import org.eclipse.net4j.db.ddl.IDBSchema;
-
-/**
- * @author Eike Stepper
- */
-public final class PackageServerInfo extends ServerInfo
-{
-  private IDBSchema schema;
-
-  private PackageServerInfo(int id)
-  {
-    super(id);
-  }
-
-  public static PackageServerInfo setDBID(CDOPackage cdoPackage, int id)
-  {
-    PackageServerInfo serverInfo = new PackageServerInfo(id);
-    ((InternalCDOPackage)cdoPackage).setServerInfo(serverInfo);
-    return serverInfo;
-  }
-
-  public static IDBSchema getSchema(CDOPackage cdoPackage)
-  {
-    return ((PackageServerInfo)cdoPackage.getServerInfo()).schema;
-  }
-
-  public static void setSchema(CDOPackage cdoPackage, IDBSchema schema)
-  {
-    ((PackageServerInfo)cdoPackage.getServerInfo()).schema = schema;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java
deleted file mode 100644
index f13935a8a6..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.server.IStoreChunkReader.Chunk;
-import org.eclipse.emf.cdo.server.db.IDBStoreAccessor;
-import org.eclipse.emf.cdo.server.db.IDBStoreChunkReader;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-import org.eclipse.emf.cdo.server.db.IDBStoreWriter;
-import org.eclipse.emf.cdo.server.db.IReferenceMapping;
-import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.collection.MoveableList;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class ReferenceMapping extends FeatureMapping implements IReferenceMapping
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, ReferenceMapping.class);
-
-  private static final String SELECT_SUFFIX = " ORDER BY " + CDODBSchema.REFERENCES_IDX;
-
-  private IDBTable table;
-
-  private ToMany toMany;
-
-  private boolean withFeature;
-
-  private String insertPrefix;
-
-  private String selectPrefix;
-
-  public ReferenceMapping(ClassMapping classMapping, CDOFeature feature, ToMany toMany)
-  {
-    super(classMapping, feature);
-    this.toMany = toMany;
-    mapReference(classMapping.getCDOClass(), feature);
-
-    int dbFeatureID = withFeature ? FeatureServerInfo.getDBID(getFeature()) : 0;
-    insertPrefix = createInsertPrefix(dbFeatureID);
-    selectPrefix = createSelectPrefix(dbFeatureID);
-  }
-
-  public IDBTable getTable()
-  {
-    return table;
-  }
-
-  public void writeReference(IDBStoreWriter storeWriter, CDORevision revision)
-  {
-    long source = CDOIDUtil.getLong(revision.getID());
-    int version = revision.getVersion();
-
-    int idx = 0;
-    for (Object element : ((InternalCDORevision)revision).getList(getFeature()))
-    {
-      long target = CDOIDUtil.getLong((CDOID)element);
-      StringBuilder builder = new StringBuilder(insertPrefix);
-      builder.append(source);
-      builder.append(", ");
-      builder.append(version);
-      builder.append(", ");
-      builder.append(idx++);
-      builder.append(", ");
-      builder.append(target);
-      builder.append(")");
-      String sql = builder.toString();
-      getClassMapping().sqlUpdate(storeWriter, sql);
-    }
-  }
-
-  public void readReference(IDBStoreReader storeReader, CDORevision revision, int referenceChunk)
-  {
-    MoveableList<Object> list = ((InternalCDORevision)revision).getList(getFeature());
-    CDOID source = revision.getID();
-    int version = revision.getVersion();
-
-    String sql = createSelect(source, version, null);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace(sql);
-    }
-    ResultSet resultSet = null;
-
-    try
-    {
-      resultSet = storeReader.getStatement().executeQuery(sql);
-      while (resultSet.next() && (referenceChunk == CDORevision.UNCHUNKED || --referenceChunk >= 0))
-      {
-        long target = resultSet.getLong(1);
-        list.add(CDOIDUtil.createCDOID(target));
-      }
-
-      // TODO Optimize this?
-      while (resultSet.next())
-      {
-        list.add(InternalCDORevision.UNINITIALIZED);
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      DBUtil.close(resultSet);
-    }
-  }
-
-  public void readChunks(IDBStoreChunkReader chunkReader, List<Chunk> chunks, String where)
-  {
-    IDBStoreAccessor storeAccessor = chunkReader.getStoreReader();
-    CDOID source = chunkReader.getRevision().getID();
-    int version = chunkReader.getRevision().getVersion();
-
-    String sql = createSelect(source, version, where);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace(sql);
-    }
-    ResultSet resultSet = null;
-
-    try
-    {
-      Chunk chunk = null;
-      int chunkSize = 0;
-      int chunkIndex = 0;
-      int indexInChunk = 0;
-
-      resultSet = storeAccessor.getStatement().executeQuery(sql);
-      while (resultSet.next())
-      {
-        long target = resultSet.getLong(1);
-        if (chunk == null)
-        {
-          chunk = chunks.get(chunkIndex++);
-          chunkSize = chunk.size();
-        }
-
-        chunk.addID(indexInChunk++, CDOIDUtil.createCDOID(target));
-        if (indexInChunk == chunkSize)
-        {
-          chunk = null;
-          indexInChunk = 0;
-        }
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      DBUtil.close(resultSet);
-    }
-  }
-
-  protected String createInsertPrefix(int dbFeatureID)
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append("INSERT INTO ");
-    builder.append(table);
-    builder.append(" VALUES (");
-    if (dbFeatureID != 0)
-    {
-      builder.append(FeatureServerInfo.getDBID(getFeature()));
-      builder.append(", ");
-    }
-
-    return builder.toString();
-  }
-
-  protected String createSelectPrefix(int dbFeatureID)
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append("SELECT ");
-    builder.append(CDODBSchema.REFERENCES_TARGET);
-    builder.append(" FROM ");
-    builder.append(table);
-    builder.append(" WHERE ");
-    if (dbFeatureID != 0)
-    {
-      builder.append(CDODBSchema.REFERENCES_FEATURE);
-      builder.append("=");
-      builder.append(dbFeatureID);
-      builder.append(" AND ");
-    }
-
-    builder.append(CDODBSchema.REFERENCES_SOURCE);
-    builder.append("=");
-    return builder.toString();
-  }
-
-  protected String createSelect(CDOID source, int version, String where)
-  {
-    StringBuilder builder = new StringBuilder(selectPrefix);
-    builder.append(CDOIDUtil.getLong(source));
-    builder.append(" AND ");
-    builder.append(CDODBSchema.REFERENCES_VERSION);
-    builder.append("=");
-    builder.append(version);
-    if (where != null)
-    {
-      builder.append(where);
-    }
-
-    builder.append(SELECT_SUFFIX);
-    return builder.toString();
-  }
-
-  protected void mapReference(CDOClass cdoClass, CDOFeature cdoFeature)
-  {
-    switch (toMany)
-    {
-    case PER_REFERENCE:
-      withFeature = false;
-      table = mapReferenceTable(cdoFeature, cdoClass.getName() + "_" + cdoFeature.getName() + "_refs");
-      break;
-
-    case PER_CLASS:
-      withFeature = true;
-      table = mapReferenceTable(cdoClass, cdoClass.getName() + "_refs");
-      break;
-
-    case PER_PACKAGE:
-      withFeature = true;
-      CDOPackage cdoPackage = cdoClass.getContainingPackage();
-      table = mapReferenceTable(cdoPackage, cdoPackage.getName() + "_refs");
-      break;
-
-    case PER_REPOSITORY:
-      withFeature = true;
-      IRepository repository = getClassMapping().getMappingStrategy().getStore().getRepository();
-      table = mapReferenceTable(repository, repository.getName() + "_refs");
-      break;
-
-    default:
-      throw new IllegalArgumentException("Invalid mapping: " + toMany);
-    }
-  }
-
-  protected IDBTable mapReferenceTable(Object key, String tableName)
-  {
-    Map<Object, IDBTable> referenceTables = getClassMapping().getMappingStrategy().getReferenceTables();
-    IDBTable table = referenceTables.get(key);
-    if (table == null)
-    {
-      table = addReferenceTable(tableName);
-      referenceTables.put(key, table);
-    }
-
-    return table;
-  }
-
-  protected IDBTable addReferenceTable(String tableName)
-  {
-    IDBTable table = getClassMapping().addTable(tableName);
-    if (withFeature)
-    {
-      table.addField(CDODBSchema.REFERENCES_FEATURE, DBType.INTEGER);
-    }
-
-    table.addField(CDODBSchema.REFERENCES_SOURCE, DBType.BIGINT);
-    table.addField(CDODBSchema.REFERENCES_VERSION, DBType.INTEGER);
-    table.addField(CDODBSchema.REFERENCES_IDX, DBType.INTEGER);
-    table.addField(CDODBSchema.REFERENCES_TARGET, DBType.BIGINT);
-    return table;
-  }
-
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/RootClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/RootClassMapping.java
deleted file mode 100644
index d21b69063a..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/RootClassMapping.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.model.core.CDOObjectClass;
-
-/**
- * @author Eike Stepper
- */
-public class RootClassMapping extends ClassMapping
-{
-  public RootClassMapping(VerticalMappingStrategy mappingStrategy)
-  {
-    super(mappingStrategy, getRootClass(mappingStrategy), null);
-    initTable(getTable(), true);
-  }
-
-  @Override
-  public VerticalMappingStrategy getMappingStrategy()
-  {
-    return (VerticalMappingStrategy)super.getMappingStrategy();
-  }
-
-  @Override
-  protected boolean hasFullRevisionInfo()
-  {
-    return true;
-  }
-
-  private static CDOObjectClass getRootClass(VerticalMappingStrategy mappingStrategy)
-  {
-    return mappingStrategy.getStore().getRepository().getPackageManager().getCDOCorePackage().getCDOObjectClass();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ServerInfo.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ServerInfo.java
deleted file mode 100644
index 250c35206d..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ServerInfo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.model.CDOModelElement;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ServerInfo
-{
-  private int dbID;
-
-  protected ServerInfo(int dbID)
-  {
-    this.dbID = dbID;
-  }
-
-  @Override
-  public String toString()
-  {
-    return String.valueOf(dbID);
-  }
-
-  public static int getDBID(CDOModelElement modelElement)
-  {
-    return ((ServerInfo)modelElement.getServerInfo()).dbID;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ToOneReferenceMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ToOneReferenceMapping.java
deleted file mode 100644
index 303f239b78..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ToOneReferenceMapping.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-
-/**
- * @author Eike Stepper
- */
-public class ToOneReferenceMapping extends AttributeMapping.AMObject
-{
-  public ToOneReferenceMapping(ClassMapping classMapping, CDOFeature feature)
-  {
-    super(classMapping, feature);
-  }
-
-  @Override
-  protected Long getRevisionValue(InternalCDORevision revision)
-  {
-    CDOID id = (CDOID)super.getRevisionValue(revision);
-    return CDOIDUtil.getLong(id);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalClassMapping.java
deleted file mode 100644
index df012fd2ba..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalClassMapping.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStoreWriter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class VerticalClassMapping extends ClassMapping
-{
-  private List<IClassMapping> superMappings;
-
-  public VerticalClassMapping(VerticalMappingStrategy mappingStrategy, CDOClass cdoClass)
-  {
-    super(mappingStrategy, cdoClass, cdoClass.getFeatures());
-    for (CDOClass superType : cdoClass.getSuperTypes())
-    {
-      IClassMapping superMapping = mappingStrategy.getClassMapping(superType);
-      if (superMapping != null)
-      {
-        if (superMappings == null)
-        {
-          superMappings = new ArrayList<IClassMapping>(0);
-        }
-
-        superMappings.add(superMapping);
-      }
-    }
-  }
-
-  @Override
-  public VerticalMappingStrategy getMappingStrategy()
-  {
-    return (VerticalMappingStrategy)super.getMappingStrategy();
-  }
-
-  @Override
-  protected boolean hasFullRevisionInfo()
-  {
-    return false;
-  }
-
-  public List<IClassMapping> getSuperMappings()
-  {
-    return superMappings;
-  }
-
-  @Override
-  public void writeRevision(IDBStoreWriter storeWriter, CDORevision revision)
-  {
-    super.writeRevision(storeWriter, revision);
-    if (superMappings != null)
-    {
-      for (IClassMapping superMapping : superMappings)
-      {
-        superMapping.writeRevision(storeWriter, revision);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java
deleted file mode 100644
index 10918e5438..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.db;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-import org.eclipse.emf.cdo.server.db.IClassMapping;
-import org.eclipse.emf.cdo.server.db.IDBStoreReader;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class VerticalMappingStrategy extends MappingStrategy
-{
-  private RootClassMapping rootClassMapping;
-
-  public VerticalMappingStrategy()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public String getType()
-  {
-    return "vertical";
-  }
-
-  public RootClassMapping getRootClassMapping()
-  {
-    if (rootClassMapping == null)
-    {
-      rootClassMapping = new RootClassMapping(this);
-    }
-
-    return rootClassMapping;
-  }
-
-  public CDOClassRef readObjectType(IDBStoreReader storeReader, CDOID id)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  protected IClassMapping createClassMapping(CDOClass cdoClass)
-  {
-    return new VerticalClassMapping(this, cdoClass);
-  }
-
-  @Override
-  protected List<CDOClass> getClassesWithObjectInfo()
-  {
-    return Collections.singletonList(rootClassMapping.getCDOClass());
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.classpath b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.classpath
deleted file mode 100644
index 304e86186a..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.cvsignore b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.cvsignore
deleted file mode 100644
index e59ed82764..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-doc
-*.jar
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.project b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.project
deleted file mode 100644
index 96fd1e4a66..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.cdo.server.hibernate.teneo</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 50108d0151..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,335 +0,0 @@
-#Sat May 10 11:37:54 CEST 2008
-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.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.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.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-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=ignore
-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.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=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=ignore
-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=ignore
-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.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-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.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.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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 1de73a7bf9..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:47:53 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 1936d37033..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:11:00 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 6b005097b5..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:11:00 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index e03b596f21..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Mar 03 10:59:33 CET 2008
-eclipse.preferences.version=1
-resolve.requirebundle=false
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
deleted file mode 100644
index 48caec1f09..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.emf.cdo.server.hibernate.teneo;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.emf.cdo.server.hibernate;visibility:=reexport,
- org.eclipse.emf.teneo.hibernate.mapper;visibility:=reexport
-Import-Package: org.hibernate.cfg
-Export-Package: org.eclipse.emf.cdo.server.hibernate.teneo
-Eclipse-BuddyPolicy: dependent
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/build.properties b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/build.properties
deleted file mode 100644
index 2259a9eec4..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties
-jars.extra.classpath = platform:/plugin/org.eclipse.emf.cdo.server.hibernate.libraries/lib/hibernate3.jar
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/copyright.txt b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/copyright.txt
deleted file mode 100644
index ae21640f79..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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:
-   Martin Taal - initial API and implementation
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/epl-v10.html b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/license.html b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties
deleted file mode 100644
index 9ca0b55104..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Server Hibernate Teneo Integration (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoHibernateMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoHibernateMappingProvider.java
deleted file mode 100644
index fa6c648925..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoHibernateMappingProvider.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Springsite B.V. 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:
- *    Martin Taal - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.server.hibernate.teneo;
-
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateMappingProvider;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateStore;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.WrappedException;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.emf.teneo.hibernate.cdo.CDOHelper;
-
-import org.hibernate.cfg.Configuration;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * Uses the ecore string in the cdoPackages of the store to generate a mapping.
- * 
- * @author Martin Taal
- */
-public class TeneoHibernateMappingProvider implements IHibernateMappingProvider
-{
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, TeneoHibernateMappingProvider.class);
-
-  private IHibernateStore hibernateStore;
-
-  public void addMapping(Configuration configuration)
-  {
-    final String mapping = generateMapping();
-    TRACER.trace("Generated hibernate mapping:");
-    TRACER.trace(mapping);
-    System.err.println(mapping);
-    configuration.addXML(mapping);
-    TRACER.trace("Added mapping to configuration");
-  }
-
-  // the passed modelObjects collection is defined as a collection of Objects
-  // to prevent binary dependency on emf.
-  public String generateMapping()
-  {
-    TRACER.trace("Generating Hibernate Mapping");
-    final Properties properties = HibernateUtil.getInstance().getPropertiesFromStore(getHibernateStore());
-
-    // TODO: handle nested package structures
-    final List<EPackage> epacks = new ArrayList<EPackage>();
-    final ResourceSet rs = new ResourceSetImpl();
-    rs.getPackageRegistry().put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE);
-    rs.getPackageRegistry().put(XMLTypePackage.eNS_URI, XMLTypePackage.eINSTANCE);
-    rs.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new EcoreResourceFactoryImpl());
-    for (CDOPackage cdoPackage : getHibernateStore().getPackageHandler().getCDOPackages())
-    {
-      TRACER.trace("Using cdoPackage : " + cdoPackage.getName() + " - " + cdoPackage.getPackageURI());
-      final String ecoreStr = cdoPackage.getEcore();
-      if (ecoreStr == null)
-      {
-        // happens at initialization time
-        continue;
-      }
-      // this assumes that the (default) encoding is the same on both the client and
-      // server
-      final ByteArrayInputStream bis = new ByteArrayInputStream(ecoreStr.getBytes());
-      // fool the resourceset by passing a fake uri
-      final URI epackageURI = URI.createURI(cdoPackage.getPackageURI());
-      final Resource resource = rs.createResource(epackageURI);
-      try
-      {
-        resource.load(bis, Collections.EMPTY_MAP);
-
-        // now the toplevel content should be EPackage
-        for (Object contentObject : resource.getContents())
-        {
-          epacks.addAll(resolveSubPackages((EPackage)contentObject));
-        }
-      }
-      catch (Exception e)
-      {
-        throw WrappedException.wrap(e);
-      }
-    }
-
-    // translate the list of EPackages to an array
-    final EPackage[] ePackageArray = epacks.toArray(new EPackage[epacks.size()]);
-
-    return CDOHelper.getInstance().generateMapping(ePackageArray, properties);
-  }
-
-  // this will check the global package registry and read the epackages from
-  // there if the epackage is already present there
-  protected List<EPackage> resolveSubPackages(EPackage epack)
-  {
-    final List<EPackage> epacks = new ArrayList<EPackage>();
-    if (EPackage.Registry.INSTANCE.get(epack.getNsURI()) != null)
-    {
-      epacks.add((EPackage)EPackage.Registry.INSTANCE.get(epack.getNsURI()));
-    }
-    else
-    {
-      epacks.add(epack);
-    }
-
-    for (EPackage subEPackage : epack.getESubpackages())
-    {
-      epacks.addAll(resolveSubPackages(subEPackage));
-    }
-    return epacks;
-  }
-
-  public IHibernateStore getHibernateStore()
-  {
-    return hibernateStore;
-  }
-
-  public void setHibernateStore(IHibernateStore hibernateStore)
-  {
-    this.hibernateStore = hibernateStore;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.classpath b/plugins/org.eclipse.emf.cdo.server.hibernate/.classpath
deleted file mode 100644
index b6498f9459..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.cvsignore b/plugins/org.eclipse.emf.cdo.server.hibernate/.cvsignore
deleted file mode 100644
index e59ed82764..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-doc
-*.jar
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.options b/plugins/org.eclipse.emf.cdo.server.hibernate/.options
deleted file mode 100644
index b688dd9aed..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.emf.cdo.server.hibernate/debug = true
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.project b/plugins/org.eclipse.emf.cdo.server.hibernate/.project
deleted file mode 100644
index 79f5f420b3..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.cdo.server.hibernate</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7b4d6a3e82..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,329 +0,0 @@
-#Tue Mar 04 08:37:22 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-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.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-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=warning
-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.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=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=ignore
-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=ignore
-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.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-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.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.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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 3b7272149d..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:47:41 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 2faf67e44b..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:10:24 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index be6c1b0826..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:10:30 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 3864d82455..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-#Sat Mar 01 20:35:21 CET 2008
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
deleted file mode 100644
index 84ac289c37..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.emf.cdo.server.hibernate;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM$Activator
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.cdo;visibility:=reexport,
- org.eclipse.emf.cdo.server;visibility:=reexport,
- org.eclipse.emf.cdo.server.hibernate.libraries;visibility:=reexport,
- org.eclipse.emf.cdo.server.hibernate.id;visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.server.hibernate,
- org.eclipse.emf.cdo.server.internal.hibernate,
- org.eclipse.emf.cdo.server.internal.hibernate.bundle,
- org.eclipse.emf.cdo.server.internal.hibernate.info,
- org.eclipse.emf.cdo.server.internal.hibernate.tuplizer
-Eclipse-BuddyPolicy: dependent
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/about.html b/plugins/org.eclipse.emf.cdo.server.hibernate/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/about.html
+++ /dev/null
@@ -1,28 +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.emf.cdo.server.hibernate/about.ini b/plugins/org.eclipse.emf.cdo.server.hibernate/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/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.emf.cdo.server.hibernate/about.mappings b/plugins/org.eclipse.emf.cdo.server.hibernate/about.mappings
deleted file mode 100644
index 720ca870fa..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/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.emf.cdo.server.hibernate/about.properties b/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties
deleted file mode 100644
index dfbf5cee8c..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 = CDO Server Hibernate (Incubation)
-featureText = CDO Server Hibernate\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/CDO
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/build.properties b/plugins/org.eclipse.emf.cdo.server.hibernate/build.properties
deleted file mode 100644
index d936599c9b..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.xml,\
-               plugin.properties,\
-               mappings/,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/copyright.txt b/plugins/org.eclipse.emf.cdo.server.hibernate/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/epl-v10.html b/plugins/org.eclipse.emf.cdo.server.hibernate/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/license.html b/plugins/org.eclipse.emf.cdo.server.hibernate/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/mappings/meta.hbm.xml b/plugins/org.eclipse.emf.cdo.server.hibernate/mappings/meta.hbm.xml
deleted file mode 100644
index 4144776433..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/mappings/meta.hbm.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.eclipse.emf.cdo.internal.protocol.model">
-
-	<class name="CDOModelElementImpl" table="cdo_modelelements" lazy="false">
-		<id name="serverInfo" column="id" type="int">
-			<generator class="increment" />
-		</id>
-		<property name="name" type="string" not-null="true" length="255" />
-	</class> 
-
-	<joined-subclass name="CDOPackageImpl" table="cdo_packages" lazy="false" extends="CDOModelElementImpl">
-		<key/>
-		<property name="packageURI" column="uri" type="string" not-null="true" length="255" />
-		<property name="ecore" type="text" not-null="false" />
-		<property name="dynamic" type="boolean" not-null="true" />
-		<property name="parentURI" column="parentUri" type="string" length="255" />
-
-		<property name="metaIDRange"
-			type="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDMetaRangeUserType" not-null="true">
-			<column name="metaIDStart" />
-			<column name="metaIDSize" />
-		</property>
-
-		<list name="classes" lazy="false" cascade="all, delete-orphan" access="field">
-			<key />
-			<list-index />
-			<one-to-many class="CDOClassImpl" />
-		</list>
-
-	</joined-subclass>
-
-	<class name="CDOClassProxy" table="cdo_classes_proxy" lazy="false">
-		<id column="id" type="int">
-			<generator class="increment" /> 
-		</id>
-		<!-- set to not-null=false because it is nullified because of persist order -->
-		<many-to-one name="cdoClass" class="CDOClassImpl" not-null="false" cascade="merge,persist,save-update,lock,refresh" column="cdoclass"/>
-	</class>
-
-	<joined-subclass name="CDOClassImpl" table="cdo_classes" lazy="false" extends="CDOModelElementImpl">
-		<key/>
-		<property name="classifierID" column="classifier" type="int" not-null="true" />
-		<property name="abstract" column="abstract" type="boolean" not-null="true" />
-
-		<list name="superTypes" lazy="false" cascade="merge,persist,save-update,lock,refresh" access="field">
-			<key>
-				<column name="supertype"/>
-			</key>
-			<list-index />
-			<many-to-many class="CDOClassProxy" />
-		</list>
-
-		<list name="features" lazy="false" cascade="all, delete-orphan" access="field">
-			<key />
-			<list-index />
-			<one-to-many class="CDOFeatureImpl" />
-		</list>
-	</joined-subclass>
-
-	<joined-subclass name="CDOFeatureImpl" table="cdo_features" extends="CDOModelElementImpl">
-		<key/>
-		<property name="featureID" column="feature" type="int" not-null="true" />
-		<property name="type" type="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOTypeUserType"
-			not-null="false" />
-		<many-to-one name="referenceType" class="CDOClassImpl" column="reftype" not-null="false" 
-			cascade="persist, merge, save-update, evict, replicate, lock, refresh"
-			access="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOFeatureReferenceTypePropertyHandler"/>
-		<property name="many" type="boolean" not-null="true" />
-		<property name="containment" type="boolean" not-null="false" />
-	</joined-subclass>
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/mappings/resource.hbm.xml b/plugins/org.eclipse.emf.cdo.server.hibernate/mappings/resource.hbm.xml
deleted file mode 100644
index f369963959..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/mappings/resource.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping auto-import="false">
-	<class entity-name="CDOResource" abstract="false" lazy="false" discriminator-value="cdoresource" table="`cdo_resources`">
-		<meta attribute="eclassName">CDOResource</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/resource/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOSyntheticIdPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOSyntheticVersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="path" type="string" not-null="true" length="255" />
-		<list name="contents" lazy="true" cascade="all,delete-orphan">
-			<key/>
-			<list-index/>
-			<element type="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDUserType">
-				<column name="entityName"/>
-				<column name="idString"/>
-				<column name="idBinary" length="1000"/>
-			</element>
-		</list>
-	</class>
-</hibernate-mapping>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/modeling32.png b/plugins/org.eclipse.emf.cdo.server.hibernate/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties b/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties
deleted file mode 100644
index ba2520ebbb..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Server Hibernate (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml b/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml
deleted file mode 100644
index fa269f23cf..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.emf.cdo.server.storeFactories">
-      <storeFactory
-            class="org.eclipse.emf.cdo.server.internal.hibernate.HibernateStoreFactory"
-            storeType="hibernate">
-      </storeFactory>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOHibernateUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOHibernateUtil.java
deleted file mode 100644
index 1545af13c9..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOHibernateUtil.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, 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
- *    Martin Taal - added mappingProvider support
- **************************************************************************/
-package org.eclipse.emf.cdo.server.hibernate;
-
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateStore;
-
-/**
- * @author Eike Stepper
- * @author Martin Taal
- */
-public final class CDOHibernateUtil
-{
-  private CDOHibernateUtil()
-  {
-  }
-
-  public static IHibernateStore createStore(IHibernateMappingProvider mappingProvider)
-  {
-    return new HibernateStore(mappingProvider);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateMappingProvider.java
deleted file mode 100644
index 2b1ec7df41..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateMappingProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal 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:
- *    Martin Taal - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.server.hibernate;
-
-import org.hibernate.cfg.Configuration;
-
-/**
- * A mappingprovider adds a hibernate mapping to a hibernate configuration object.
- * 
- * @author Martin Taal
- */
-public interface IHibernateMappingProvider
-{
-  /** Adds a mapping to a configuration object */
-  public void addMapping(Configuration configuration);
-
-  /** Sets the Store in the mapping provider, is called before addMapping. */
-  public void setHibernateStore(IHibernateStore hibernateStore);
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java
deleted file mode 100644
index 3f270d650b..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.hibernate;
-
-import org.eclipse.emf.cdo.server.ISession;
-import org.eclipse.emf.cdo.server.IStore;
-import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernatePackageHandler;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
-
-/**
- * @author Eike Stepper
- */
-public interface IHibernateStore extends IStore
-{
-  public Configuration getHibernateConfiguration();
-
-  public SessionFactory getHibernateSessionFactory();
-
-  public IHibernateStoreReader getReader(ISession session);
-
-  public IHibernateStoreWriter getWriter(IView view);
-
-  public HibernatePackageHandler getPackageHandler();
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java
deleted file mode 100644
index a506b6e5b0..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.hibernate;
-
-import org.eclipse.emf.cdo.server.IStoreAccessor;
-
-import org.hibernate.Session;
-
-/**
- * @author Eike Stepper
- */
-public interface IHibernateStoreAccessor extends IStoreAccessor
-{
-  public IHibernateStore getStore();
-
-  public Session getHibernateSession();
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java
deleted file mode 100644
index dc36a94e53..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.hibernate;
-
-import org.eclipse.emf.cdo.server.IStoreChunkReader;
-
-/**
- * @author Eike Stepper
- */
-public interface IHibernateStoreChunkReader extends IStoreChunkReader
-{
-  public IHibernateStoreReader getStoreReader();
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreReader.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreReader.java
deleted file mode 100644
index 1c2fc761b4..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreReader.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.hibernate;
-
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.IStoreReader;
-
-/**
- * @author Eike Stepper
- */
-public interface IHibernateStoreReader extends IHibernateStoreAccessor, IStoreReader
-{
-  public IHibernateStoreChunkReader createChunkReader(CDORevision revision, CDOFeature feature);
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreWriter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreWriter.java
deleted file mode 100644
index 5ebd9fac01..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreWriter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.hibernate;
-
-import org.eclipse.emf.cdo.server.IStoreWriter;
-
-/**
- * @author Eike Stepper
- */
-public interface IHibernateStoreWriter extends IHibernateStoreReader, IStoreWriter
-{
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateFileMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateFileMappingProvider.java
deleted file mode 100644
index cf62c6ee33..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateFileMappingProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Springsite B.V. 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:
- *    Martin Taal - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.server.hibernate.IHibernateMappingProvider;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateStore;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import org.hibernate.cfg.Configuration;
-
-import java.io.InputStream;
-
-/**
- * Reads the hibernate mapping file from one or more resource locations and adds them to the configuration.
- * 
- * @author Martin Taal
- */
-public class HibernateFileMappingProvider implements IHibernateMappingProvider
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateFileMappingProvider.class);
-
-  private IHibernateStore hibernateStore;
-
-  private final String[] mappingFileLocations;
-
-  public HibernateFileMappingProvider(String location)
-  {
-    this(new String[] { location });
-  }
-
-  public HibernateFileMappingProvider(String[] locations)
-  {
-    mappingFileLocations = locations;
-  }
-
-  public IHibernateStore getHibernateStore()
-  {
-    return hibernateStore;
-  }
-
-  public void setHibernateStore(IHibernateStore hibernateStore)
-  {
-    this.hibernateStore = hibernateStore;
-  }
-
-  public void addMapping(Configuration configuration)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Adding hibernate mapping from location(s):");
-    }
-
-    for (String location : mappingFileLocations)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace(location);
-      }
-
-      InputStream is = null;
-      try
-      {
-        // MT.Question: the mapping file is in a dependent plugin but when using the OM.BUNDLE
-        // it tries to find it in this plugin and I get:
-        // filenotfound:
-        // /home/mtaal/mydata/dev/workspaces/nextspace/org.eclipse.emf.cdo.server.hibernate/mappings/product.hbm.xml
-        // I have set Eclipse-BuddyPolicy to dependent
-        // is = OM.BUNDLE.getInputStream(location);
-        is = getClass().getResourceAsStream(location);
-        configuration.addInputStream(is);
-      }
-      catch (Exception e)
-      {
-        throw WrappedException.wrap(e);
-      }
-      finally
-      {
-        IOUtil.close(is);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
deleted file mode 100644
index 8f04bac94f..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, 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
- *    Martin Taal  - moved code from HibernateStore to this class
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
-import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOFeature;
-import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo;
-import org.eclipse.emf.cdo.server.IStoreWriter.CommitContext;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import org.hibernate.Criteria;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.criterion.Expression;
-import org.hibernate.tool.hbm2ddl.SchemaUpdate;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Delegate which stores and retrieves cdo packages.
- * 
- * @author Eike Stepper
- * @author Martin Taal
- */
-public class HibernatePackageHandler
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateStoreWriter.class);
-
-  private Configuration configuration;
-
-  private SessionFactory sessionFactory;
-
-  private int nextPackageID;
-
-  private int nextClassID;
-
-  private int nextFeatureID;
-
-  private Collection<CDOPackageInfo> cdoPackageInfos = null;
-
-  private HibernateStore hibernateStore;
-
-  /**
-   * TODO Necessary to pass/store/dump the properties from the store?
-   */
-  public HibernatePackageHandler(HibernateStore store)
-  {
-    hibernateStore = store;
-  }
-
-  public List<CDOPackage> getCDOPackages()
-  {
-    List<CDOPackage> cdoPackages = new ArrayList<CDOPackage>();
-    if (HibernateThreadContext.isCommitContextSet())
-    {
-      CommitContext cc = HibernateThreadContext.getCommitContext();
-      if (cc instanceof org.eclipse.emf.cdo.internal.server.Transaction)
-      {
-        org.eclipse.emf.cdo.internal.server.Transaction tx = (org.eclipse.emf.cdo.internal.server.Transaction)cc;
-        for (CDOPackage cdoPackage : tx.getNewPackages())
-        {
-          cdoPackages.add(cdoPackage);
-        }
-      }
-    }
-
-    for (CDOPackage cdoPackage : hibernateStore.getRepository().getPackageManager().getPackages())
-    {
-      cdoPackages.add(cdoPackage);
-    }
-
-    for (CDOPackage cdoPackage : cdoPackages)
-    {
-      // force resolve
-      if (cdoPackage.getClassCount() == 0)
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Returning " + cdoPackage.getPackageURI());
-        }
-      }
-    }
-
-    return cdoPackages;
-  }
-
-  public void writePackages(CDOPackage... cdoPackages)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Persisting new CDOPackages");
-    }
-
-    Session session = getSessionFactory().openSession();
-    Transaction tx = session.beginTransaction();
-    boolean err = true;
-    boolean updated = false;
-
-    try
-    {
-      for (CDOPackage cdoPackage : cdoPackages)
-      {
-        if (cdoPackageExistsAndIsUnchanged(cdoPackage))
-        {
-          OM.LOG.warn("CDOPackage " + cdoPackage.getPackageURI() + " already exists not persisting it again!");
-          continue;
-        }
-
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Persisting CDOPackage " + cdoPackage.getPackageURI());
-        }
-
-        session.saveOrUpdate(cdoPackage);
-        updated = true;
-      }
-
-      tx.commit();
-      err = false;
-    }
-    finally
-    {
-      if (err)
-      {
-        tx.rollback();
-      }
-
-      session.close();
-    }
-
-    if (updated)
-    {
-      reset();
-      hibernateStore.reInitialize();
-    }
-  }
-
-  protected boolean cdoPackageExistsAndIsUnchanged(CDOPackage newCDOPackage)
-  {
-    CDOPackage[] cdoPackages = hibernateStore.getRepository().getPackageManager().getPackages();
-    for (CDOPackage cdoPackage : cdoPackages)
-    {
-      if (cdoPackage.getClassCount() > 0 && cdoPackage.getPackageURI().compareTo(newCDOPackage.getPackageURI()) == 0)
-      {
-        return cdoPackage.getEcore().compareTo(newCDOPackage.getEcore()) == 0;
-      }
-    }
-
-    return false;
-  }
-
-  public void writePackage(CDOPackage cdoPackage)
-  {
-    if (cdoPackageExistsAndIsUnchanged(cdoPackage))
-    {
-      OM.LOG.warn("CDOPackage " + cdoPackage.getPackageURI() + " already exists not persisting it again!");
-      return;
-    }
-
-    Session session = getSessionFactory().openSession();
-    Transaction tx = session.beginTransaction();
-    boolean err = true;
-    try
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Persisting CDOPackage " + cdoPackage.getPackageURI());
-      }
-
-      session.saveOrUpdate(cdoPackage);
-      tx.commit();
-      err = false;
-    }
-    finally
-    {
-      if (err)
-      {
-        tx.rollback();
-      }
-
-      session.close();
-    }
-
-    reset();
-    hibernateStore.reInitialize();
-  }
-
-  public Collection<CDOPackageInfo> getCDOPackageInfos()
-  {
-    readPackageInfos();
-    return cdoPackageInfos;
-  }
-
-  protected void readPackage(CDOPackage cdoPackage)
-  {
-    if (cdoPackage.getClassCount() > 0)
-    { // already initialized go away
-      return;
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Reading CDOPackage with uri " + cdoPackage.getPackageURI() + " from db");
-    }
-
-    Session session = getSessionFactory().openSession();
-
-    try
-    {
-      Criteria criteria = session.createCriteria(CDOPackage.class);
-      criteria.add(Expression.eq("packageURI", cdoPackage.getPackageURI()));
-      List<?> list = criteria.list();
-      if (list.size() != 1)
-      {
-        throw new IllegalArgumentException("CDOPackage with uri " + cdoPackage.getPackageURI()
-            + " not present in the db");
-      }
-
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Found " + list.size() + " CDOPackages in DB");
-      }
-
-      CDOPackage dbPackage = (CDOPackage)list.get(0);
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Read CDOPackage: " + cdoPackage.getName());
-      }
-
-      ((InternalCDOPackage)cdoPackage).setServerInfo(dbPackage.getServerInfo());
-      ((InternalCDOPackage)cdoPackage).setName(dbPackage.getName());
-      ((InternalCDOPackage)cdoPackage).setEcore(dbPackage.getEcore());
-      ((InternalCDOPackage)cdoPackage).setMetaIDRange(cdoPackage.getMetaIDRange());
-
-      final List<CDOClass> cdoClasses = new ArrayList<CDOClass>();
-      for (CDOClass cdoClass : dbPackage.getClasses())
-      {
-        cdoClasses.add(cdoClass);
-        for (CDOFeature cdoFeature : cdoClass.getFeatures())
-        {
-          ((InternalCDOFeature)cdoFeature).setContainingClass(cdoClass);
-        }
-      }
-
-      ((CDOPackageImpl)cdoPackage).setClasses(cdoClasses);
-    }
-    finally
-    {
-      session.close();
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Finished reading CDOPackages");
-    }
-  }
-
-  protected void readPackageInfos()
-  {
-    if (cdoPackageInfos == null || cdoPackageInfos.size() == 0)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Reading CDOPackages from db");
-      }
-
-      Collection<CDOPackageInfo> result = new ArrayList<CDOPackageInfo>();
-      Session session = getSessionFactory().openSession();
-
-      try
-      {
-        Criteria criteria = session.createCriteria(CDOPackage.class);
-        List<?> list = criteria.list();
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Found " + list.size() + " CDOPackages in DB");
-        }
-
-        for (Object object : list)
-        {
-          CDOPackage cdoPackage = (CDOPackage)object;
-          if (TRACER.isEnabled())
-          {
-            TRACER.trace("Read CDOPackage: " + cdoPackage.getName());
-          }
-
-          result.add(new CDOPackageInfo(cdoPackage.getPackageURI(), cdoPackage.isDynamic(),
-              cdoPackage.getMetaIDRange(), cdoPackage.getParentURI()));
-          ((InternalCDOPackage)cdoPackage).setPackageManager(hibernateStore.getRepository().getPackageManager());
-        }
-
-        cdoPackageInfos = result;
-      }
-      finally
-      {
-        session.close();
-      }
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Finished reading CDOPackages");
-    }
-  }
-
-  public synchronized SessionFactory getSessionFactory()
-  {
-    if (sessionFactory == null)
-    {
-      sessionFactory = configuration.buildSessionFactory();
-    }
-
-    return sessionFactory;
-  }
-
-  public synchronized int getNextPackageID()
-  {
-    // TODO Better synchronization
-    return nextPackageID++;
-  }
-
-  public synchronized int getNextClassID()
-  {
-    // TODO Better synchronization
-    return nextClassID++;
-  }
-
-  public synchronized int getNextFeatureID()
-  {
-    // TODO Better synchronization
-    return nextFeatureID++;
-  }
-
-  public void reset()
-  {
-    cdoPackageInfos = null;
-  }
-
-  protected void doActivate()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Activating CDOPackageHandler");
-    }
-
-    initConfiguration();
-    initSchema();
-  }
-
-  protected void doDeactivate() throws Exception
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Deactivating CDOPackageHandler");
-    }
-
-    if (sessionFactory != null)
-    {
-      sessionFactory.close();
-      sessionFactory = null;
-    }
-  }
-
-  protected void initConfiguration()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Initializing datastore for CDO metadata");
-    }
-
-    InputStream in = null;
-
-    try
-    {
-      in = OM.BUNDLE.getInputStream("mappings/meta.hbm.xml");
-      configuration = new Configuration();
-      configuration.addInputStream(in);
-      configuration.setProperties(HibernateUtil.getInstance().getPropertiesFromStore(hibernateStore));
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-    finally
-    {
-      IOUtil.close(in);
-    }
-  }
-
-  protected void initSchema()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Updating db schema for Hibernate PackageHandler");
-    }
-
-    new SchemaUpdate(configuration).execute(true, true);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
deleted file mode 100644
index ccbb078de2..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, 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
- *    Martin Taal - moved cdopackage handler to other class, changed configuration
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.internal.protocol.id.CDOIDLibraryProviderImpl;
-import org.eclipse.emf.cdo.internal.server.Store;
-import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor;
-import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryProvider;
-import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory;
-import org.eclipse.emf.cdo.server.ISession;
-import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateMappingProvider;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateStore;
-import org.eclipse.emf.cdo.server.hibernate.internal.id.CDOIDHibernateFactoryImpl;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-import org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOInterceptor;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
-
-import java.io.InputStream;
-
-/**
- * @author Eike Stepper
- * @author Martin Taal
- */
-public class HibernateStore extends Store implements IHibernateStore
-{
-  public static final String TYPE = "hibernate";
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateStore.class);
-
-  private static final CDOIDObjectFactory CDOID_OBJECT_FACTORY = new CDOIDHibernateFactoryImpl();
-
-  private static final IDLibraryProvider CDOID_LIBRARY_PROVIDER = new IDLibraryProvider();
-
-  private static final CDOIDLibraryDescriptor CDOID_LIBRARY_DESCRIPTOR = CDOID_LIBRARY_PROVIDER
-      .createDescriptor(CDOIDHibernateFactoryImpl.class.getName());
-
-  /**
-   * Used to give different extensions of Hibernate a context when initializing
-   */
-  private static ThreadLocal<HibernateStore> currentHibernateStore = new ThreadLocal<HibernateStore>();
-
-  private Configuration hibernateConfiguration;
-
-  private SessionFactory hibernateSessionFactory;
-
-  private HibernatePackageHandler packageHandler;
-
-  private IHibernateMappingProvider mappingProvider;
-
-  public HibernateStore(IHibernateMappingProvider mappingProvider)
-  {
-    super(TYPE);
-    this.mappingProvider = mappingProvider;
-    packageHandler = new HibernatePackageHandler(this);
-
-    if (TRACER.isEnabled() && mappingProvider != null)
-    {
-      TRACER.trace("With mappingProvider " + mappingProvider.getClass().getName());
-    }
-  }
-
-  public Configuration getHibernateConfiguration()
-  {
-    return hibernateConfiguration;
-  }
-
-  public synchronized SessionFactory getHibernateSessionFactory()
-  {
-    if (hibernateSessionFactory == null)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Initializing SessionFactory for HibernateStore");
-      }
-
-      currentHibernateStore.set(this);
-
-      try
-      {
-        initConfiguration();
-        hibernateSessionFactory = hibernateConfiguration.buildSessionFactory();
-      }
-      finally
-      {
-        currentHibernateStore.set(null);
-      }
-    }
-
-    return hibernateSessionFactory;
-  }
-
-  public boolean hasAuditingSupport()
-  {
-    return false;
-  }
-
-  public boolean hasBranchingSupport()
-  {
-    return false;
-  }
-
-  public boolean hasWriteDeltaSupport()
-  {
-    return false;
-  }
-
-  public CDOIDObjectFactory getCDOIDObjectFactory()
-  {
-    return CDOID_OBJECT_FACTORY;
-  }
-
-  public CDOIDLibraryDescriptor getCDOIDLibraryDescriptor()
-  {
-    return CDOID_LIBRARY_DESCRIPTOR;
-  }
-
-  public CDOIDLibraryProvider getCDOIDLibraryProvider()
-  {
-    return CDOID_LIBRARY_PROVIDER;
-  }
-
-  @Override
-  public HibernateStoreReader getReader(ISession session)
-  {
-    return (HibernateStoreReader)super.getReader(session);
-  }
-
-  @Override
-  public HibernateStoreReader createReader(ISession session)
-  {
-    return new HibernateStoreReader(this, session);
-  }
-
-  @Override
-  public HibernateStoreWriter getWriter(IView view)
-  {
-    return (HibernateStoreWriter)super.getWriter(view);
-  }
-
-  @Override
-  public HibernateStoreWriter createWriter(IView view)
-  {
-    return new HibernateStoreWriter(this, view);
-  }
-
-  public synchronized int getNextPackageID()
-  {
-    return packageHandler.getNextPackageID();
-  }
-
-  public synchronized int getNextClassID()
-  {
-    return packageHandler.getNextClassID();
-  }
-
-  public synchronized int getNextFeatureID()
-  {
-    return packageHandler.getNextFeatureID();
-  }
-
-  public boolean wasCrashed()
-  {
-    return false;
-  }
-
-  public void repairAfterCrash()
-  {
-    throw new UnsupportedOperationException(); // TODO Implement me
-  }
-
-  public HibernatePackageHandler getPackageHandler()
-  {
-    return packageHandler;
-  }
-
-  // TODO: synchronize??
-  @Override
-  protected void doActivate() throws Exception
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Activating HibernateStore");
-    }
-
-    super.doActivate();
-
-    // Activate the package store
-    packageHandler.doActivate();
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("De-Activating HibernateStore");
-    }
-
-    if (hibernateSessionFactory != null)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Closing SessionFactory");
-      }
-
-      hibernateSessionFactory.close();
-      hibernateSessionFactory = null;
-    }
-
-    packageHandler.doDeactivate();
-
-    super.doDeactivate();
-  }
-
-  // is called after a new package has been added
-  // TODO: synchronize??
-  // TODO: combine with doActivate/doDeactivate??
-  // TODO: assumes that packageHandler has been reset
-  protected void reInitialize()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Re-Initializing HibernateStore");
-    }
-
-    if (hibernateSessionFactory != null)
-    {
-      if (!hibernateSessionFactory.isClosed())
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Closing SessionFactory");
-        }
-
-        hibernateSessionFactory.close();
-      }
-
-      hibernateSessionFactory = null;
-    }
-  }
-
-  protected void initConfiguration()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Initializing Configuration");
-    }
-
-    InputStream in = null;
-
-    try
-    {
-      hibernateConfiguration = new Configuration();
-
-      if (mappingProvider != null)
-      {
-        mappingProvider.setHibernateStore(this);
-        mappingProvider.addMapping(hibernateConfiguration);
-      }
-
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Adding resource.hbm.xml to configuration");
-      }
-
-      in = OM.BUNDLE.getInputStream("mappings/resource.hbm.xml");
-      hibernateConfiguration.addInputStream(in);
-      hibernateConfiguration.setInterceptor(new CDOInterceptor());
-      hibernateConfiguration.setProperties(HibernateUtil.getInstance().getPropertiesFromStore(this));
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-    finally
-    {
-      IOUtil.close(in);
-    }
-  }
-
-  public static HibernateStore getCurrentHibernateStore()
-  {
-    return currentHibernateStore.get();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class IDLibraryProvider extends CDOIDLibraryProviderImpl
-  {
-    public IDLibraryProvider()
-    {
-      addLibrary("hibernate-id-v1.jar", org.eclipse.emf.cdo.server.hibernate.internal.id.bundle.OM.BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
deleted file mode 100644
index 3c258d0883..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, 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
- *    Martin Taal - specific hibernate functionality
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.internal.server.StoreAccessor;
-import org.eclipse.emf.cdo.server.ISession;
-import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateStoreAccessor;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
-/**
- * @author Eike Stepper
- * @author Martin Taal
- */
-public class HibernateStoreAccessor extends StoreAccessor implements IHibernateStoreAccessor
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateStoreAccessor.class);
-
-  private Session hibernateSession;
-
-  protected HibernateStoreAccessor(HibernateStore store, ISession session)
-  {
-    super(store, session);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Created " + this.getClass().getName() + " for repository " + store.getRepository().getName());
-    }
-  }
-
-  protected HibernateStoreAccessor(HibernateStore store, IView view)
-  {
-    super(store, view);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Created " + this.getClass().getName() + " for repository " + store.getRepository().getName());
-    }
-  }
-
-  protected Session createHibernateSession()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Creating hibernate session and setting it in threadlocal HibernateThreadContext");
-    }
-
-    SessionFactory sessionFactory = getStore().getHibernateSessionFactory();
-    Session session = sessionFactory.openSession();
-    HibernateThreadContext.setSession(session);
-    return session;
-  }
-
-  @Override
-  protected void doRelease()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Releasing hibernate session");
-    }
-
-    HibernateThreadContext.setSession(null);
-    clearHibernateSession();
-  }
-
-  /** Clears the current hibernate session and sets a new one in the thread context */
-  public void resetHibernateSession()
-  {
-    clearHibernateSession();
-    getHibernateSession();
-  }
-
-  @Override
-  public HibernateStore getStore()
-  {
-    return (HibernateStore)super.getStore();
-  }
-
-  public void clearHibernateSession()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Removing hibernate session");
-    }
-
-    if (hibernateSession != null && hibernateSession.isOpen())
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Closing hibernate session");
-      }
-
-      hibernateSession.close();
-    }
-
-    hibernateSession = null;
-  }
-
-  public Session getHibernateSession()
-  {
-    if (hibernateSession == null)
-    {
-      hibernateSession = createHibernateSession();
-    }
-
-    return hibernateSession;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java
deleted file mode 100644
index 100a0da8cc..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.internal.server.StoreChunkReader;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateStoreChunkReader;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateStoreReader;
-
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class HibernateStoreChunkReader extends StoreChunkReader implements IHibernateStoreChunkReader
-{
-  public HibernateStoreChunkReader(IHibernateStoreReader storeReader, CDORevision revision, CDOFeature feature)
-  {
-    super(storeReader, revision, feature);
-  }
-
-  @Override
-  public HibernateStoreReader getStoreReader()
-  {
-    return (HibernateStoreReader)super.getStoreReader();
-  }
-
-  @Override
-  public void addSimpleChunk(int index)
-  {
-    // super.addSimpleChunk(index);
-    throw new UnsupportedOperationException(); // TODO Implement me
-  }
-
-  @Override
-  public void addRangedChunk(int fromIndex, int toIndex)
-  {
-    // super.addRangedChunk(fromIndex, toIndex);
-    throw new UnsupportedOperationException(); // TODO Implement me
-  }
-
-  public List<Chunk> executeRead()
-  {
-    throw new UnsupportedOperationException(); // TODO Implement me
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java
deleted file mode 100644
index 6cda2111c7..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.server.IStore;
-import org.eclipse.emf.cdo.server.IStoreFactory;
-
-import org.w3c.dom.Element;
-
-/**
- * @author Eike Stepper
- */
-public class HibernateStoreFactory implements IStoreFactory
-{
-  public HibernateStoreFactory()
-  {
-  }
-
-  public String getStoreType()
-  {
-    return HibernateStore.TYPE;
-  }
-
-  public IStore createStore(Element storeConfig)
-  {
-    throw new UnsupportedOperationException(); // TODO Implement me
-    // IMappingStrategy mappingStrategy = getMappingStrategy(storeConfig);
-    // IDBAdapter dbAdapter = getDBAdapter(storeConfig);
-    // DataSource dataSource = getDataSource(storeConfig);
-    // IDBConnectionProvider connectionProvider = DBUtil.createConnectionProvider(dataSource);
-    // HibernateStore store = new HibernateStore(mappingStrategy, dbAdapter, connectionProvider);
-    // mappingStrategy.setStore(store);
-    // return store;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreReader.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreReader.java
deleted file mode 100644
index 5c2d080336..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreReader.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, 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
- *    Martin Taal - specific hibernate functionality
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo;
-import org.eclipse.emf.cdo.protocol.model.resource.CDOResourceClass;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.ISession;
-import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateStoreReader;
-import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.io.CloseableIterator;
-
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.criterion.Expression;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- * @author Martin Taal
- */
-public class HibernateStoreReader extends HibernateStoreAccessor implements IHibernateStoreReader
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateStoreReader.class);
-
-  public HibernateStoreReader(HibernateStore store, ISession session)
-  {
-    super(store, session);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Created " + this.getClass().getName() + " for repository " + store.getRepository().getName());
-    }
-  }
-
-  protected HibernateStoreReader(HibernateStore store, IView view)
-  {
-    super(store, view);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Created " + this.getClass().getName() + " for repository " + store.getRepository().getName());
-    }
-  }
-
-  public HibernateStoreChunkReader createChunkReader(CDORevision revision, CDOFeature feature)
-  {
-    return new HibernateStoreChunkReader(this, revision, feature);
-  }
-
-  public CloseableIterator<CDOID> readObjectIDs(boolean withTypes)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public CDOClassRef readObjectType(CDOID id)
-  {
-    CDORevision cdoRevision = readRevision(id, -1);
-    return cdoRevision.getCDOClass().createClassRef();
-  }
-
-  public void readPackage(CDOPackage cdoPackage)
-  {
-    getStore().getPackageHandler().readPackage(cdoPackage);
-  }
-
-  public Collection<CDOPackageInfo> readPackageInfos()
-  {
-    return getStore().getPackageHandler().getCDOPackageInfos();
-  }
-
-  public CDOID readResourceID(String path)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Finding resourceid using path " + path);
-    }
-
-    Session session = getHibernateSession();
-    Criteria criteria = session.createCriteria(CDOResourceClass.NAME);
-    criteria.add(Expression.eq("path", path));
-    List<?> result = criteria.list();
-    if (result.size() == 0)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Resource not found");
-      }
-
-      // TODO: throw exception?
-      return null;
-    }
-
-    // TODO: throw exception if list.size() > 1?
-    CDORevision cdoRevision = (CDORevision)result.get(0);
-    return cdoRevision.getID();
-  }
-
-  public String readResourcePath(CDOID id)
-  {
-    if (id == null)
-    {
-      throw new IllegalArgumentException("ID must be not null");
-    }
-
-    if (!(id instanceof CDOIDHibernate))
-    {
-      throw new IllegalArgumentException("ID type " + id.getClass().getName() + " not supported by hibernate reader");
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Finding resource using id " + id);
-    }
-
-    Session session = getHibernateSession();
-    Query qry = session.createQuery("select path from " + CDOResourceClass.NAME + " where id=:id");
-    CDOIDHibernate idHibernate = (CDOIDHibernate)id;
-    qry.setParameter("id", idHibernate.getId());
-    final List<?> result = qry.list();
-    if (result.size() == 0)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Resource not found");
-      }
-
-      // TODO: throw exception?
-      return null;
-    }
-
-    return (String)result.get(0);
-  }
-
-  public CDORevision readRevision(CDOID id, int referenceChunk)
-  {
-    return HibernateUtil.getInstance().getCDORevision(id);
-  }
-
-  public CDORevision readRevisionByTime(CDOID id, int referenceChunk, long timeStamp)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public CDORevision readRevisionByVersion(CDOID id, int referenceChunk, int version)
-  {
-    // TODO Could be necessary to implement
-    throw new UnsupportedOperationException();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreWriter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreWriter.java
deleted file mode 100644
index 2757de3dde..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreWriter.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, 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
- *    Martin Taal - added hibernate specific implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
-import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
-import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta;
-import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateStoreWriter;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.WrappedException;
-
-import org.hibernate.FlushMode;
-import org.hibernate.Session;
-
-/**
- * @author Eike Stepper
- */
-public class HibernateStoreWriter extends HibernateStoreReader implements IHibernateStoreWriter
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateStoreWriter.class);
-
-  public HibernateStoreWriter(HibernateStore store, IView view)
-  {
-    super(store, view);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Created " + this.getClass().getName() + " for repository " + store.getRepository().getName());
-    }
-  }
-
-  @Override
-  public void commit(CommitContext context)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Committing transaction");
-    }
-
-    HibernateThreadContext.setCommitContext(context);
-    writePackages(context.getNewPackages());
-
-    try
-    {
-      // start with fresh hibernate session
-      Session session = getHibernateSession();
-      session.setFlushMode(FlushMode.COMMIT);
-      session.beginTransaction();
-      for (Object o : context.getNewObjects())
-      {
-        CDORevision cdoRevision = (CDORevision)o;
-        session.save(HibernateUtil.getInstance().getEntityName(cdoRevision), o);
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Persisted new Object " + ((CDORevision)o).getCDOClass().getName() + " id: "
-              + cdoRevision.getID());
-        }
-      }
-
-      for (Object o : context.getDirtyObjects())
-      {
-        try
-        {
-          CDORevision cdoRevision = (CDORevision)o;
-          if (cdoRevision instanceof CDORevisionImpl)
-          {
-            ((CDORevisionImpl)cdoRevision).setVersion(cdoRevision.getVersion() - 1);
-          }
-
-          session.update(HibernateUtil.getInstance().getEntityName(cdoRevision), o);
-          if (TRACER.isEnabled())
-          {
-            TRACER.trace("Updated Object " + ((CDORevision)o).getCDOClass().getName() + " id: " + cdoRevision.getID());
-          }
-        }
-        catch (Exception e)
-        {
-          OM.LOG.error(e);
-          throw WrappedException.wrap(e);
-        }
-      }
-
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Commit hibernate transaction");
-      }
-
-      session.getTransaction().commit();
-    }
-    finally
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Clearing used hibernate session");
-      }
-
-      HibernateThreadContext.setCommitContext(null);
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Applying id mappings");
-    }
-
-    context.applyIDMappings();
-  }
-
-  @Override
-  public boolean isReader()
-  {
-    // TODO Is this necessary?
-    return false;
-  }
-
-  @Override
-  public void rollback(CommitContext context)
-  {
-    // Don't do anything as the real action is done at commit (which does not happen now)
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Rollbacked called");
-    }
-  }
-
-  @Override
-  protected void writeClass(InternalCDOClass cdoClass)
-  {
-    throw new UnsupportedOperationException("Should not be called, should be handled by hibernate cascade");
-  }
-
-  @Override
-  protected void writeFeature(CDOFeature feature)
-  {
-    throw new UnsupportedOperationException("Should not be called, should be handled by hibernate cascade");
-  }
-
-  @Override
-  protected void writePackages(CDOPackage... cdoPackages)
-  {
-    if (cdoPackages != null && cdoPackages.length != 0)
-    {
-      getStore().getPackageHandler().writePackages(cdoPackages);
-    }
-
-    // Set a new hibernatesession in the thread
-    resetHibernateSession();
-  }
-
-  @Override
-  protected void writePackage(CDOPackage cdoPackage)
-  {
-    throw new UnsupportedOperationException("Should not be called");
-  }
-
-  @Override
-  protected void writeRevision(CDORevision revision)
-  {
-    // Do nothing, do it all at commit
-  }
-
-  @Override
-  protected void writeRevisionDelta(CDORevisionDelta revisionDelta)
-  {
-  }
-
-  @Override
-  protected void writeRevisionDeltas(CDORevisionDelta[] revisionDeltas)
-  {
-  }
-
-  @Override
-  protected void writeRevisions(CDORevision[] revisions)
-  {
-    // Don't do anything it is done at commit
-  }
-
-  @Override
-  protected void writeSuperType(InternalCDOClass type, CDOClassProxy superType)
-  {
-    throw new UnsupportedOperationException("Should not be called, should be handled by hibernate cascade");
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateThreadContext.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateThreadContext.java
deleted file mode 100644
index 174f55f596..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateThreadContext.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal 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:
- *    Martin Taal - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.server.IStoreWriter.CommitContext;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-import org.hibernate.Session;
-
-/**
- * @author Martin Taal
- */
-public class HibernateThreadContext
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateThreadContext.class);
-
-  private static ThreadLocal<CommitContext> commitContext = new ThreadLocal<CommitContext>();
-
-  private static ThreadLocal<Session> session = new ThreadLocal<Session>();
-
-  public static Session getSession()
-  {
-    Session result = session.get();
-    if (result == null)
-    {
-      throw new IllegalStateException("Session not set");
-    }
-
-    return result;
-  }
-
-  public static void setSession(Session newSession)
-  {
-    if (newSession != null && session.get() != null)
-    {
-      throw new IllegalStateException("Session already set");
-    }
-
-    if (TRACER.isEnabled())
-    {
-      if (newSession == null)
-      {
-        TRACER.trace("Clearing session in threadlocal");
-      }
-      else
-      {
-        TRACER.trace("Setting session in threadlocal");
-      }
-    }
-
-    session.set(newSession);
-  }
-
-  public static CommitContext getCommitContext()
-  {
-    CommitContext result = commitContext.get();
-    if (result == null)
-    {
-      throw new IllegalStateException("CommitContext not set");
-    }
-
-    return result;
-  }
-
-  public static boolean isCommitContextSet()
-  {
-    return commitContext.get() != null;
-  }
-
-  public static void setCommitContext(CommitContext newCommitContext)
-  {
-    if (newCommitContext != null && commitContext.get() != null)
-    {
-      throw new IllegalStateException("CommitContext already set");
-    }
-
-    if (TRACER.isEnabled())
-    {
-      if (newCommitContext == null)
-      {
-        TRACER.trace("Clearing commitcontext in threadlocal");
-      }
-      else
-      {
-        TRACER.trace("Setting commitcontext in threadlocal");
-      }
-    }
-
-    commitContext.set(newCommitContext);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
deleted file mode 100644
index 49dd5cc7d9..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal 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:
- *    Martin Taal - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate;
-
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.internal.protocol.id.CDOIDNullImpl;
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDTemp;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.IStore;
-import org.eclipse.emf.cdo.server.IStoreWriter.CommitContext;
-import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
-
-import org.hibernate.Session;
-
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * @author Martin Taal
- */
-public class HibernateUtil
-{
-  private static HibernateUtil instance = new HibernateUtil();
-
-  /**
-   * @return the instance
-   */
-  public static HibernateUtil getInstance()
-  {
-    return instance;
-  }
-
-  /**
-   * @param instance
-   *          the instance to set
-   */
-  public static void setInstance(HibernateUtil instance)
-  {
-    HibernateUtil.instance = instance;
-  }
-
-  /** Converts from a Map<String, String> to a Properties */
-  public Properties getPropertiesFromStore(IStore store)
-  {
-    Properties props = new Properties();
-    Map<String, String> storeProps = store.getRepository().getProperties();
-    for (String key : storeProps.keySet())
-    {
-      props.setProperty(key, storeProps.get(key));
-    }
-
-    return props;
-  }
-
-  public String getEntityName(CDORevision cdoRevision)
-  {
-    return cdoRevision.getCDOClass().getName();
-  }
-
-  /**
-   * Translates a temporary cdoID into a hibernate ID, by finding the object it refers to in the CommitContext and then
-   * returning or by persisting the object. Note assumes that the hibernate session and CommitContext are set in
-   * HibernateThreadContext.
-   */
-  public CDOIDHibernate getCDOIDHibernate(CDOID cdoID)
-  {
-    CDORevision cdoRevision = getCDORevision(cdoID);
-    if (cdoRevision.getID() instanceof CDOIDHibernate)
-    {
-      return (CDOIDHibernate)cdoRevision.getID();
-    }
-
-    Session session = HibernateThreadContext.getSession();
-    session.saveOrUpdate(cdoRevision);
-    if (!(cdoRevision.getID() instanceof CDOIDHibernate))
-    {
-      throw new IllegalStateException("CDORevision " + cdoRevision.getCDOClass().getName() + " " + cdoRevision.getID()
-          + " does not have a hibernate cdoid after saving/updating it");
-    }
-
-    return (CDOIDHibernate)cdoRevision.getID();
-  }
-
-  public InternalCDORevision getCDORevision(Object target)
-  {
-    if (target instanceof CDOObject)
-    {
-      return (InternalCDORevision)((CDOObject)target).cdoRevision();
-    }
-    else
-    {
-      return (InternalCDORevision)target;
-    }
-  }
-
-  /**
-   * Gets a current object, first checks the new and dirty objects from the commitcontent. Otherwise reads it from the
-   * session.
-   */
-  public CDORevision getCDORevision(CDOID id)
-  {
-    if (id instanceof CDOIDNullImpl)
-    {
-      return null;
-    }
-
-    CommitContext commitContext = HibernateThreadContext.getCommitContext();
-    for (CDORevision revision : commitContext.getNewObjects())
-    {
-      if (revision.getID().equals(id))
-      {
-        return revision;
-      }
-    }
-
-    for (CDORevision revision : commitContext.getDirtyObjects())
-    {
-      if (revision.getID().equals(id))
-      {
-        return revision;
-      }
-    }
-
-    // maybe the temp was already translated
-    if (id instanceof CDOIDTemp)
-    {
-      CDOID newID = commitContext.getIDMappings().get(id);
-      if (newID != null)
-      {
-        return getCDORevision(newID);
-      }
-    }
-
-    if (!(id instanceof CDOIDHibernate))
-    {
-      throw new IllegalArgumentException("Passed cdoid is not an instance of CDOIDHibernate but a "
-          + id.getClass().getName() + ": " + id);
-    }
-
-    CDOIDHibernate cdoIDHibernate = (CDOIDHibernate)id;
-    Session session = HibernateThreadContext.getSession();
-    return (CDORevision)session.get(cdoIDHibernate.getEntityName(), cdoIDHibernate.getId());
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java
deleted file mode 100644
index eed970eb48..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.emf.cdo.server.hibernate"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java
deleted file mode 100644
index 9c581fd273..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.info;
-
-/**
- * @author Eike Stepper
- */
-public final class ClassServerInfo extends ServerInfo
-{
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java
deleted file mode 100644
index df0339ce11..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.info;
-
-/**
- * @author Eike Stepper
- */
-public final class FeatureServerInfo extends ServerInfo
-{
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java
deleted file mode 100644
index be70519c17..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.info;
-
-/**
- * @author Eike Stepper
- */
-public final class PackageServerInfo extends ServerInfo
-{
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java
deleted file mode 100644
index 90769ee831..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.info;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ServerInfo
-{
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOFeatureReferenceTypePropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOFeatureReferenceTypePropertyHandler.java
deleted file mode 100644
index fa6b7ee606..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOFeatureReferenceTypePropertyHandler.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2005, 2006, 2007, 2008 Springsite BV (The Netherlands) 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:
- *   Martin Taal
- * </copyright>
- *
- * $Id: CDOFeatureReferenceTypePropertyHandler.java,v 1.2 2008-04-28 08:30:39 estepper Exp $
- */
-
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.model.CDOFeatureImpl;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOType;
-
-import org.hibernate.HibernateException;
-import org.hibernate.PropertyNotFoundException;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.property.Getter;
-import org.hibernate.property.PropertyAccessor;
-import org.hibernate.property.Setter;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * Is only used for synthetic id's.
- * 
- * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.2 $
- */
-@SuppressWarnings("unchecked")
-public class CDOFeatureReferenceTypePropertyHandler implements Getter, Setter, PropertyAccessor
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOFeatureReferenceTypePropertyHandler()
-  {
-  }
-
-  public Object get(Object owner) throws HibernateException
-  {
-    CDOFeature cdoFeature = (CDOFeature)owner;
-    if (cdoFeature.getType() != CDOType.OBJECT)
-    {
-      return null;
-    }
-  
-    return cdoFeature.getReferenceType();
-  }
-
-  public Object getForInsert(Object arg0, Map arg1, SessionImplementor arg2) throws HibernateException
-  {
-    return get(arg0);
-  }
-
-  public void set(Object target, Object value, SessionFactoryImplementor factory) throws HibernateException
-  {
-    CDOFeatureImpl cdoFeature = (CDOFeatureImpl)target;
-    if (cdoFeature.getType() != CDOType.OBJECT)
-    {
-      return;
-    }
-  
-    cdoFeature.setReferenceType((CDOClass)value);
-  }
-
-  public Getter getGetter(Class theClass, String propertyName) throws PropertyNotFoundException
-  {
-    return this;
-  }
-
-  public Setter getSetter(Class theClass, String propertyName) throws PropertyNotFoundException
-  {
-    return this;
-  }
-
-  public Method getMethod()
-  {
-    return null;
-  }
-
-  public String getMethodName()
-  {
-    return null;
-  }
-
-  public Class getReturnType()
-  {
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDMetaRangeUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDMetaRangeUserType.java
deleted file mode 100644
index 4e71156430..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDMetaRangeUserType.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2008 - 2008 Martin Taal 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:
- *    Martin Taal - initial api
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.id.CDOIDMetaImpl;
-import org.eclipse.emf.cdo.internal.protocol.id.CDOIDMetaRangeImpl;
-import org.eclipse.emf.cdo.protocol.id.CDOIDMeta;
-import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange;
-
-import org.hibernate.Hibernate;
-import org.hibernate.usertype.UserType;
-
-import java.io.Serializable;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-/**
- * @author Martin Taal
- */
-public class CDOIDMetaRangeUserType implements UserType
-{
-  private static final int[] SQL_TYPES = { Types.INTEGER, Types.INTEGER };
-
-  public CDOIDMetaRangeUserType()
-  {
-  }
-
-  public int[] sqlTypes()
-  {
-    return SQL_TYPES;
-  }
-
-  public Class<?> returnedClass()
-  {
-    return CDOIDMetaRange.class;
-  }
-
-  public boolean isMutable()
-  {
-    return true;
-  }
-
-  public Object deepCopy(Object value)
-  {
-    if (value == null)
-    {
-      return null;
-    }
-
-    CDOIDMetaRange cdoRange = (CDOIDMetaRange)value;
-    CDOIDMeta newCdoIDMeta = new CDOIDMetaImpl(((CDOIDMetaImpl)cdoRange.getLowerBound()).getLongValue());
-    return new CDOIDMetaRangeImpl(newCdoIDMeta, cdoRange.size());
-  }
-
-  public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws SQLException
-  {
-    Integer start = (Integer)Hibernate.INTEGER.nullSafeGet(rs, names[0]);
-    if (rs.wasNull())
-    {
-      return null;
-    }
-
-    Integer size = (Integer)Hibernate.INTEGER.nullSafeGet(rs, names[1]);
-    if (rs.wasNull())
-    {
-      return null;
-    }
-
-    CDOIDMeta newCdoIDMeta = new CDOIDMetaImpl(start);
-    return new CDOIDMetaRangeImpl(newCdoIDMeta, size);
-  }
-
-  public void nullSafeSet(PreparedStatement statement, Object value, int index) throws SQLException
-  {
-    if (value != null)
-    {
-      CDOIDMetaRange cdoRange = (CDOIDMetaRange)value;
-      statement.setLong(index, ((CDOIDMeta)cdoRange.getLowerBound()).getLongValue());
-      statement.setInt(index + 1, cdoRange.size());
-    }
-    else
-    {
-      statement.setNull(index, Types.INTEGER);
-      statement.setNull(index + 1, Types.INTEGER);
-    }
-  }
-
-  public Serializable disassemble(Object value)
-  {
-    return (Serializable)value;
-  }
-
-  public Object assemble(Serializable cachedValue, Object owner)
-  {
-    return cachedValue;
-  }
-
-  public Object replace(Object original, Object target, Object owner)
-  {
-    return original;
-  }
-
-  public boolean equals(Object x, Object y)
-  {
-    if (x == y)
-    {
-      return true;
-    }
-  
-    if (x == null || y == null)
-    {
-      return false;
-    }
-  
-    return x.equals(y);
-  }
-
-  public int hashCode(Object x)
-  {
-    return x.hashCode();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java
deleted file mode 100644
index 334b822bf9..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
-
-import org.hibernate.HibernateException;
-
-/**
- * @author Martin Taal
- */
-public class CDOIDPropertyGetter extends CDOPropertyGetter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOIDPropertyGetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  @Override
-  public Object get(Object target) throws HibernateException
-  {
-    InternalCDORevision revision = (InternalCDORevision)target;
-    if (!(revision.getID() instanceof CDOIDHibernate))
-    {
-      return null;
-    }
-
-    CDOIDHibernate cdoID = (CDOIDHibernate)revision.getID();
-    if (isVirtualProperty())
-    {
-      return cdoID.getId();
-    }
-    else
-    {
-      Object id = super.get(target);
-      // TODO: does this make sense?
-      // if (cdoID.getId() == null)
-      // {
-      // cdoID.setId((Serializable)id);
-      // }
-      return id;
-    }
-  }
-
-  @Override
-  protected boolean isVirtualPropertyAllowed()
-  {
-    return true;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java
deleted file mode 100644
index b07da2e0f3..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDTemp;
-import org.eclipse.emf.cdo.server.IStoreWriter.CommitContext;
-import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
-import org.eclipse.emf.cdo.server.hibernate.internal.id.CDOIDHibernateFactoryImpl;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateThreadContext;
-
-import org.hibernate.HibernateException;
-import org.hibernate.engine.SessionFactoryImplementor;
-
-import java.io.Serializable;
-
-/**
- * @author Martin Taal
- */
-public class CDOIDPropertySetter extends CDOPropertySetter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOIDPropertySetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  @Override
-  public void set(Object target, Object value, SessionFactoryImplementor factory) throws HibernateException
-  {
-    if (value == null)
-    {
-      return;
-    }
-
-    InternalCDORevision revision = (InternalCDORevision)target;
-    CDOID cdoID = revision.getID();
-    if (cdoID == null)
-    {
-      CDOIDHibernate newCDOID = CDOIDHibernateFactoryImpl.getInstance().createCDOID((Serializable)value,
-          revision.getCDOClass().getName());
-      revision.setID(newCDOID);
-    }
-    else if (cdoID instanceof CDOIDTemp)
-    {
-      CommitContext commitContext = HibernateThreadContext.getCommitContext();
-      CDOIDHibernate newCDOID = CDOIDHibernateFactoryImpl.getInstance().createCDOID((Serializable)value,
-          revision.getCDOClass().getName());
-      revision.setID(newCDOID);
-      commitContext.addIDMapping((CDOIDTemp)cdoID, newCDOID);
-    }
-    else
-    {
-      CDOIDHibernate hbCDOID = (CDOIDHibernate)revision.getID();
-      if (!hbCDOID.getId().equals(value))
-      {
-        throw new IllegalStateException("Current id and new id are different " + value + "/" + hbCDOID.getId());
-      }
-
-    }
-    if (!isVirtualProperty())
-    {
-      super.set(target, value, factory);
-    }
-  }
-
-  @Override
-  protected boolean isVirtualPropertyAllowed()
-  {
-    return true;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
deleted file mode 100644
index 786c5d6e95..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2008 - 2008 Martin Taal 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:
- *    Martin Taal - initial api
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDTemp;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
-import org.eclipse.emf.cdo.server.hibernate.internal.id.CDOIDHibernateFactoryImpl;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
-
-import org.eclipse.net4j.util.WrappedException;
-
-import org.hibernate.Hibernate;
-import org.hibernate.usertype.UserType;
-
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.HashMap;
-
-/**
- * Persists a CDOID in the DB.
- */
-public class CDOIDUserType implements UserType
-{
-  /**
-   * 1) entityname, 2) id, 3) id class name
-   */
-  private static final int[] SQL_TYPES = { Types.VARCHAR, Types.VARCHAR, Types.VARCHAR };
-
-  /** Constructor by id */
-  private final HashMap<String, Constructor<?>> constructors = new HashMap<String, Constructor<?>>();
-
-  public CDOIDUserType()
-  {
-  }
-
-  public int[] sqlTypes()
-  {
-    return SQL_TYPES;
-  }
-
-  public Class<?> returnedClass()
-  {
-    return CDOID.class;
-  }
-
-  public boolean isMutable()
-  {
-    return false;
-  }
-
-  public Object deepCopy(Object value)
-  {
-    return value;
-  }
-
-  public boolean equals(Object x, Object y)
-  {
-    if (x == y)
-    {
-      return true;
-    }
-
-    if (x == null || y == null)
-    {
-      return false;
-    }
-
-    return x.equals(y);
-  }
-
-  public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws SQLException
-  {
-    String entityName = (String)Hibernate.STRING.nullSafeGet(rs, names[0]);
-    if (rs.wasNull())
-    {
-      return null;
-    }
-
-    String idStr = (String)Hibernate.STRING.nullSafeGet(rs, names[1]);
-    if (rs.wasNull())
-    {
-      return null;
-    }
-
-    String idClassName = (String)Hibernate.STRING.nullSafeGet(rs, names[2]);
-    if (rs.wasNull())
-    {
-      return null;
-    }
-
-    Serializable id = getId(idStr, idClassName);
-    return CDOIDHibernateFactoryImpl.getInstance().createCDOID(id, entityName);
-  }
-
-  public void nullSafeSet(PreparedStatement statement, Object value, int index) throws SQLException
-  {
-    if (value == null)
-    {
-      statement.setNull(index, Types.VARCHAR);
-      statement.setNull(index, Types.VARCHAR);
-      statement.setNull(index, Types.VARCHAR);
-    }
-
-    if (value != null)
-    {
-      CDOIDHibernate cdoID;
-      if (value instanceof CDOIDTemp)
-      {
-        cdoID = HibernateUtil.getInstance().getCDOIDHibernate((CDOID)value);
-      }
-      else if (value instanceof CDORevision)
-      {
-        cdoID = (CDOIDHibernate)((CDORevision)value).getID();
-      }
-      else
-      {
-        cdoID = (CDOIDHibernate)value;
-      }
-
-      statement.setString(index, cdoID.getEntityName());
-      statement.setString(index + 1, cdoID.getId().toString());
-      statement.setString(index + 2, cdoID.getId().getClass().getName());
-    }
-  }
-
-  public Serializable disassemble(Object value)
-  {
-    return (Serializable)value;
-  }
-
-  public Object assemble(Serializable cachedValue, Object owner)
-  {
-    return cachedValue;
-  }
-
-  public Object replace(Object original, Object target, Object owner)
-  {
-    return original;
-  }
-
-  public int hashCode(Object x)
-  {
-    return x.hashCode();
-  }
-
-  /** Creates an id object of the correct type */
-  private Serializable getId(String idStr, String idType)
-  {
-    try
-    {
-      Constructor<?> constructor = constructors.get(idType);
-      if (constructor == null)
-      {
-        Class<?> idClass = this.getClass().getClassLoader().loadClass(idType);
-        constructor = idClass.getConstructor(new Class[] { String.class });
-        constructors.put(idType, constructor);
-      }
-
-      return (Serializable)constructor.newInstance(new Object[] { idStr });
-    }
-    catch (Exception e)
-    {
-      throw WrappedException.wrap(e);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java
deleted file mode 100644
index 563ca6b88a..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Springsite B.V. 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:
- *    Martin Taal - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
-
-import org.hibernate.EmptyInterceptor;
-
-/**
- * Resolves entitynames, todo: use entityname strategy!
- * 
- * @author Martin Taal
- */
-public class CDOInterceptor extends EmptyInterceptor
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOInterceptor()
-  {
-  }
-
-  @Override
-  public String getEntityName(Object object)
-  {
-    if (object instanceof CDOObject)
-    {
-      return ((CDOObject)object).cdoClass().getName();
-    }
-
-    InternalCDORevision revision = HibernateUtil.getInstance().getCDORevision(object);
-    return revision.getCDOClass().getName();
-  }
-
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java
deleted file mode 100644
index 64e218af1c..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-
-import org.eclipse.net4j.internal.util.collection.MoveableArrayList;
-import org.eclipse.net4j.util.collection.MoveableList;
-
-import org.hibernate.HibernateException;
-import org.hibernate.collection.PersistentCollection;
-
-/**
- * @author Martin Taal
- */
-// Howto handle hibernate lists:
-// - a new owner: the owner is persisted and its lists are replaced with hibernate
-// persistentlist, the hibernate persitentlist will have a delegate (internally) which is the list which was previously
-// present in the owner.
-// - an existing owner: the owner is read from the db and hibernate will set a persistentlist
-// directly
-//
-// The solution also needs to handle the following:
-// - cdo does not have direct java references but stores cdoids in the list while hibernate expects real java object
-// references.
-// - cdo uses a moveablearraylist and not the standard arraylist
-// 
-// The solution:
-// - never return null when hibernate asks for the current value of the manyreference, always
-// return a MoveableArrayList so that hibernate uses that as the delegate, set the MoveableArrayList
-public class CDOManyReferenceGetter extends CDOPropertyGetter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOManyReferenceGetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  @Override
-  public Object get(Object target) throws HibernateException
-  {
-    // Check if there is already a persistentcollection
-    PersistentCollection collection = PersistableListHolder.getInstance().getListMapping(target, getCDOFeature());
-    if (collection != null)
-    {
-      return collection;
-    }
-
-    // Not yet, get the moveablearraylist
-    @SuppressWarnings("unchecked")
-    MoveableList<Object> list = (MoveableList<Object>)super.get(target);
-    if (list == null)
-    {
-      // TODO: what initial size?
-      list = new MoveableArrayList<Object>(10);
-      InternalCDORevision revision = (InternalCDORevision)target;
-      revision.setValue(getCDOFeature(), list);
-    }
-
-    // Wrap the moveablearraylist
-    HibernateMoveableListWrapper wrapper = new HibernateMoveableListWrapper();
-    wrapper.setDelegate(list);
-
-    // And return it
-    return wrapper;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceSetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceSetter.java
deleted file mode 100644
index 6e4f178a24..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceSetter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.hibernate.HibernateException;
-import org.hibernate.collection.PersistentCollection;
-import org.hibernate.collection.PersistentList;
-import org.hibernate.engine.SessionFactoryImplementor;
-
-/**
- * @author Martin Taal
- */
-public class CDOManyReferenceSetter extends CDOPropertySetter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOManyReferenceSetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  @Override
-  public void set(Object target, Object value, SessionFactoryImplementor factory) throws HibernateException
-  {
-    // Do some checking
-    if (!(value instanceof PersistentList))
-    {
-      throw new IllegalArgumentException("Value is not a persistentlist but a " + value.getClass().getName());
-    }
-
-    // Only set it in the listholder
-    PersistableListHolder.getInstance().putListMapping(target, getCDOFeature(), (PersistentCollection)value);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java
deleted file mode 100644
index a38c570f98..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionPropertyAccessor.CDORevisionSetter;
-
-import org.hibernate.HibernateException;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.property.Getter;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * TODO How does this differ from {@link CDORevisionSetter}? Both needed?
- * 
- * @author Martin Taal
- */
-public class CDOPropertyGetter extends CDOPropertyHandler implements Getter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOPropertyGetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  public Object get(Object target) throws HibernateException
-  {
-    InternalCDORevision revision = (InternalCDORevision)target;
-    return revision.getValue(getCDOFeature());
-  }
-
-  @SuppressWarnings("unchecked")
-  public Object getForInsert(Object target, Map mergeMap, SessionImplementor session) throws HibernateException
-  {
-    return get(target);
-  }
-
-  public Method getMethod()
-  {
-    return null;
-  }
-
-  public String getMethodName()
-  {
-    return null;
-  }
-
-  @SuppressWarnings("unchecked")
-  public Class getReturnType()
-  {
-    return Object.class;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
deleted file mode 100644
index ab50e50851..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-/**
- * @author Martin Taal
- */
-public abstract class CDOPropertyHandler
-{
-  private final ContextTracer tracer = new ContextTracer(OM.DEBUG, this.getClass());
-
-  private CDORevisionTuplizer tuplizer;
-
-  private CDOFeature cdoFeature;
-
-  private boolean virtualProperty = false;
-
-  public CDOPropertyHandler(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    this.tuplizer = tuplizer;
-    cdoFeature = tuplizer.getCDOClass().lookupFeature(propertyName);
-    if (getTracer().isEnabled())
-    {
-      getTracer().trace(
-          "Created " + this.getClass().getName() + " for cdoClass/feature: " + tuplizer.getCDOClass().getName() + "."
-              + propertyName);
-    }
-
-    if (cdoFeature == null)
-    {
-      if (isVirtualPropertyAllowed())
-      {
-        virtualProperty = true;
-        if (getTracer().isEnabled())
-        {
-          getTracer().trace("This is a virtual property");
-        }
-      }
-      else
-      {
-        throw new IllegalStateException("Feature not found: " + propertyName);
-      }
-    }
-  }
-
-  protected ContextTracer getTracer()
-  {
-    return tracer;
-  }
-
-  public CDORevisionTuplizer getTuplizer()
-  {
-    return tuplizer;
-  }
-
-  public CDOFeature getCDOFeature()
-  {
-    return cdoFeature;
-  }
-
-  protected boolean isVirtualPropertyAllowed()
-  {
-    return false;
-  }
-
-  /**
-   * @return the virtualProperty
-   */
-  public boolean isVirtualProperty()
-  {
-    return virtualProperty;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java
deleted file mode 100644
index 17cb90c3a9..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionPropertyAccessor.CDORevisionSetter;
-
-import org.hibernate.HibernateException;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.property.Setter;
-
-import java.lang.reflect.Method;
-
-/**
- * TODO How does this differ from {@link CDORevisionSetter}? Both needed?
- * 
- * @author Martin Taal
- */
-public class CDOPropertySetter extends CDOPropertyHandler implements Setter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOPropertySetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  public Method getMethod()
-  {
-    return null;
-  }
-
-  public String getMethodName()
-  {
-    return null;
-  }
-
-  public void set(Object target, Object value, SessionFactoryImplementor factory) throws HibernateException
-  {
-    InternalCDORevision revision = (InternalCDORevision)target;
-    revision.setValue(getCDOFeature(), value);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOReferenceGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOReferenceGetter.java
deleted file mode 100644
index 813119e386..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOReferenceGetter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
-
-import org.hibernate.HibernateException;
-
-/**
- * @author Martin Taal
- */
-public class CDOReferenceGetter extends CDOPropertyGetter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOReferenceGetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  @Override
-  public Object get(Object target) throws HibernateException
-  {
-    final Object o = super.get(target);
-    if (o instanceof CDOID)
-    {
-      return HibernateUtil.getInstance().getCDORevision((CDOID)o);
-    }
-
-    return o;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOReferenceSetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOReferenceSetter.java
deleted file mode 100644
index 4d2173b4ff..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOReferenceSetter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-
-import org.hibernate.HibernateException;
-import org.hibernate.engine.SessionFactoryImplementor;
-
-/**
- * @author Martin Taal
- */
-public class CDOReferenceSetter extends CDOPropertySetter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOReferenceSetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  @Override
-  public void set(Object target, Object value, SessionFactoryImplementor factory) throws HibernateException
-  {
-    if (value == null)
-    {
-      super.set(target, null, factory);
-    }
-    else
-    {
-      CDORevision cdoValue = (CDORevision)value;
-      super.set(target, cdoValue.getID(), factory);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java
deleted file mode 100644
index 2dae1251fc..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil;
-import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.server.IRevisionManager;
-import org.eclipse.emf.cdo.server.hibernate.internal.id.CDOIDHibernateFactoryImpl;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateStore;
-
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.tuple.Instantiator;
-
-import java.io.Serializable;
-
-/**
- * @author Eike Stepper
- */
-public class CDORevisionInstantiator implements Instantiator
-{
-  private static final long serialVersionUID = 1L;
-
-  private CDOClass cdoClass;
-
-  private IRevisionManager revisionManager;
-
-  public CDORevisionInstantiator(CDORevisionTuplizer tuplizer, PersistentClass mappingInfo)
-  {
-    cdoClass = tuplizer.getCDOClass();
-    HibernateStore hbStore = HibernateStore.getCurrentHibernateStore();
-    IRepository repository = hbStore.getRepository();
-    revisionManager = repository.getRevisionManager();
-  }
-
-  public Object instantiate()
-  {
-    // TODO CDO can't create a revision w/o CDOID
-    return instantiate(null);
-  }
-
-  public Object instantiate(Serializable id)
-  {
-    return CDORevisionUtil.create(revisionManager, cdoClass, CDOIDHibernateFactoryImpl.getInstance().createCDOID(id,
-        cdoClass.getName()));
-  }
-
-  public boolean isInstance(Object object)
-  {
-    return object instanceof InternalCDORevision;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionLazyInitializer.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionLazyInitializer.java
deleted file mode 100644
index d80557b13d..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionLazyInitializer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.proxy.AbstractLazyInitializer;
-
-import java.io.Serializable;
-
-/**
- * @author Eike Stepper
- */
-public class CDORevisionLazyInitializer extends AbstractLazyInitializer implements Serializable
-{
-  private static final long serialVersionUID = 1L;
-
-  CDORevisionLazyInitializer(String entityName, Serializable id, SessionImplementor session)
-  {
-    super(entityName, id, session);
-  }
-
-  public InternalCDORevision getRevision()
-  {
-    return (InternalCDORevision)getImplementation();
-  }
-
-  @SuppressWarnings("unchecked")
-  public Class getPersistentClass()
-  {
-    throw new UnsupportedOperationException();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionPropertyAccessor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionPropertyAccessor.java
deleted file mode 100644
index 1a80a78ac0..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionPropertyAccessor.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-
-import org.hibernate.HibernateException;
-import org.hibernate.PropertyNotFoundException;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.property.Getter;
-import org.hibernate.property.PropertyAccessor;
-import org.hibernate.property.Setter;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class CDORevisionPropertyAccessor implements PropertyAccessor
-{
-  private CDORevisionTuplizer tuplizer;
-
-  public CDORevisionPropertyAccessor(CDORevisionTuplizer tuplizer)
-  {
-    this.tuplizer = tuplizer;
-  }
-
-  public CDORevisionTuplizer getTuplizer()
-  {
-    return tuplizer;
-  }
-
-  @SuppressWarnings("unchecked")
-  public Getter getGetter(Class theClass, String propertyName) throws PropertyNotFoundException
-  {
-    return new CDORevisionGetter(this, propertyName);
-  }
-
-  @SuppressWarnings("unchecked")
-  public Setter getSetter(Class theClass, String propertyName) throws PropertyNotFoundException
-  {
-    return new CDORevisionSetter(this, propertyName);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class BaseAccessor
-  {
-    private CDORevisionPropertyAccessor propertyAccessor;
-
-    private CDOFeature cdoFeature;
-
-    public BaseAccessor(CDORevisionPropertyAccessor propertyAccessor, String propertyName)
-    {
-      this.propertyAccessor = propertyAccessor;
-      cdoFeature = propertyAccessor.getTuplizer().getCDOClass().lookupFeature(propertyName);
-      if (cdoFeature == null)
-      {
-        throw new IllegalStateException("Feature not found: " + propertyName);
-      }
-    }
-
-    public CDORevisionPropertyAccessor getPropertyAccessor()
-    {
-      return propertyAccessor;
-    }
-
-    public CDOFeature getCDOFeature()
-    {
-      return cdoFeature;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class CDORevisionGetter extends BaseAccessor implements Getter
-  {
-    private static final long serialVersionUID = 1L;
-
-    public CDORevisionGetter(CDORevisionPropertyAccessor propertyAccessor, String propertyName)
-    {
-      super(propertyAccessor, propertyName);
-    }
-
-    public Object get(Object target) throws HibernateException
-    {
-      InternalCDORevision revision = (InternalCDORevision)target;
-      return revision.getValue(getCDOFeature());
-    }
-
-    @SuppressWarnings("unchecked")
-    public Object getForInsert(Object target, Map mergeMap, SessionImplementor session) throws HibernateException
-    {
-      return get(target);
-    }
-
-    public Method getMethod()
-    {
-      return null;
-    }
-
-    public String getMethodName()
-    {
-      return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Class getReturnType()
-    {
-      return Object.class;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class CDORevisionSetter extends BaseAccessor implements Setter
-  {
-    private static final long serialVersionUID = 1L;
-
-    public CDORevisionSetter(CDORevisionPropertyAccessor propertyAccessor, String propertyName)
-    {
-      super(propertyAccessor, propertyName);
-    }
-
-    public Method getMethod()
-    {
-      return null;
-    }
-
-    public String getMethodName()
-    {
-      return null;
-    }
-
-    public void set(Object target, Object value, SessionFactoryImplementor factory) throws HibernateException
-    {
-      InternalCDORevision revision = (InternalCDORevision)target;
-      revision.setValue(getCDOFeature(), value);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxy.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxy.java
deleted file mode 100644
index da85d7d8a6..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxy.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDProvider;
-import org.eclipse.emf.cdo.protocol.id.CDOIDTemp;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.protocol.revision.CDORevisionData;
-import org.eclipse.emf.cdo.protocol.revision.CDORevisionResolver;
-import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta;
-
-import org.eclipse.net4j.util.collection.MoveableList;
-import org.eclipse.net4j.util.io.ExtendedDataOutput;
-
-import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.proxy.LazyInitializer;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class CDORevisionProxy implements HibernateProxy, InternalCDORevision, Serializable
-{
-  private static final long serialVersionUID = 1L;
-
-  private CDORevisionLazyInitializer li;
-
-  CDORevisionProxy(CDORevisionLazyInitializer li)
-  {
-    this.li = li;
-  }
-
-  public Object writeReplace()
-  {
-    return this;
-  }
-
-  public LazyInitializer getHibernateLazyInitializer()
-  {
-    return li;
-  }
-
-  public void add(CDOFeature feature, int index, Object value)
-  {
-    li.getRevision().add(feature, index, value);
-  }
-
-  public void adjustReferences(Map<CDOIDTemp, CDOID> idMappings)
-  {
-    li.getRevision().adjustReferences(idMappings);
-  }
-
-  public void clear(CDOFeature feature)
-  {
-    li.getRevision().clear(feature);
-  }
-
-  public CDORevisionDelta compare(CDORevision origin)
-  {
-    return li.getRevision().compare(origin);
-  }
-
-  public boolean contains(CDOFeature feature, Object value)
-  {
-    return li.getRevision().contains(feature, value);
-  }
-
-  public Object get(CDOFeature feature, int index)
-  {
-    return li.getRevision().get(feature, index);
-  }
-
-  public CDOClass getCDOClass()
-  {
-    return li.getRevision().getCDOClass();
-  }
-
-  public CDOID getContainerID()
-  {
-    return li.getRevision().getContainerID();
-  }
-
-  public int getContainingFeatureID()
-  {
-    return li.getRevision().getContainingFeatureID();
-  }
-
-  public long getCreated()
-  {
-    return li.getRevision().getCreated();
-  }
-
-  public CDORevisionData getData()
-  {
-    return li.getRevision().getData();
-  }
-
-  public CDOID getID()
-  {
-    return li.getRevision().getID();
-  }
-
-  public MoveableList<Object> getList(CDOFeature feature, int size)
-  {
-    return li.getRevision().getList(feature, size);
-  }
-
-  public MoveableList<Object> getList(CDOFeature feature)
-  {
-    return li.getRevision().getList(feature);
-  }
-
-  public CDOID getResourceID()
-  {
-    return li.getRevision().getResourceID();
-  }
-
-  public long getRevised()
-  {
-    return li.getRevision().getRevised();
-  }
-
-  public CDORevision getRevision()
-  {
-    return li.getRevision().getRevision();
-  }
-
-  public CDORevisionResolver getRevisionResolver()
-  {
-    return li.getRevision().getRevisionResolver();
-  }
-
-  public Object getValue(CDOFeature feature)
-  {
-    return li.getRevision().getValue(feature);
-  }
-
-  public int getVersion()
-  {
-    return li.getRevision().getVersion();
-  }
-
-  public int hashCode(CDOFeature feature)
-  {
-    return li.getRevision().hashCode(feature);
-  }
-
-  public int indexOf(CDOFeature feature, Object value)
-  {
-    return li.getRevision().indexOf(feature, value);
-  }
-
-  public boolean isCurrent()
-  {
-    return li.getRevision().isCurrent();
-  }
-
-  public boolean isEmpty(CDOFeature feature)
-  {
-    return li.getRevision().isEmpty(feature);
-  }
-
-  public boolean isResource()
-  {
-    return li.getRevision().isResource();
-  }
-
-  public boolean isSet(CDOFeature feature)
-  {
-    return li.getRevision().isSet(feature);
-  }
-
-  public boolean isTransactional()
-  {
-    return li.getRevision().isTransactional();
-  }
-
-  public boolean isValid(long timeStamp)
-  {
-    return li.getRevision().isValid(timeStamp);
-  }
-
-  public int lastIndexOf(CDOFeature feature, Object value)
-  {
-    return li.getRevision().lastIndexOf(feature, value);
-  }
-
-  public void merge(CDORevisionDelta delta)
-  {
-    li.getRevision().merge(delta);
-  }
-
-  public Object move(CDOFeature feature, int targetIndex, int sourceIndex)
-  {
-    return li.getRevision().move(feature, targetIndex, sourceIndex);
-  }
-
-  public Object remove(CDOFeature feature, int index)
-  {
-    return li.getRevision().remove(feature, index);
-  }
-
-  public Object set(CDOFeature feature, int index, Object value)
-  {
-    return li.getRevision().set(feature, index, value);
-  }
-
-  public void setContainerID(CDOID containerID)
-  {
-    li.getRevision().setContainerID(containerID);
-  }
-
-  public void setContainingFeatureID(int containingFeatureID)
-  {
-    li.getRevision().setContainingFeatureID(containingFeatureID);
-  }
-
-  public void setCreated(long created)
-  {
-    li.getRevision().setCreated(created);
-  }
-
-  public void setID(CDOID id)
-  {
-    li.getRevision().setID(id);
-  }
-
-  public void setListSize(CDOFeature feature, int size)
-  {
-    li.getRevision().setListSize(feature, size);
-  }
-
-  public void setResourceID(CDOID resourceID)
-  {
-    li.getRevision().setResourceID(resourceID);
-  }
-
-  public void setRevised(long revised)
-  {
-    li.getRevision().setRevised(revised);
-  }
-
-  public int setTransactional()
-  {
-    return li.getRevision().setTransactional();
-  }
-
-  public void setUntransactional()
-  {
-    li.getRevision().setUntransactional();
-  }
-
-  public Object setValue(CDOFeature feature, Object value)
-  {
-    return li.getRevision().setValue(feature, value);
-  }
-
-  public void setVersion(int version)
-  {
-    li.getRevision().setVersion(version);
-  }
-
-  public int size(CDOFeature feature)
-  {
-    return li.getRevision().size(feature);
-  }
-
-  public <T> T[] toArray(CDOFeature feature, T[] array)
-  {
-    return li.getRevision().toArray(feature, array);
-  }
-
-  public Object[] toArray(CDOFeature feature)
-  {
-    return li.getRevision().toArray(feature);
-  }
-
-  public void unset(CDOFeature feature)
-  {
-    li.getRevision().unset(feature);
-  }
-
-  public void write(ExtendedDataOutput out, CDOIDProvider idProvider, int referenceChunk) throws IOException
-  {
-    li.getRevision().write(out, idProvider, referenceChunk);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxyFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxyFactory.java
deleted file mode 100644
index 320f6e1469..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionProxyFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.hibernate.HibernateException;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.proxy.ProxyFactory;
-import org.hibernate.type.AbstractComponentType;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class CDORevisionProxyFactory implements ProxyFactory
-{
-  private String entityName;
-
-  public CDORevisionProxyFactory()
-  {
-  }
-
-  @SuppressWarnings("unchecked")
-  public void postInstantiate(String entityName, Class persistentClass, Set interfaces, Method getIdentifierMethod,
-      Method setIdentifierMethod, AbstractComponentType componentIdType) throws HibernateException
-  {
-    this.entityName = entityName;
-  }
-
-  public HibernateProxy getProxy(Serializable id, SessionImplementor session) throws HibernateException
-  {
-    return new CDORevisionProxy(new CDORevisionLazyInitializer(entityName, id, session));
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
deleted file mode 100644
index fb71650890..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, 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
- *    Martin Taal - changed handling of propertygetters/setters
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.protocol.model.resource.CDOResourcePackage;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateStore;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-import org.hibernate.EntityMode;
-import org.hibernate.HibernateException;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
-import org.hibernate.property.Getter;
-import org.hibernate.property.Setter;
-import org.hibernate.proxy.ProxyFactory;
-import org.hibernate.tuple.Instantiator;
-import org.hibernate.tuple.entity.AbstractEntityTuplizer;
-import org.hibernate.tuple.entity.EntityMetamodel;
-
-/**
- * @author Eike Stepper
- */
-public class CDORevisionTuplizer extends AbstractEntityTuplizer
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, CDORevisionTuplizer.class);
-
-  private CDOClass cdoClass;
-
-  public CDORevisionTuplizer(EntityMetamodel entityMetamodel, PersistentClass mappingInfo)
-  {
-    super(entityMetamodel, mappingInfo);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Created CDORevisionTuplizer for entity " + mappingInfo.getEntityName());
-    }
-
-    initCDOClass(mappingInfo);
-  }
-
-  private void initCDOClass(PersistentClass mappingInfo)
-  {
-    if (cdoClass != null)
-    {
-      return;
-    }
-
-    HibernateStore hbStore = HibernateStore.getCurrentHibernateStore();
-
-    // find the CDOClass/Package
-    // TODO: error handling if meta attribute not present
-    // TODO: error handling if entityname not set
-    String entityName = mappingInfo.getEntityName();
-    String ePackageURI = mappingInfo.getMetaAttribute("epackage").getValue();
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("EntityName/packageURI " + entityName + " " + ePackageURI);
-    }
-
-    for (CDOPackage cdoPackage : hbStore.getPackageHandler().getCDOPackages())
-    {
-      if (cdoPackage.getPackageURI().compareTo(ePackageURI) != 0)
-      {
-        continue;
-      }
-
-      for (CDOClass localCdoClass : cdoPackage.getClasses())
-      {
-        if (localCdoClass.getName().compareTo(entityName) == 0)
-        {
-          cdoClass = localCdoClass;
-          break;
-        }
-      }
-    }
-
-    if (cdoClass == null && ePackageURI.compareTo(CDOResourcePackage.PACKAGE_URI) == 0)
-    {
-      for (CDOClass localCdoClass : hbStore.getRepository().getPackageManager().getCDOResourcePackage().getClasses())
-      {
-        if (localCdoClass.getName().compareTo(entityName) == 0)
-        {
-          cdoClass = localCdoClass;
-          if (TRACER.isEnabled())
-          {
-            TRACER.trace("Class is CDOResource class");
-          }
-
-          break;
-        }
-      }
-    }
-
-    if (cdoClass == null)
-    {
-      throw new IllegalArgumentException("The mapped class " + mappingInfo.getEntityName());
-    }
-  }
-
-  // MT: probably not required as the property getter/setter do all the work
-  // /*
-  // * (non-Javadoc)
-  // *
-  // * @see org.hibernate.tuple.entity.AbstractEntityTuplizer#getVersion(java.lang.Object)
-  // */
-  // @Override
-  // public Object getVersion(Object entity) throws HibernateException
-  // {
-  // if (entity instanceof CDORevision)
-  // {
-  // final CDORevision cdoRevision = (CDORevision)entity;
-  // return cdoRevision.getVersion();
-  // }
-  // throw new IllegalArgumentException("Entity of type: " + entity.getClass().getName()
-  // + " not supported by this tuplizer");
-  // }
-  //
-  // @Override
-  // public Serializable getIdentifier(Object entity) throws HibernateException
-  // {
-  // if (entity instanceof CDORevision)
-  // {
-  // final CDOID cdoID = ((CDORevision)entity).getID();
-  // if (cdoID instanceof CDOIDHibernate)
-  // {
-  // return ((CDOIDHibernate)cdoID).getId();
-  // }
-  // }
-  // throw new IllegalArgumentException("Entity of type: " + entity.getClass().getName()
-  // + " not supported by this tuplizer");
-  // }
-  //
-  // @Override
-  // public void setIdentifier(Object entity, Serializable id) throws HibernateException
-  // {
-  // if (entity instanceof InternalCDORevision)
-  // {
-  // final InternalCDORevision cdoRevision = (InternalCDORevision)entity;
-  // final CDOID cdoID = cdoRevision.getID();
-  // if (cdoID == null)
-  // {
-  // CDOIDHibernate hid = (CDOIDHibernate)HibernateStore.CDOID_OBJECT_FACTORY.createCDOIDObject(null);
-  // hid.setId(id);
-  // cdoRevision.setID(hid);
-  // return;
-  // }
-  // else if (cdoID instanceof CDOIDHibernate)
-  // {
-  // ((CDOIDHibernate)cdoID).setId(id);
-  // return;
-  // }
-  // }
-  // throw new IllegalArgumentException("Entity of type: " + entity.getClass().getName()
-  // + " not supported by this tuplizer");
-  // }
-
-  @Override
-  public EntityMode getEntityMode()
-  {
-    return EntityMode.MAP;
-  }
-
-  public CDOClass getCDOClass()
-  {
-    return cdoClass;
-  }
-
-  @Override
-  protected Getter buildPropertyGetter(Property mappedProperty, PersistentClass mappedEntity)
-  {
-    initCDOClass(mappedEntity);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Building property getter for " + cdoClass.getName() + "." + mappedProperty.getName());
-    }
-
-    if (mappedProperty.isBackRef())
-    {
-      return mappedProperty.getGetter(mappedEntity.getMappedClass());
-    }
-    else if (mappedProperty == mappedEntity.getIdentifierProperty())
-    {
-      return new CDOIDPropertyGetter(this, mappedProperty.getName());
-    }
-    else if (mappedProperty == mappedEntity.getVersion())
-    {
-      return new CDOVersionPropertyGetter(this, mappedProperty.getName());
-    }
-
-    CDOFeature cdoFeature = getCDOClass().lookupFeature(mappedProperty.getName());
-    if (cdoFeature.isReference() && cdoFeature.isMany())
-    {
-      return new CDOManyReferenceGetter(this, mappedProperty.getName());
-    }
-    else if (cdoFeature.isReference())
-    {
-      return new CDOReferenceGetter(this, mappedProperty.getName());
-    }
-
-    return new CDOPropertyGetter(this, mappedProperty.getName());
-  }
-
-  @Override
-  protected Setter buildPropertySetter(Property mappedProperty, PersistentClass mappedEntity)
-  {
-    initCDOClass(mappedEntity);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Building property setter for " + cdoClass.getName() + "." + mappedProperty.getName());
-    }
-
-    if (mappedProperty.isBackRef())
-    {
-      return mappedProperty.getSetter(mappedEntity.getMappedClass());
-    }
-    else if (mappedProperty == mappedEntity.getIdentifierProperty())
-    {
-      return new CDOIDPropertySetter(this, mappedProperty.getName());
-    }
-    else if (mappedProperty == mappedEntity.getVersion())
-    {
-      return new CDOVersionPropertySetter(this, mappedProperty.getName());
-    }
-
-    CDOFeature cdoFeature = getCDOClass().lookupFeature(mappedProperty.getName());
-    if (cdoFeature.isReference() && cdoFeature.isMany())
-    {
-      return new CDOManyReferenceSetter(this, mappedProperty.getName());
-    }
-    else if (cdoFeature.isReference())
-    {
-      return new CDOReferenceSetter(this, mappedProperty.getName());
-    }
-
-    return new CDOPropertySetter(this, mappedProperty.getName());
-  }
-
-  @Override
-  protected Instantiator buildInstantiator(PersistentClass mappingInfo)
-  {
-    return new CDORevisionInstantiator(this, mappingInfo);
-  }
-
-  @Override
-  protected ProxyFactory buildProxyFactory(PersistentClass mappingInfo, Getter idGetter, Setter idSetter)
-  {
-    ProxyFactory pf = new CDORevisionProxyFactory();
-
-    try
-    {
-      pf.postInstantiate(getEntityName(), null, null, null, null, null);
-    }
-    catch (HibernateException ex)
-    {
-      OM.LOG.error("Could not create proxy factory for " + getEntityName(), ex);
-      pf = null;
-    }
-
-    return pf;
-  }
-
-  @SuppressWarnings("unchecked")
-  public Class getMappedClass()
-  {
-    return InternalCDORevision.class;
-  }
-
-  @SuppressWarnings("unchecked")
-  public Class getConcreteProxyClass()
-  {
-    return InternalCDORevision.class;
-  }
-
-  public boolean isInstrumented()
-  {
-    return false;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java
deleted file mode 100644
index d6afdd887f..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2005, 2006, 2007, 2008 Springsite BV (The Netherlands) 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:
- *   Martin Taal
- * </copyright>
- *
- * $Id: CDOSyntheticIdPropertyHandler.java,v 1.2 2008-04-28 08:30:39 estepper Exp $
- */
-
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDTemp;
-import org.eclipse.emf.cdo.server.IStoreWriter.CommitContext;
-import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
-import org.eclipse.emf.cdo.server.hibernate.internal.id.CDOIDHibernateFactoryImpl;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateThreadContext;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
-
-import org.hibernate.HibernateException;
-import org.hibernate.PropertyNotFoundException;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.property.Getter;
-import org.hibernate.property.PropertyAccessor;
-import org.hibernate.property.Setter;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * Is only used for synthetic id's.
- * 
- * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.2 $
- */
-@SuppressWarnings("unchecked")
-public class CDOSyntheticIdPropertyHandler implements Getter, Setter, PropertyAccessor
-{
-  private static final long serialVersionUID = 1L;
-
-  public Getter getGetter(Class theClass, String propertyName) throws PropertyNotFoundException
-  {
-    return this;
-  }
-
-  public Setter getSetter(Class theClass, String propertyName) throws PropertyNotFoundException
-  {
-    return this;
-  }
-
-  public Object get(Object owner) throws HibernateException
-  {
-    InternalCDORevision revision = HibernateUtil.getInstance().getCDORevision(owner);
-    if (revision == null)
-    {
-      return null;
-    }
-
-    if (!(revision.getID() instanceof CDOIDHibernate))
-    {
-      return null;
-    }
-
-    CDOIDHibernate cdoID = (CDOIDHibernate)revision.getID();
-    return cdoID.getId();
-  }
-
-  public Object getForInsert(Object arg0, Map arg1, SessionImplementor arg2) throws HibernateException
-  {
-    return get(arg0);
-  }
-
-  public Method getMethod()
-  {
-    return null;
-  }
-
-  public String getMethodName()
-  {
-    return null;
-  }
-
-  public Class getReturnType()
-  {
-    return null;
-  }
-
-  public void set(Object target, Object value, SessionFactoryImplementor factory) throws HibernateException
-  {
-    if (value == null)
-    {
-      return;
-    }
-
-    InternalCDORevision revision = HibernateUtil.getInstance().getCDORevision(target);
-    CDOID cdoID = revision.getID();
-    if (cdoID == null)
-    {
-      CDOIDHibernate newCDOID = CDOIDHibernateFactoryImpl.getInstance().createCDOID((Serializable)value,
-          revision.getCDOClass().getName());
-      revision.setID(newCDOID);
-    }
-    else if (cdoID instanceof CDOIDTemp)
-    {
-      CommitContext commitContext = HibernateThreadContext.getCommitContext();
-      CDOIDHibernate newCDOID = CDOIDHibernateFactoryImpl.getInstance().createCDOID((Serializable)value,
-          revision.getCDOClass().getName());
-      revision.setID(newCDOID);
-      commitContext.addIDMapping((CDOIDTemp)cdoID, newCDOID);
-    }
-    else
-    {
-      CDOIDHibernate hbCDOID = (CDOIDHibernate)revision.getID();
-      if (!hbCDOID.getId().equals(value))
-      {
-        throw new IllegalStateException("Current id and new id are different " + value + "/" + hbCDOID.getId());
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java
deleted file mode 100644
index 9cc01cd344..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2005, 2006, 2007, 2008 Springsite BV (The Netherlands) 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:
- *   Martin Taal
- * </copyright>
- *
- * $Id: CDOSyntheticVersionPropertyHandler.java,v 1.2 2008-04-28 08:30:39 estepper Exp $
- */
-
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
-
-import org.hibernate.HibernateException;
-import org.hibernate.PropertyNotFoundException;
-import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.engine.SessionImplementor;
-import org.hibernate.property.Getter;
-import org.hibernate.property.PropertyAccessor;
-import org.hibernate.property.Setter;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * Reads the version from the internal version cache.
- * 
- * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.2 $
- */
-@SuppressWarnings("unchecked")
-public class CDOSyntheticVersionPropertyHandler implements Getter, Setter, PropertyAccessor
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOSyntheticVersionPropertyHandler()
-  {
-  }
-
-  public Getter getGetter(Class theClass, String propertyName) throws PropertyNotFoundException
-  {
-    return this;
-  }
-
-  public Setter getSetter(Class theClass, String propertyName) throws PropertyNotFoundException
-  {
-    return this;
-  }
-
-  public Object get(Object owner) throws HibernateException
-  {
-    InternalCDORevision revision = HibernateUtil.getInstance().getCDORevision(owner);
-    if (revision == null)
-    {
-      return null;
-    }
-
-    return revision.getVersion();
-  }
-
-  /**
-   * Reads the version from the versioncache
-   */
-  public Object getForInsert(Object owner, Map mergeMap, SessionImplementor session) throws HibernateException
-  {
-    return get(owner);
-  }
-
-  public Method getMethod()
-  {
-    return null;
-  }
-
-  public String getMethodName()
-  {
-    return null;
-  }
-
-  /** Returns Integer.class */
-  public Class getReturnType()
-  {
-    return Integer.class;
-  }
-
-  /** Sets the version in the internal version cache */
-  public void set(Object target, Object value, SessionFactoryImplementor factory) throws HibernateException
-  {
-    InternalCDORevision revision = HibernateUtil.getInstance().getCDORevision(target);
-    revision.setVersion(((Number)value).intValue());
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOTypeUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOTypeUserType.java
deleted file mode 100644
index 1d85a5f788..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOTypeUserType.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2008 - 2008 Martin Taal 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:
- *    Martin Taal - initial api
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.model.CDOTypeImpl;
-import org.eclipse.emf.cdo.protocol.model.CDOType;
-
-import org.hibernate.Hibernate;
-import org.hibernate.usertype.UserType;
-
-import java.io.Serializable;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-/**
- * @author Martin Taal
- */
-public class CDOTypeUserType implements UserType
-{
-  private static final int[] SQL_TYPES = { Types.INTEGER };
-
-  public CDOTypeUserType()
-  {
-  }
-
-  public int[] sqlTypes()
-  {
-    return SQL_TYPES;
-  }
-
-  public Class<?> returnedClass()
-  {
-    return CDOType.class;
-  }
-
-  public boolean isMutable()
-  {
-    return false;
-  }
-
-  public Object deepCopy(Object value)
-  {
-    return value;
-  }
-
-  public boolean equals(Object x, Object y)
-  {
-    if (x == y)
-    {
-      return true;
-    }
-
-    if (x == null || y == null)
-    {
-      return false;
-    }
-
-    return x.equals(y);
-  }
-
-  public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws SQLException
-  {
-    Integer value = (Integer)Hibernate.INTEGER.nullSafeGet(rs, names[0]);
-    if (rs.wasNull())
-    {
-      return null;
-    }
-
-    if (value == null)
-    {
-      return null;
-    }
-
-    return CDOTypeImpl.ids.get(value);
-  }
-
-  public void nullSafeSet(PreparedStatement statement, Object value, int index) throws SQLException
-  {
-    if (value != null)
-    {
-      statement.setInt(index, ((CDOType)value).getTypeID());
-    }
-    else
-    {
-      statement.setNull(index, Types.INTEGER);
-    }
-  }
-
-  public Serializable disassemble(Object value)
-  {
-    return (Serializable)value;
-  }
-
-  public Object assemble(Serializable cachedValue, Object owner)
-  {
-    return cachedValue;
-  }
-
-  public Object replace(Object original, Object target, Object owner)
-  {
-    return original;
-  }
-
-  public int hashCode(Object x)
-  {
-    return x.hashCode();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java
deleted file mode 100644
index b25edadbbf..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-
-import org.hibernate.HibernateException;
-
-/**
- * @author Martin Taal
- */
-public class CDOVersionPropertyGetter extends CDOPropertyGetter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOVersionPropertyGetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  @Override
-  public Object get(Object target) throws HibernateException
-  {
-    InternalCDORevision revision = (InternalCDORevision)target;
-    if (isVirtualProperty())
-    {
-      return revision.getVersion();
-    }
-
-    Object version = super.get(target);
-    // TODO: does this make sense?
-    // revision.setVersion(((Number)value).intValue());
-    return version;
-  }
-
-  @Override
-  protected boolean isVirtualPropertyAllowed()
-  {
-    return true;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java
deleted file mode 100644
index 337e104f1b..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal
- * 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-
-import org.hibernate.HibernateException;
-import org.hibernate.engine.SessionFactoryImplementor;
-
-/**
- * @author Martin Taal
- */
-public class CDOVersionPropertySetter extends CDOPropertySetter
-{
-  private static final long serialVersionUID = 1L;
-
-  public CDOVersionPropertySetter(CDORevisionTuplizer tuplizer, String propertyName)
-  {
-    super(tuplizer, propertyName);
-  }
-
-  @Override
-  public void set(Object target, Object value, SessionFactoryImplementor factory) throws HibernateException
-  {
-    InternalCDORevision revision = (InternalCDORevision)target;
-    revision.setVersion(((Number)value).intValue());
-    if (!isVirtualProperty())
-    {
-      super.set(target, value, factory);
-    }
-  }
-
-  @Override
-  protected boolean isVirtualPropertyAllowed()
-  {
-    return true;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java
deleted file mode 100644
index 6d34618435..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2008 - 2008 Martin Taal 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:
- *    Martin Taal - initial api
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
-
-import org.eclipse.net4j.util.collection.MoveableList;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-/**
- * Wraps a moveable list so that hibernate always sees an object view while cdo always sees a cdoid view.
- * 
- * @author Martin Taal
- */
-public class HibernateMoveableListWrapper implements List<Object>
-{
-  private MoveableList<Object> delegate;
-
-  public HibernateMoveableListWrapper()
-  {
-  }
-
-  /**
-   * @return the delegate
-   */
-  public MoveableList<Object> getDelegate()
-  {
-    return delegate;
-  }
-
-  /**
-   * @param delegate
-   *          the delegate to set
-   */
-  public void setDelegate(MoveableList<Object> delegate)
-  {
-    this.delegate = delegate;
-  }
-
-  protected Object getObject(Object o)
-  {
-    if (o == null)
-    {
-      return null;
-    }
-
-    // is already resolved
-    if (!(o instanceof CDOID))
-    {
-      return o;
-    }
-
-    return HibernateUtil.getInstance().getCDORevision((CDOID)o);
-  }
-
-  protected List<Object> getObjects(List<?> cdoIDs)
-  {
-    List<Object> result = new ArrayList<Object>();
-    for (Object o : cdoIDs)
-    {
-      result.add(getObject(o));
-    }
-
-    return result;
-  }
-
-  protected CDOID getCDOID(Object o)
-  {
-    CDORevision cdoRevision = (CDORevision)o;
-    return cdoRevision.getID();
-  }
-
-  protected List<CDOID> getCDOIDs(Collection<?> c)
-  {
-    List<CDOID> newC = new ArrayList<CDOID>();
-    for (Object o : c)
-    {
-      newC.add(getCDOID(o));
-    }
-
-    return newC;
-  }
-
-  public void add(int index, Object element)
-  {
-    getDelegate().add(index, getCDOID(element));
-  }
-
-  public boolean add(Object o)
-  {
-    return getDelegate().add(getCDOID(o));
-  }
-
-  public boolean addAll(Collection<? extends Object> c)
-  {
-    return getDelegate().addAll(getCDOIDs(c));
-  }
-
-  public boolean addAll(int index, Collection<? extends Object> c)
-  {
-    return getDelegate().addAll(index, getCDOIDs(c));
-  }
-
-  public void clear()
-  {
-    getDelegate().clear();
-  }
-
-  public boolean contains(Object o)
-  {
-    return getDelegate().contains(getCDOID(o));
-  }
-
-  public boolean containsAll(Collection<?> c)
-  {
-    return getDelegate().containsAll(getCDOIDs(c));
-  }
-
-  public Object get(int index)
-  {
-    return getObject(getDelegate().get(index));
-  }
-
-  public int indexOf(Object o)
-  {
-    return getDelegate().indexOf(getCDOID(o));
-  }
-
-  public boolean isEmpty()
-  {
-    return getDelegate().isEmpty();
-  }
-
-  public Iterator<Object> iterator()
-  {
-    return new CDOHibernateIterator(getDelegate().iterator());
-  }
-
-  public int lastIndexOf(Object o)
-  {
-    return getDelegate().lastIndexOf(getCDOID(o));
-  }
-
-  public ListIterator<Object> listIterator()
-  {
-    return new CDOHibernateListIterator(getDelegate().listIterator());
-  }
-
-  public ListIterator<Object> listIterator(int index)
-  {
-    return new CDOHibernateListIterator(getDelegate().listIterator(index));
-  }
-
-  public Object remove(int index)
-  {
-    return getDelegate().remove(index);
-  }
-
-  public boolean remove(Object o)
-  {
-    return getDelegate().remove(getCDOID(o));
-  }
-
-  public boolean removeAll(Collection<?> c)
-  {
-    return getDelegate().removeAll(getCDOIDs(c));
-  }
-
-  public boolean retainAll(Collection<?> c)
-  {
-    return getDelegate().retainAll(getCDOIDs(c));
-  }
-
-  public Object set(int index, Object element)
-  {
-    return getDelegate().set(index, getCDOID(element));
-  }
-
-  public int size()
-  {
-    return getDelegate().size();
-  }
-
-  public List<Object> subList(int fromIndex, int toIndex)
-  {
-    return getObjects(getDelegate().subList(fromIndex, toIndex));
-  }
-
-  public Object[] toArray()
-  {
-    Object[] result = new Object[size()];
-    int i = 0;
-    for (Object o : this)
-    {
-      result[i++] = o;
-    }
-
-    return result;
-  }
-
-  @SuppressWarnings("unchecked")
-  public <T> T[] toArray(T[] a)
-  {
-    int i = 0;
-    for (Object o : this)
-    {
-      a[i++] = (T)o;
-    }
-
-    return a;
-  }
-
-  private static final class CDOHibernateIterator implements Iterator<Object>
-  {
-    private final Iterator<?> delegate;
-
-    public CDOHibernateIterator(Iterator<?> delegate)
-    {
-      this.delegate = delegate;
-    }
-
-    public boolean hasNext()
-    {
-      return delegate.hasNext();
-    }
-
-    public Object next()
-    {
-      Object o = delegate.next();
-      if (o instanceof CDOID)
-      {
-        return HibernateUtil.getInstance().getCDORevision((CDOID)o);
-      }
-
-      return o;
-    }
-
-    public void remove()
-    {
-      delegate.remove();
-    }
-  }
-
-  private static final class CDOHibernateListIterator implements ListIterator<Object>
-  {
-    private final ListIterator<Object> delegate;
-
-    public CDOHibernateListIterator(ListIterator<Object> delegate)
-    {
-      this.delegate = delegate;
-    }
-
-    public void add(Object o)
-    {
-      delegate.add(((CDORevision)o).getID());
-    }
-
-    public boolean hasNext()
-    {
-      return delegate.hasNext();
-    }
-
-    public boolean hasPrevious()
-    {
-      return delegate.hasPrevious();
-    }
-
-    public Object next()
-    {
-      Object o = delegate.next();
-      if (o instanceof CDOID)
-      {
-        return HibernateUtil.getInstance().getCDORevision((CDOID)delegate.next());
-      }
-
-      return o;
-    }
-
-    public int nextIndex()
-    {
-      return delegate.nextIndex();
-    }
-
-    public Object previous()
-    {
-      Object o = delegate.previous();
-      if (o instanceof CDOID)
-      {
-        return HibernateUtil.getInstance().getCDORevision((CDOID)delegate.next());
-      }
-
-      return o;
-    }
-
-    public int previousIndex()
-    {
-      return delegate.previousIndex();
-    }
-
-    public void remove()
-    {
-      delegate.remove();
-    }
-
-    public void set(Object o)
-    {
-      delegate.set(((CDORevision)o).getID());
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java
deleted file mode 100644
index c5afdc69f8..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Martin Taal 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:
- *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
-
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-import org.hibernate.collection.PersistentCollection;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Keeps mappings from object/feature combinations to a hibernate persistable list. This works because the write action
- * is done in one thread.
- * 
- * @author Martin Taal
- */
-public class PersistableListHolder
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, PersistableListHolder.class);
-
-  private static PersistableListHolder instance = new PersistableListHolder();
-
-  private ThreadLocal<Map<Key, PersistentCollection>> listMapping = new ThreadLocal<Map<Key, PersistentCollection>>();
-
-  public PersistableListHolder()
-  {
-  }
-
-  public void putListMapping(Object target, CDOFeature cdoFeature, PersistentCollection collection)
-  {
-    Key key = new Key(target, cdoFeature);
-    getListMapping().put(key, collection);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Stored hb list in threadlocal: " + ((CDORevision)target).getCDOClass().getName() + "."
-          + cdoFeature.getName());
-    }
-  }
-
-  public PersistentCollection getListMapping(Object target, CDOFeature cdoFeature)
-  {
-    Key key = new Key(target, cdoFeature);
-    return getListMapping().get(key);
-  }
-
-  private Map<Key, PersistentCollection> getListMapping()
-  {
-    if (listMapping.get() == null)
-    {
-      listMapping.set(new HashMap<Key, PersistentCollection>());
-    }
-
-    return listMapping.get();
-  }
-
-  public static PersistableListHolder getInstance()
-  {
-    return instance;
-  }
-
-  public static void setInstance(PersistableListHolder instance)
-  {
-    PersistableListHolder.instance = instance;
-  }
-
-  private static final class Key
-  {
-    private Object owner;
-
-    private CDOFeature cdoFeature;
-
-    public Key(Object owner, CDOFeature cdoFeature)
-    {
-      this.owner = owner;
-      this.cdoFeature = cdoFeature;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-      if (!(obj instanceof Key))
-      {
-        return false;
-      }
-
-      Key otherKey = (Key)obj;
-      // the owner is uniquely present in mem, the same applies for the cdoFeature
-      // therefore == is allowed
-      return owner == otherKey.owner && cdoFeature == otherKey.cdoFeature;
-    }
-
-    @Override
-    public int hashCode()
-    {
-      return owner.hashCode() + cdoFeature.hashCode();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.classpath b/plugins/org.eclipse.emf.cdo.tests.hibernate/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.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.emf.cdo.tests.hibernate/.cvsignore b/plugins/org.eclipse.emf.cdo.tests.hibernate/.cvsignore
deleted file mode 100644
index ef2fbf6ec2..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-model1X.ecore
-state
-*.log
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.project b/plugins/org.eclipse.emf.cdo.tests.hibernate/.project
deleted file mode 100644
index d7664e5c81..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.cdo.tests.hibernate</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4e7a462776..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,328 +0,0 @@
-#Mon May 12 12:28:38 CEST 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-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.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-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=warning
-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.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=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=ignore
-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=ignore
-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.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.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.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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 473e5b4aff..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:48:18 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 9203d94542..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:11:15 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index d5f9cf5106..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:11:15 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 06b138ba0b..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-#Sat Mar 01 20:37:23 CET 2008
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/HibernateServer.launch b/plugins/org.eclipse.emf.cdo.tests.hibernate/HibernateServer.launch
deleted file mode 100644
index 3cd1aff9de..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/HibernateServer.launch
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.hibernate.HibernateServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests.hibernate"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
deleted file mode 100644
index 39fa9fdc34..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.emf.cdo.tests.hibernate;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.emf.cdo.tests.hibernate.Activator
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db.mysql;bundle-version="0.8.0",
- org.eclipse.net4j.tcp,
- org.eclipse.emf.cdo,
- org.eclipse.emf.cdo.server,
- org.eclipse.emf.cdo.server.hibernate.libraries,
- org.eclipse.emf.cdo.server.hibernate,
- org.eclipse.emf.cdo.tests,
- org.eclipse.emf.cdo.server.hibernate.teneo
-Export-Package: mappings
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/about.html b/plugins/org.eclipse.emf.cdo.tests.hibernate/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/about.html
+++ /dev/null
@@ -1,28 +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.emf.cdo.tests.hibernate/about.ini b/plugins/org.eclipse.emf.cdo.tests.hibernate/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/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.emf.cdo.tests.hibernate/about.mappings b/plugins/org.eclipse.emf.cdo.tests.hibernate/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/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.emf.cdo.tests.hibernate/about.properties b/plugins/org.eclipse.emf.cdo.tests.hibernate/about.properties
deleted file mode 100644
index 3d3cf521d2..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 = CDO Tests (Incubation)
-featureText = CDO Tests\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/CDO
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/build.properties b/plugins/org.eclipse.emf.cdo.tests.hibernate/build.properties
deleted file mode 100644
index 10d0d39618..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png,\
-               src/log4j.properties
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/copyright.txt b/plugins/org.eclipse.emf.cdo.tests.hibernate/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/epl-v10.html b/plugins/org.eclipse.emf.cdo.tests.hibernate/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/license.html b/plugins/org.eclipse.emf.cdo.tests.hibernate/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/modeling32.png b/plugins/org.eclipse.emf.cdo.tests.hibernate/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/plugin.properties b/plugins/org.eclipse.emf.cdo.tests.hibernate/plugin.properties
deleted file mode 100644
index d4280961f2..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Tests Hibernate (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/app.properties b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/app.properties
deleted file mode 100644
index eeb34388d1..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/app.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-hibernate.hbm2ddl.auto=create-drop
-hibernate.show_sql=false
-hibernate.connection.pool_size=10
-
-# -----------------------------------------------------------
-# DEFAULT SETTINGS FOR IN MEMORY HSQLDB DATABASE.
-#
-hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class=org.hsqldb.jdbcDriver
-hibernate.connection.url=jdbc:hsqldb:mem:cdohibernate
-hibernate.connection.username=sa
-hibernate.connection.password=
-hibernate.connection.autocommit=true
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-
-#--------------------------------------------------------------
-# EXAMPLE SETTING FOR MYSQL DATABASE. UNCOMMENT AND EDIT TO USE.
-# 
-#hibernate.connection.driver_class=com.mysql.jdbc.Driver
-#hibernate.connection.url=jdbc:mysql://localhost:3306/cdohibernate
-#hibernate.connection.username=cdo
-#hibernate.connection.password=
-#hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/log4j.properties b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/log4j.properties
deleted file mode 100644
index b956a8a902..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/log4j.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-# Set root logger level to error and its only appender to A1.
-log4j.rootCategory=error, A1
-
-log4j.category.JPOX=OFF
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-
-#log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate=error
-#org.hibernate.pretty
-
-### log HQL query parser activity
-log4j.logger.org.hibernate.hql.ast.AST=error
-
-### log just the SQL
-log4j.logger.org.hibernate.SQL=error
-
-### log JDBC bind parameters ###
-log4j.logger.org.hibernate.type=error
-#log4j.logger.org.hibernate.type=error
-
-### log schema export/update ###
-log4j.logger.org.hibernate.tool.hbm2ddl=error
-
-### log HQL parse trees
-log4j.logger.org.hibernate.hql=error
-
-### log cache activity ###
-log4j.logger.org.hibernate.cache=error
-
-### log transaction activity
-log4j.logger.org.hibernate.transaction=error
-
-### log JDBC resource acquisition
-log4j.logger.org.hibernate.jdbc=error
-
-### enable the following line if you want to track down connection ###
-### leakages when using DriverManagerConnectionProvider ###
-log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=error
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/mappings/product.hbm.xml b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/mappings/product.hbm.xml
deleted file mode 100644
index 174d68a56f..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/mappings/product.hbm.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping auto-import="false">
-	<class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
-		<meta attribute="eclassName">Address</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`name`"/>
-		</property>
-		<property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`street`"/>
-		</property>
-		<property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`city`"/>
-		</property>
-	</class>
-	<subclass entity-name="Company" abstract="false" lazy="false" extends="Address" discriminator-value="Company">
-		<meta attribute="eclassName">Company</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<list name="categories" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="company_categories">
-				<column name="`company_categories_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`company_categories_idx`"/>
-			<one-to-many entity-name="Category"/>
-		</list>
-		<list name="suppliers" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="company_suppliers">
-				<column name="`company_suppliers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`company_suppliers_idx`"/>
-			<one-to-many entity-name="Supplier"/>
-		</list>
-		<list name="customers" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="company_customers">
-				<column name="`company_customers_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`company_customers_idx`"/>
-			<one-to-many entity-name="Customer"/>
-		</list>
-		<list name="purchaseOrders" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="company_purchaseorders">
-				<column name="`company_purchaseorders_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`company_purchaseorders_idx`"/>
-			<one-to-many entity-name="PurchaseOrder"/>
-		</list>
-		<list name="salesOrders" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="company_salesorders">
-				<column name="`company_salesorders_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`company_salesorders_idx`"/>
-			<one-to-many entity-name="SalesOrder"/>
-		</list>
-	</subclass>
-	<subclass entity-name="Supplier" abstract="false" lazy="false" extends="Address" discriminator-value="Supplier">
-		<meta attribute="eclassName">Supplier</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<list name="purchaseOrders" lazy="true">
-			<key update="true">
-				<column name="`purchaseorder_supplier_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`supplier_purchaseorders_idx`"/>
-			<one-to-many entity-name="PurchaseOrder"/>
-		</list>
-	</subclass>
-	<subclass entity-name="Customer" abstract="false" lazy="false" extends="Address" discriminator-value="Customer">
-		<meta attribute="eclassName">Customer</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<list name="salesOrders" lazy="true">
-			<key update="true">
-				<column name="`salesorder_customer_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`customer_salesorders_idx`"/>
-			<one-to-many entity-name="SalesOrder"/>
-		</list>
-	</subclass>
-	<class entity-name="Order" abstract="false" lazy="false" discriminator-value="Order" table="`order`">
-		<meta attribute="eclassName">Order</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<list name="orderDetails" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
-				<column name="`orderdetail_order_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`order_orderdetails_idx`"/>
-			<one-to-many entity-name="OrderDetail"/>
-		</list>
-	</class>
-	<class entity-name="OrderDetail" abstract="false" lazy="false" discriminator-value="OrderDetail" table="`orderdetail`">
-		<meta attribute="eclassName">OrderDetail</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<many-to-one name="order" entity-name="Order" foreign-key="orderdetail_order" lazy="false" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`orderdetail_order_e_id`"/>
-		</many-to-one>
-		<many-to-one name="product" entity-name="Product" foreign-key="orderdetail_product" lazy="false" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`orderdetail_product_e_id`"/>
-		</many-to-one>
-		<property name="price" lazy="false" insert="true" update="true" not-null="false" unique="false" type="float">
-			<column not-null="false" unique="false" name="`price`"/>
-		</property>
-	</class>
-	<subclass entity-name="PurchaseOrder" abstract="false" lazy="false" extends="Order" discriminator-value="PurchaseOrder">
-		<meta attribute="eclassName">PurchaseOrder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<property name="date" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
-			<column not-null="false" unique="false" name="`date`"/>
-		</property>
-		<many-to-one name="supplier" entity-name="Supplier" foreign-key="purchaseorder_supplier" lazy="false" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`purchaseorder_supplier_e_id`"/>
-		</many-to-one>
-	</subclass>
-	<subclass entity-name="SalesOrder" abstract="false" lazy="false" extends="Order" discriminator-value="SalesOrder">
-		<meta attribute="eclassName">SalesOrder</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
-			<column not-null="false" unique="false" name="`id`"/>
-		</property>
-		<many-to-one name="customer" entity-name="Customer" foreign-key="salesorder_customer" lazy="false" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`salesorder_customer_e_id`"/>
-		</many-to-one>
-	</subclass>
-	<class entity-name="Category" abstract="false" lazy="false" discriminator-value="Category" table="`category`">
-		<meta attribute="eclassName">Category</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`name`"/>
-		</property>
-		<list name="categories" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="category_categories">
-				<column name="`category_categories_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`category_categories_idx`"/>
-			<one-to-many entity-name="Category"/>
-		</list>
-		<list name="products" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="category_products">
-				<column name="`category_products_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`category_products_idx`"/>
-			<one-to-many entity-name="Product"/>
-		</list>
-	</class>
-	<class entity-name="Product" abstract="false" lazy="false" discriminator-value="Product" table="`product`">
-		<meta attribute="eclassName">Product</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/CDO/tests/model1/1.0.0</meta>
-		<tuplizer entity-mode="pojo" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<tuplizer entity-mode="dynamic-map" class="org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
-			<meta attribute="syntheticId">true</meta>
-			<generator class="native"/>
-		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
-			<meta attribute="syntheticVersion">true</meta>
-		</version>
-		<property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`name`"/>
-		</property>
-		<list name="orderDetails" lazy="true">
-			<key update="true">
-				<column name="`orderdetail_product_e_id`" not-null="false" unique="false"/>
-			</key>
-			<list-index column="`product_orderdetails_idx`"/>
-			<one-to-many entity-name="OrderDetail"/>
-		</list>
-	</class>
-</hibernate-mapping>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java
deleted file mode 100644
index d8c7c569aa..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.tests.hibernate;
-
-import org.eclipse.core.runtime.Plugin;
-
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Eike Stepper
- */
-public class Activator extends Plugin
-{
-  public static final String PLUGIN_ID = "org.eclipse.emf.cdo.tests.hibernate";
-
-  private static Activator plugin;
-
-  public Activator()
-  {
-  }
-
-  @Override
-  public void start(BundleContext context) throws Exception
-  {
-    super.start(context);
-    plugin = this;
-  }
-
-  @Override
-  public void stop(BundleContext context) throws Exception
-  {
-    plugin = null;
-    super.stop(context);
-  }
-
-  public static Activator getDefault()
-  {
-    return plugin;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTests.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTests.java
deleted file mode 100644
index 2532da441c..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTests.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.tests.hibernate;
-
-import org.eclipse.emf.cdo.tests.ContainmentTest;
-import org.eclipse.emf.cdo.tests.CrossReferenceTest;
-import org.eclipse.emf.cdo.tests.EnumTest;
-import org.eclipse.emf.cdo.tests.IndexReconstructionTest;
-import org.eclipse.emf.cdo.tests.InitialTest;
-import org.eclipse.emf.cdo.tests.InvalidationTest;
-import org.eclipse.emf.cdo.tests.MangoTest;
-import org.eclipse.emf.cdo.tests.NoLegacyTest;
-import org.eclipse.emf.cdo.tests.ResourceTest;
-import org.eclipse.emf.cdo.tests.RevisionDeltaTest;
-import org.eclipse.emf.cdo.tests.RevisionHolderTest;
-import org.eclipse.emf.cdo.tests.RollbackTest;
-import org.eclipse.emf.cdo.tests.StateMachineTest;
-import org.eclipse.emf.cdo.tests.StoreRepositoryProvider;
-import org.eclipse.emf.cdo.tests.ViewTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Eike Stepper
- */
-public class AllTests
-{
-  public static Test suite()
-  {
-    StoreRepositoryProvider.setInstance(HbStoreRepositoryProvider.getInstance());
-
-    TestSuite suite = new TestSuite("Tests for CDO using Hibernate");
-    suite.addTestSuite(HibernatePackageRegistryTest.class);
-
-    suite.addTestSuite(ContainmentTest.class);
-    suite.addTestSuite(RevisionDeltaTest.class);
-    suite.addTestSuite(RollbackTest.class);
-    suite.addTestSuite(StateMachineTest.class);
-    suite.addTestSuite(RevisionHolderTest.class);
-    suite.addTestSuite(CrossReferenceTest.class);
-    suite.addTestSuite(MangoTest.class);
-    suite.addTestSuite(EnumTest.class);
-    suite.addTestSuite(NoLegacyTest.class);
-    suite.addTestSuite(ResourceTest.class);
-    suite.addTestSuite(InvalidationTest.class);
-    suite.addTestSuite(InitialTest.class);
-    suite.addTestSuite(ViewTest.class);
-    suite.addTestSuite(IndexReconstructionTest.class);
-    suite.addTestSuite(HbTransactionDeadLockTest.class);
-
-    // These fail for standard cdo >>>
-    // suite.addTestSuite(DymamicEcoreTest.class);
-    // suite.addTestSuite(ContentAdapterTest.class);
-    // suite.addTestSuite(FetchRuleAnalyzerTest.class);
-    // suite.addTestSuite(GeneratedEcoreTest.class);
-
-    // Chunking is not supported by Hibernate
-    // suite.addTestSuite(ChunkingTest.class);
-    // failures: /testWriteNative, testChunkWithTemporaryObject
-    // suite.addTestSuite(ChunkingWithMEMTest.class);
-    // failures testReadNative, testWriteNative
-
-    // $JUnit-BEGIN$
-    // TODO suite.addTestSuite(GeneratedEcoreTest.class);
-    // $JUnit-END$
-
-    return suite;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbStoreRepositoryProvider.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbStoreRepositoryProvider.java
deleted file mode 100644
index 03ebd4b4c2..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbStoreRepositoryProvider.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, 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
- **************************************************************************/
-package org.eclipse.emf.cdo.tests.hibernate;
-
-import org.eclipse.emf.cdo.server.CDOServerUtil;
-import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.server.IStore;
-import org.eclipse.emf.cdo.server.IRepository.Props;
-import org.eclipse.emf.cdo.server.hibernate.IHibernateMappingProvider;
-import org.eclipse.emf.cdo.server.hibernate.teneo.TeneoHibernateMappingProvider;
-import org.eclipse.emf.cdo.server.internal.hibernate.HibernateStore;
-import org.eclipse.emf.cdo.tests.StoreRepositoryProvider;
-
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.om.OMPlatform;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * @author Eike Stepper
- * @author Martin Taal
- */
-public class HbStoreRepositoryProvider extends StoreRepositoryProvider
-{
-  public static final String MAPPING_FILE = "mappingfile";
-
-  private static HbStoreRepositoryProvider instance = new HbStoreRepositoryProvider();
-
-  public static HbStoreRepositoryProvider getInstance()
-  {
-    return instance;
-  }
-
-  public static void setInstance(HbStoreRepositoryProvider instance)
-  {
-    HbStoreRepositoryProvider.instance = instance;
-  }
-
-  @Override
-  public IRepository createRepository(String name, Map<String, String> testProperties)
-  {
-    setLogging();
-
-    Map<String, String> props = new HashMap<String, String>();
-    props.put(Props.PROP_OVERRIDE_UUID, "f8188187-65de-4c8a-8e75-e0ce5949837a");
-    props.put(Props.PROP_SUPPORTING_AUDITS, "false");
-    props.put(Props.PROP_SUPPORTING_REVISION_DELTAS, "false");
-    props.put(Props.PROP_VERIFYING_REVISIONS, "false");
-    props.put(Props.PROP_CURRENT_LRU_CAPACITY, "10000");
-    props.put(Props.PROP_REVISED_LRU_CAPACITY, "10000");
-    addHibernateTeneoProperties(props);
-
-    // override with the test properties
-    props.putAll(testProperties);
-
-    return CDOServerUtil.createRepository(name, createStore(), props);
-  }
-
-  private void addHibernateTeneoProperties(Map<String, String> props)
-  {
-    try
-    {
-      final Properties teneoProperties = new Properties();
-      teneoProperties.load(getClass().getResourceAsStream("/app.properties"));
-      for (Object key : teneoProperties.keySet())
-      {
-        props.put((String)key, teneoProperties.getProperty((String)key));
-      }
-    }
-    catch (Exception e)
-    {
-      throw WrappedException.wrap(e);
-    }
-  }
-
-  @Override
-  public IStore createStore()
-  {
-    IHibernateMappingProvider mappingProvider = new TeneoHibernateMappingProvider();
-    // return new HibernateStore(props, mappingProvider);
-    // IHibernateMappingProvider mappingProvider = new CDOInterceptor("/mappings/product.hbm.xml");
-    return new HibernateStore(mappingProvider);
-  }
-
-  protected void setLogging()
-  {
-    OMPlatform.INSTANCE.setDebugging(false);
-    // OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
-    // OMPlatform.INSTANCE.addTraceHandler(new PrintTraceHandler(new PrintStream("trace.txt")));
-    // OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbTransactionDeadLockTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbTransactionDeadLockTest.java
deleted file mode 100644
index 6fe3db0b4f..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbTransactionDeadLockTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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:
- *    Simon McDuff - initial API and implementation
- *    Eike Stepper - maintenance
- **************************************************************************/
-package org.eclipse.emf.cdo.tests.hibernate;
-
-import org.eclipse.emf.cdo.tests.TransactionDeadLockTest;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=213782
- * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=201366
- * @author Simon McDuff
- */
-public class HbTransactionDeadLockTest extends TransactionDeadLockTest
-{
-
-  // allows a testcase to pass specific properties
-  @Override
-  protected Map<String, String> getTestProperties()
-  {
-    final Map<String, String> testProperties = new HashMap<String, String>();
-    testProperties.put("hibernate.hbm2ddl.auto", "update");
-    return testProperties;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernatePackageRegistryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernatePackageRegistryTest.java
deleted file mode 100644
index ea83c9b120..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernatePackageRegistryTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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:
- *    Simon McDuff - initial API and implementation
- *    Eike Stepper - maintenance
- **************************************************************************/
-package org.eclipse.emf.cdo.tests.hibernate;
-
-import org.eclipse.emf.cdo.tests.PackageRegistryTest;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Overrides the real testclass because it needs some specific create-drop settings for specific testcases. This is not
- * the nicest way of doing this but it is short and easy to understand.
- */
-public class HibernatePackageRegistryTest extends PackageRegistryTest
-{
-
-  private String hbm2ddlValue = null;
-
-  // allows a testcase to pass specific properties
-  @Override
-  protected Map<String, String> getTestProperties()
-  {
-    final Map<String, String> testProperties = new HashMap<String, String>();
-    if (getHbm2ddlValue() != null)
-    {
-      testProperties.put("hibernate.hbm2ddl.auto", getHbm2ddlValue());
-    }
-    return testProperties;
-  }
-
-  @Override
-  // this testcase can't handle create-drop because in the middle of the
-  // testcase a new package is written to the db
-  public void testCommitUnrelatedPackage() throws Exception
-  {
-    setHbm2ddlValue("update");
-    // this needs to be extra because in doSetup it is unknown which testcase is being run
-    doTearDown();
-    doSetUp();
-    try
-    {
-      super.testCommitUnrelatedPackage();
-    }
-    finally
-    {
-      setHbm2ddlValue(null);
-    }
-  }
-
-  @Override
-  protected void doSetUp() throws Exception
-  {
-    System.err.println("Called dosetup");
-    super.doSetUp();
-  }
-
-  @Override
-  protected void doTearDown() throws Exception
-  {
-    System.err.println("Called doteardown");
-    super.doTearDown();
-  }
-
-  public String getHbm2ddlValue()
-  {
-    return hbm2ddlValue;
-  }
-
-  public void setHbm2ddlValue(String hbm2ddlValue)
-  {
-    this.hbm2ddlValue = hbm2ddlValue;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateServer.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateServer.java
deleted file mode 100644
index 80d2395d0e..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateServer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, 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
- *    Martin Taal - extended testcase
- **************************************************************************/
-package org.eclipse.emf.cdo.tests.hibernate;
-
-import org.eclipse.emf.cdo.server.CDOServerUtil;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
-import org.eclipse.net4j.tcp.TCPUtil;
-import org.eclipse.net4j.util.container.ContainerUtil;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.om.OMPlatform;
-
-import java.io.FileNotFoundException;
-import java.io.PrintStream;
-import java.util.HashMap;
-
-/**
- * @author Eike Stepper
- */
-public class HibernateServer
-{
-  private static final String REPOSITORY_NAME = "repo1";
-
-  private static final boolean TRACE_TO_CONSOLE = true;
-
-  private static final boolean TRACE_TO_FILE = false;
-
-  private static PrintStream traceStream;
-
-  public static void main(String[] args) throws Exception
-  {
-    try
-    {
-      IManagedContainer container = initContainer();
-      TCPUtil.getAcceptor(container, "0.0.0.0:2036"); // Start the JVM transport
-      CDOServerUtil.addRepository(container, HbStoreRepositoryProvider.getInstance().createRepository(REPOSITORY_NAME,
-          new HashMap<String, String>()));
-      IOUtil.OUT().println();
-      IOUtil.OUT().println("Hit any key to shut down...");
-      while (System.in.read() == -1)
-      {
-        Thread.sleep(500);
-      }
-
-      LifecycleUtil.deactivate(container);
-    }
-    finally
-    {
-      IOUtil.closeSilent(traceStream);
-    }
-  }
-
-  private static IManagedContainer initContainer() throws FileNotFoundException
-  {
-    // Turn on tracing
-    OMPlatform.INSTANCE.setDebugging(false);
-    OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
-    if (TRACE_TO_FILE)
-    {
-      traceStream = new PrintStream("trace.txt");
-      OMPlatform.INSTANCE.addTraceHandler(new PrintTraceHandler(traceStream));
-    }
-
-    if (TRACE_TO_CONSOLE)
-    {
-      OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-    }
-
-    // Prepare the standalone infra structure (not needed when running inside Eclipse)
-    IManagedContainer container = ContainerUtil.createContainer(); // Create a wiring container
-    Net4jUtil.prepareContainer(container); // Prepare the Net4j kernel
-    TCPUtil.prepareContainer(container); // Prepare the TCP transport
-    CDOServerUtil.prepareContainer(container); // Prepare the CDO server
-    return container;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
deleted file mode 100644
index 0875df28ff..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mango; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.tests.mango,
- org.eclipse.emf.cdo.tests.mango.impl,
- org.eclipse.emf.cdo.tests.mango.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo;visibility:=reexport
-
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/plugin.properties b/plugins/org.eclipse.emf.cdo.tests.mango/plugin.properties
deleted file mode 100644
index 0eeb1618c2..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.mango/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Tests Mango (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
deleted file mode 100644
index 1494b0e2a9..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MangoPackage.java,v 1.3 2008-04-27 08:57:26 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.mango;
-
-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.emf.cdo.tests.mango.MangoFactory
- * @model kind="package"
- * @generated
- */
-public interface MangoPackage extends EPackage
-{
-  /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNAME = "mango";
-
-  /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/mango";
-
-  /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_PREFIX = "mango";
-
-  /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl <em>Value List</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl
-   * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getValueList()
-   * @generated
-   */
-  int VALUE_LIST = 0;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int VALUE_LIST__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Values</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int VALUE_LIST__VALUES = 1;
-
-  /**
-   * The number of structural features of the '<em>Value List</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int VALUE_LIST_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ValueImpl <em>Value</em>}' class. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.mango.impl.ValueImpl
-   * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getValue()
-   * @generated
-   */
-  int VALUE = 1;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int VALUE__NAME = 0;
-
-  /**
-   * The number of structural features of the '<em>Value</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int VALUE_FEATURE_COUNT = 1;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.ValueList <em>Value List</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Value List</em>'.
-   * @see org.eclipse.emf.cdo.tests.mango.ValueList
-   * @generated
-   */
-  EClass getValueList();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.ValueList#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.mango.ValueList#getName()
-   * @see #getValueList()
-   * @generated
-   */
-  EAttribute getValueList_Name();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.mango.ValueList#getValues <em>Values</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference list '<em>Values</em>'.
-   * @see org.eclipse.emf.cdo.tests.mango.ValueList#getValues()
-   * @see #getValueList()
-   * @generated
-   */
-  EReference getValueList_Values();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.Value <em>Value</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Value</em>'.
-   * @see org.eclipse.emf.cdo.tests.mango.Value
-   * @generated
-   */
-  EClass getValue();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.Value#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.mango.Value#getName()
-   * @see #getValue()
-   * @generated
-   */
-  EAttribute getValue_Name();
-
-  /**
-   * 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
-   */
-  MangoFactory getMangoFactory();
-
-  /**
-   * <!-- 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.emf.cdo.tests.mango.impl.ValueListImpl <em>Value List</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl
-     * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getValueList()
-     * @generated
-     */
-    EClass VALUE_LIST = eINSTANCE.getValueList();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute VALUE_LIST__NAME = eINSTANCE.getValueList_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Values</b></em>' reference list feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference VALUE_LIST__VALUES = eINSTANCE.getValueList_Values();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.ValueImpl <em>Value</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.mango.impl.ValueImpl
-     * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getValue()
-     * @generated
-     */
-    EClass VALUE = eINSTANCE.getValue();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute VALUE__NAME = eINSTANCE.getValue_Name();
-
-  }
-
-} // MangoPackage
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/Value.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/Value.java
deleted file mode 100644
index 6b282d6a0b..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/Value.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Value.java,v 1.2 2008-02-23 10:00:33 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.mango;
-
-import org.eclipse.emf.cdo.CDOObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Value</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.Value#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getValue()
- * @model
- * @extends CDOObject
- * @generated
- */
-public interface Value extends CDOObject
-{
-  /**
-   * 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.emf.cdo.tests.mango.MangoPackage#getValue_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.Value#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);
-
-} // Value
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ValueList.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ValueList.java
deleted file mode 100644
index 2e11b6777f..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ValueList.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ValueList.java,v 1.2 2008-02-23 10:00:33 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.mango;
-
-import org.eclipse.emf.cdo.CDOObject;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.ValueList#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.ValueList#getValues <em>Values</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getValueList()
- * @model
- * @extends CDOObject
- * @generated
- */
-public interface ValueList extends CDOObject
-{
-  /**
-   * 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.emf.cdo.tests.mango.MangoPackage#getValueList_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.ValueList#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);
-
-  /**
-   * Returns the value of the '<em><b>Values</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.mango.Value}. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Values</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>Values</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getValueList_Values()
-   * @model
-   * @generated
-   */
-  EList<Value> getValues();
-
-} // ValueList
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
deleted file mode 100644
index ca4de8b327..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MangoPackageImpl.java,v 1.2 2008-02-23 10:00:33 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.mango.impl;
-
-import org.eclipse.emf.cdo.tests.mango.MangoFactory;
-import org.eclipse.emf.cdo.tests.mango.MangoPackage;
-import org.eclipse.emf.cdo.tests.mango.Value;
-import org.eclipse.emf.cdo.tests.mango.ValueList;
-
-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 MangoPackageImpl extends EPackageImpl implements MangoPackage
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass valueListEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass valueEClass = 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.emf.cdo.tests.mango.MangoPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private MangoPackageImpl()
-  {
-    super(eNS_URI, MangoFactory.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.
-   * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
-   * method drives initialization for interdependent packages directly, in parallel with this package, itself.
-   * <p>
-   * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
-   * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
-   * packages are created before any are initialized, since one package's meta-model objects may refer to those of
-   * another.
-   * <p>
-   * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static MangoPackage init()
-  {
-    if (isInited) return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI);
-
-    // Obtain or create and register package
-    MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(eNS_URI)
-        : new MangoPackageImpl());
-
-    isInited = true;
-
-    // Create package meta-data objects
-    theMangoPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theMangoPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theMangoPackage.freeze();
-
-    return theMangoPackage;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getValueList()
-  {
-    return valueListEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getValueList_Name()
-  {
-    return (EAttribute)valueListEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getValueList_Values()
-  {
-    return (EReference)valueListEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getValue()
-  {
-    return valueEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getValue_Name()
-  {
-    return (EAttribute)valueEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public MangoFactory getMangoFactory()
-  {
-    return (MangoFactory)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
-    valueListEClass = createEClass(VALUE_LIST);
-    createEAttribute(valueListEClass, VALUE_LIST__NAME);
-    createEReference(valueListEClass, VALUE_LIST__VALUES);
-
-    valueEClass = createEClass(VALUE);
-    createEAttribute(valueEClass, VALUE__NAME);
-  }
-
-  /**
-   * <!-- 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);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(valueListEClass, ValueList.class, "ValueList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, ValueList.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getValueList_Values(), this.getValue(), null, "values", null, 0, -1, ValueList.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    initEClass(valueEClass, Value.class, "Value", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, Value.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} // MangoPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/ValueListImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/ValueListImpl.java
deleted file mode 100644
index 488c0aacb8..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/ValueListImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ValueListImpl.java,v 1.2 2008-02-23 10:00:34 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.mango.impl;
-
-import org.eclipse.emf.cdo.tests.mango.MangoPackage;
-import org.eclipse.emf.cdo.tests.mango.Value;
-import org.eclipse.emf.cdo.tests.mango.ValueList;
-
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl#getValues <em>Values</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class ValueListImpl extends CDOObjectImpl implements ValueList
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected ValueListImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return MangoPackage.Literals.VALUE_LIST;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected int eStaticFeatureCount()
-  {
-    return 0;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getName()
-  {
-    return (String)eGet(MangoPackage.Literals.VALUE_LIST__NAME, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    eSet(MangoPackage.Literals.VALUE_LIST__NAME, newName);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  public EList<Value> getValues()
-  {
-    return (EList<Value>)eGet(MangoPackage.Literals.VALUE_LIST__VALUES, true);
-  }
-
-} // ValueListImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java
deleted file mode 100644
index 37be60f287..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MangoAdapterFactory.java,v 1.2 2008-02-23 10:00:34 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.mango.util;
-
-import org.eclipse.emf.cdo.tests.mango.MangoPackage;
-import org.eclipse.emf.cdo.tests.mango.Value;
-import org.eclipse.emf.cdo.tests.mango.ValueList;
-
-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.emf.cdo.tests.mango.MangoPackage
- * @generated
- */
-public class MangoAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static MangoPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public MangoAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = MangoPackage.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 MangoSwitch<Adapter> modelSwitch = new MangoSwitch<Adapter>()
-  {
-    @Override
-    public Adapter caseValueList(ValueList object)
-    {
-      return createValueListAdapter();
-    }
-
-    @Override
-    public Adapter caseValue(Value object)
-    {
-      return createValueAdapter();
-    }
-
-    @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.emf.cdo.tests.mango.ValueList <em>Value List</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.emf.cdo.tests.mango.ValueList
-   * @generated
-   */
-  public Adapter createValueListAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.Value <em>Value</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.emf.cdo.tests.mango.Value
-   * @generated
-   */
-  public Adapter createValueAdapter()
-  {
-    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;
-  }
-
-} // MangoAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
deleted file mode 100644
index cea1618d80..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MangoSwitch.java,v 1.2 2008-02-23 10:00:34 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.mango.util;
-
-import org.eclipse.emf.cdo.tests.mango.MangoPackage;
-import org.eclipse.emf.cdo.tests.mango.Value;
-import org.eclipse.emf.cdo.tests.mango.ValueList;
-
-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.emf.cdo.tests.mango.MangoPackage
- * @generated
- */
-public class MangoSwitch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static MangoPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public MangoSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = MangoPackage.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 MangoPackage.VALUE_LIST:
-    {
-      ValueList valueList = (ValueList)theEObject;
-      T result = caseValueList(valueList);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case MangoPackage.VALUE:
-    {
-      Value value = (Value)theEObject;
-      T result = caseValue(value);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Value List</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>Value List</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseValueList(ValueList object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Value</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>Value</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseValue(Value 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;
-  }
-
-} // MangoSwitch
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
deleted file mode 100644
index 0dd7478f18..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model1; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.cdo;visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.model1,
- org.eclipse.emf.cdo.tests.model1.impl,
- org.eclipse.emf.cdo.tests.model1.util
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/plugin.properties b/plugins/org.eclipse.emf.cdo.tests.model1/plugin.properties
deleted file mode 100644
index 76b033eee2..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Tests Model1 (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
deleted file mode 100644
index e70ef30322..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.cdo.CDOObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Address</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress()
- * @model
- * @extends CDOObject
- * @generated
- */
-public interface Address extends CDOObject
-{
-  /**
-   * 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.emf.cdo.tests.model1.Model1Package#getAddress_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#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);
-
-  /**
-   * Returns the value of the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Street</em>' attribute isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Street</em>' attribute.
-   * @see #setStreet(String)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_Street()
-   * @model
-   * @generated
-   */
-  String getStreet();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Street</em>' attribute.
-   * @see #getStreet()
-   * @generated
-   */
-  void setStreet(String value);
-
-  /**
-   * Returns the value of the '<em><b>City</b></em>' attribute. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>City</em>' attribute isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>City</em>' attribute.
-   * @see #setCity(String)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_City()
-   * @model
-   * @generated
-   */
-  String getCity();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>City</em>' attribute.
-   * @see #getCity()
-   * @generated
-   */
-  void setCity(String value);
-
-} // Address
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
deleted file mode 100644
index 2e80c874c6..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.cdo.CDOObject;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory()
- * @model
- * @extends CDOObject
- * @generated
- */
-public interface Category extends CDOObject
-{
-  /**
-   * 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.emf.cdo.tests.model1.Model1Package#getCategory_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Category#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);
-
-  /**
-   * Returns the value of the '<em><b>Categories</b></em>' containment reference list. The list contents are of
-   * type {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more
-   * of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Categories</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Categories()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Category> getCategories();
-
-  /**
-   * Returns the value of the '<em><b>Products</b></em>' containment reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model1.Product}. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Products</em>' containment reference list isn't clear, there really should be more
-   * of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Products</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Products()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Product> getProducts();
-
-} // Category
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
deleted file mode 100644
index eb4c433db1..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Company</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany()
- * @model
- * @generated
- */
-public interface Company extends Address
-{
-  /**
-   * Returns the value of the '<em><b>Categories</b></em>' containment reference list. The list contents are of
-   * type {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more
-   * of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Categories</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Categories()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Category> getCategories();
-
-  /**
-   * Returns the value of the '<em><b>Suppliers</b></em>' containment reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model1.Supplier}. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Suppliers</em>' containment reference list isn't clear, there really should be more
-   * of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Suppliers</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Suppliers()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Supplier> getSuppliers();
-
-  /**
-   * Returns the value of the '<em><b>Purchase Orders</b></em>' containment reference list. The list contents are
-   * of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Purchase Orders</em>' containment reference list isn't clear, there really should be
-   * more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Purchase Orders</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_PurchaseOrders()
-   * @model containment="true"
-   * @generated
-   */
-  EList<PurchaseOrder> getPurchaseOrders();
-
-  /**
-   * Returns the value of the '<em><b>Customers</b></em>' containment reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model1.Customer}. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Customers</em>' containment reference list isn't clear, there really should be more
-   * of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Customers</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Customers()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Customer> getCustomers();
-
-  /**
-   * Returns the value of the '<em><b>Sales Orders</b></em>' containment reference list. The list contents are of
-   * type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Sales Orders</em>' containment reference list isn't clear, there really should be
-   * more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Sales Orders</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_SalesOrders()
-   * @model containment="true"
-   * @generated
-   */
-  EList<SalesOrder> getSalesOrders();
-
-} // Company
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
deleted file mode 100644
index c306e0068d..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Customer</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer()
- * @model
- * @generated
- */
-public interface Customer extends Address
-{
-  /**
-   * Returns the value of the '<em><b>Sales Orders</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Sales Orders</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>Sales Orders</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer_SalesOrders()
-   * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer
-   * @model opposite="customer"
-   * @generated
-   */
-  EList<SalesOrder> getSalesOrders();
-
-} // Customer
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
deleted file mode 100644
index eb07a66c3e..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
+++ /dev/null
@@ -1,1404 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-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.emf.cdo.tests.model1.Model1Factory
- * @model kind="package"
- * @generated
- */
-public interface Model1Package extends EPackage
-{
-  /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNAME = "model1";
-
-  /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model1/1.0.0";
-
-  /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_PREFIX = "model1";
-
-  /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.AddressImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getAddress()
-   * @generated
-   */
-  int ADDRESS = 0;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ADDRESS__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ADDRESS__STREET = 1;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ADDRESS__CITY = 2;
-
-  /**
-   * The number of structural features of the '<em>Address</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ADDRESS_FEATURE_COUNT = 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier()
-   * @generated
-   */
-  int SUPPLIER = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder()
-   * @generated
-   */
-  int PURCHASE_ORDER = 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail()
-   * @generated
-   */
-  int ORDER_DETAIL = 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl <em>Product</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.ProductImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct()
-   * @generated
-   */
-  int PRODUCT = 9;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Address <em>Address</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Address</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Address
-   * @generated
-   */
-  EClass getAddress();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Address#getName()
-   * @see #getAddress()
-   * @generated
-   */
-  EAttribute getAddress_Name();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Street</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Address#getStreet()
-   * @see #getAddress()
-   * @generated
-   */
-  EAttribute getAddress_Street();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>City</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Address#getCity()
-   * @see #getAddress()
-   * @generated
-   */
-  EAttribute getAddress_City();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory()
-   * @generated
-   */
-  int CATEGORY = 8;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCompany()
-   * @generated
-   */
-  int COMPANY = 1;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__NAME = ADDRESS__NAME;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__STREET = ADDRESS__STREET;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__CITY = ADDRESS__CITY;
-
-  /**
-   * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__CATEGORIES = ADDRESS_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Suppliers</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__SUPPLIERS = ADDRESS_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Customers</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__CUSTOMERS = ADDRESS_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the '<em>Company</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__NAME = ADDRESS__NAME;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__STREET = ADDRESS__STREET;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__CITY = ADDRESS__CITY;
-
-  /**
-   * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Preferred</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__PREFERRED = ADDRESS_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Supplier</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer()
-   * @generated
-   */
-  int CUSTOMER = 3;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER__NAME = ADDRESS__NAME;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER__STREET = ADDRESS__STREET;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER__CITY = ADDRESS__CITY;
-
-  /**
-   * The feature id for the '<em><b>Sales Orders</b></em>' reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Customer</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' class. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.OrderImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrder()
-   * @generated
-   */
-  int ORDER = 4;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER__ORDER_DETAILS = 0;
-
-  /**
-   * The number of structural features of the '<em>Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_FEATURE_COUNT = 1;
-
-  /**
-   * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_DETAIL__ORDER = 0;
-
-  /**
-   * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_DETAIL__PRODUCT = 1;
-
-  /**
-   * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_DETAIL__PRICE = 2;
-
-  /**
-   * The number of structural features of the '<em>Order Detail</em>' class. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_DETAIL_FEATURE_COUNT = 3;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PURCHASE_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS;
-
-  /**
-   * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PURCHASE_ORDER__DATE = ORDER_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PURCHASE_ORDER__SUPPLIER = ORDER_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Purchase Order</em>' class. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PURCHASE_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder()
-   * @generated
-   */
-  int SALES_ORDER = 7;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SALES_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SALES_ORDER__ID = ORDER_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Customer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SALES_ORDER__CUSTOMER = ORDER_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Sales Order</em>' class. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CATEGORY__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CATEGORY__CATEGORIES = 1;
-
-  /**
-   * The feature id for the '<em><b>Products</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CATEGORY__PRODUCTS = 2;
-
-  /**
-   * The number of structural features of the '<em>Category</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CATEGORY_FEATURE_COUNT = 3;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PRODUCT__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PRODUCT__ORDER_DETAILS = 1;
-
-  /**
-   * The feature id for the '<em><b>Vat</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PRODUCT__VAT = 2;
-
-  /**
-   * The number of structural features of the '<em>Product</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PRODUCT_FEATURE_COUNT = 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl <em>Order Address</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderAddress()
-   * @generated
-   */
-  int ORDER_ADDRESS = 10;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__NAME = ADDRESS__NAME;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__STREET = ADDRESS__STREET;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__CITY = ADDRESS__CITY;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__ORDER_DETAILS = ADDRESS_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__ORDER = ADDRESS_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__PRODUCT = ADDRESS_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__PRICE = ADDRESS_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Test Attribute</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__TEST_ATTRIBUTE = ADDRESS_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the '<em>Order Address</em>' class. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum. <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model1.VAT
-   * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getVAT()
-   * @generated
-   */
-  int VAT = 11;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Supplier</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Supplier
-   * @generated
-   */
-  EClass getSupplier();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference list '<em>Purchase Orders</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders()
-   * @see #getSupplier()
-   * @generated
-   */
-  EReference getSupplier_PurchaseOrders();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Preferred</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred()
-   * @see #getSupplier()
-   * @generated
-   */
-  EAttribute getSupplier_Preferred();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder <em>Purchase Order</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Purchase Order</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder
-   * @generated
-   */
-  EClass getPurchaseOrder();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Date</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate()
-   * @see #getPurchaseOrder()
-   * @generated
-   */
-  EAttribute getPurchaseOrder_Date();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference '<em>Supplier</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier()
-   * @see #getPurchaseOrder()
-   * @generated
-   */
-  EReference getPurchaseOrder_Supplier();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail <em>Order Detail</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Order Detail</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.OrderDetail
-   * @generated
-   */
-  EClass getOrderDetail();
-
-  /**
-   * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the container reference '<em>Order</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder()
-   * @see #getOrderDetail()
-   * @generated
-   */
-  EReference getOrderDetail_Order();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference '<em>Product</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct()
-   * @see #getOrderDetail()
-   * @generated
-   */
-  EReference getOrderDetail_Product();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Price</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice()
-   * @see #getOrderDetail()
-   * @generated
-   */
-  EAttribute getOrderDetail_Price();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Product <em>Product</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Product</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Product
-   * @generated
-   */
-  EClass getProduct();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Product#getName()
-   * @see #getProduct()
-   * @generated
-   */
-  EAttribute getProduct_Name();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference list '<em>Order Details</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails()
-   * @see #getProduct()
-   * @generated
-   */
-  EReference getProduct_OrderDetails();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product#getVat <em>Vat</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Vat</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Product#getVat()
-   * @see #getProduct()
-   * @generated
-   */
-  EAttribute getProduct_Vat();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress <em>Order Address</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Order Address</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.OrderAddress
-   * @generated
-   */
-  EClass getOrderAddress();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Test Attribute</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute()
-   * @see #getOrderAddress()
-   * @generated
-   */
-  EAttribute getOrderAddress_TestAttribute();
-
-  /**
-   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}'. <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for enum '<em>VAT</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.VAT
-   * @generated
-   */
-  EEnum getVAT();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Category</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Category
-   * @generated
-   */
-  EClass getCategory();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Category#getName()
-   * @see #getCategory()
-   * @generated
-   */
-  EAttribute getCategory_Name();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Categories</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Category#getCategories()
-   * @see #getCategory()
-   * @generated
-   */
-  EReference getCategory_Categories();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Products</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Category#getProducts()
-   * @see #getCategory()
-   * @generated
-   */
-  EReference getCategory_Products();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Company</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Company
-   * @generated
-   */
-  EClass getCompany();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Categories</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Company#getCategories()
-   * @see #getCompany()
-   * @generated
-   */
-  EReference getCompany_Categories();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Suppliers</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Company#getSuppliers()
-   * @see #getCompany()
-   * @generated
-   */
-  EReference getCompany_Suppliers();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Purchase Orders</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders()
-   * @see #getCompany()
-   * @generated
-   */
-  EReference getCompany_PurchaseOrders();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Customers</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Company#getCustomers()
-   * @see #getCompany()
-   * @generated
-   */
-  EReference getCompany_Customers();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Sales Orders</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders()
-   * @see #getCompany()
-   * @generated
-   */
-  EReference getCompany_SalesOrders();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Customer</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Customer
-   * @generated
-   */
-  EClass getCustomer();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference list '<em>Sales Orders</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders()
-   * @see #getCustomer()
-   * @generated
-   */
-  EReference getCustomer_SalesOrders();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Order</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Order
-   * @generated
-   */
-  EClass getOrder();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Order Details</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails()
-   * @see #getOrder()
-   * @generated
-   */
-  EReference getOrder_OrderDetails();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder <em>Sales Order</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Sales Order</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.SalesOrder
-   * @generated
-   */
-  EClass getSalesOrder();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getId()
-   * @see #getSalesOrder()
-   * @generated
-   */
-  EAttribute getSalesOrder_Id();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference '<em>Customer</em>'.
-   * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer()
-   * @see #getSalesOrder()
-   * @generated
-   */
-  EReference getSalesOrder_Customer();
-
-  /**
-   * 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
-   */
-  Model1Factory getModel1Factory();
-
-  /**
-   * <!-- 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.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.AddressImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getAddress()
-     * @generated
-     */
-    EClass ADDRESS = eINSTANCE.getAddress();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ADDRESS__NAME = eINSTANCE.getAddress_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Street</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street();
-
-    /**
-     * The meta object literal for the '<em><b>City</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ADDRESS__CITY = eINSTANCE.getAddress_City();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier()
-     * @generated
-     */
-    EClass SUPPLIER = eINSTANCE.getSupplier();
-
-    /**
-     * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference SUPPLIER__PURCHASE_ORDERS = eINSTANCE.getSupplier_PurchaseOrders();
-
-    /**
-     * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute SUPPLIER__PREFERRED = eINSTANCE.getSupplier_Preferred();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder()
-     * @generated
-     */
-    EClass PURCHASE_ORDER = eINSTANCE.getPurchaseOrder();
-
-    /**
-     * The meta object literal for the '<em><b>Date</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute PURCHASE_ORDER__DATE = eINSTANCE.getPurchaseOrder_Date();
-
-    /**
-     * The meta object literal for the '<em><b>Supplier</b></em>' reference feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference PURCHASE_ORDER__SUPPLIER = eINSTANCE.getPurchaseOrder_Supplier();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail()
-     * @generated
-     */
-    EClass ORDER_DETAIL = eINSTANCE.getOrderDetail();
-
-    /**
-     * The meta object literal for the '<em><b>Order</b></em>' container reference feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order();
-
-    /**
-     * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference ORDER_DETAIL__PRODUCT = eINSTANCE.getOrderDetail_Product();
-
-    /**
-     * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ORDER_DETAIL__PRICE = eINSTANCE.getOrderDetail_Price();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl <em>Product</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.ProductImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct()
-     * @generated
-     */
-    EClass PRODUCT = eINSTANCE.getProduct();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute PRODUCT__NAME = eINSTANCE.getProduct_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference PRODUCT__ORDER_DETAILS = eINSTANCE.getProduct_OrderDetails();
-
-    /**
-     * The meta object literal for the '<em><b>Vat</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute PRODUCT__VAT = eINSTANCE.getProduct_Vat();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl <em>Order Address</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderAddress()
-     * @generated
-     */
-    EClass ORDER_ADDRESS = eINSTANCE.getOrderAddress();
-
-    /**
-     * The meta object literal for the '<em><b>Test Attribute</b></em>' attribute feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ORDER_ADDRESS__TEST_ATTRIBUTE = eINSTANCE.getOrderAddress_TestAttribute();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.VAT
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getVAT()
-     * @generated
-     */
-    EEnum VAT = eINSTANCE.getVAT();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory()
-     * @generated
-     */
-    EClass CATEGORY = eINSTANCE.getCategory();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference CATEGORY__CATEGORIES = eINSTANCE.getCategory_Categories();
-
-    /**
-     * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCompany()
-     * @generated
-     */
-    EClass COMPANY = eINSTANCE.getCompany();
-
-    /**
-     * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__CATEGORIES = eINSTANCE.getCompany_Categories();
-
-    /**
-     * The meta object literal for the '<em><b>Suppliers</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__SUPPLIERS = eINSTANCE.getCompany_Suppliers();
-
-    /**
-     * The meta object literal for the '<em><b>Purchase Orders</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__PURCHASE_ORDERS = eINSTANCE.getCompany_PurchaseOrders();
-
-    /**
-     * The meta object literal for the '<em><b>Customers</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__CUSTOMERS = eINSTANCE.getCompany_Customers();
-
-    /**
-     * The meta object literal for the '<em><b>Sales Orders</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer()
-     * @generated
-     */
-    EClass CUSTOMER = eINSTANCE.getCustomer();
-
-    /**
-     * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.OrderImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrder()
-     * @generated
-     */
-    EClass ORDER = eINSTANCE.getOrder();
-
-    /**
-     * The meta object literal for the '<em><b>Order Details</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl
-     * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder()
-     * @generated
-     */
-    EClass SALES_ORDER = eINSTANCE.getSalesOrder();
-
-    /**
-     * The meta object literal for the '<em><b>Id</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id();
-
-    /**
-     * The meta object literal for the '<em><b>Customer</b></em>' reference feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference SALES_ORDER__CUSTOMER = eINSTANCE.getSalesOrder_Customer();
-
-  }
-
-} // Model1Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
deleted file mode 100644
index eb83edc852..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.cdo.CDOObject;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder()
- * @model
- * @extends CDOObject
- * @generated
- */
-public interface Order extends CDOObject
-{
-  /**
-   * Returns the value of the '<em><b>Order Details</b></em>' containment reference list. The list contents are of
-   * type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Order Details</em>' containment reference list isn't clear, there really should be
-   * more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Order Details</em>' containment reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder_OrderDetails()
-   * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder
-   * @model opposite="order" containment="true"
-   * @generated
-   */
-  EList<OrderDetail> getOrderDetails();
-
-} // Order
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
deleted file mode 100644
index e2feaa156d..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OrderAddress.java,v 1.1 2008-04-12 10:05:44 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Address</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderAddress()
- * @model
- * @generated
- */
-public interface OrderAddress extends Address, Order, OrderDetail
-{
-  /**
-   * Returns the value of the '<em><b>Test Attribute</b></em>' attribute. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Test Attribute</em>' attribute isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Test Attribute</em>' attribute.
-   * @see #setTestAttribute(boolean)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderAddress_TestAttribute()
-   * @model
-   * @generated
-   */
-  boolean isTestAttribute();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Test Attribute</em>' attribute.
-   * @see #isTestAttribute()
-   * @generated
-   */
-  void setTestAttribute(boolean value);
-
-} // OrderAddress
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
deleted file mode 100644
index 726d9b398c..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.cdo.CDOObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail()
- * @model
- * @extends CDOObject
- * @generated
- */
-public interface OrderDetail extends CDOObject
-{
-  /**
-   * Returns the value of the '<em><b>Order</b></em>' container reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Order</em>' container reference isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Order</em>' container reference.
-   * @see #setOrder(Order)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Order()
-   * @see org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails
-   * @model opposite="orderDetails" required="true" transient="false"
-   * @generated
-   */
-  Order getOrder();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}' container
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Order</em>' container reference.
-   * @see #getOrder()
-   * @generated
-   */
-  void setOrder(Order value);
-
-  /**
-   * Returns the value of the '<em><b>Product</b></em>' reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Product</em>' reference isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Product</em>' reference.
-   * @see #setProduct(Product)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Product()
-   * @see org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails
-   * @model opposite="orderDetails"
-   * @generated
-   */
-  Product getProduct();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Product</em>' reference.
-   * @see #getProduct()
-   * @generated
-   */
-  void setProduct(Product value);
-
-  /**
-   * Returns the value of the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Price</em>' attribute.
-   * @see #setPrice(float)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Price()
-   * @model
-   * @generated
-   */
-  float getPrice();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Price</em>' attribute.
-   * @see #getPrice()
-   * @generated
-   */
-  void setPrice(float value);
-
-} // OrderDetail
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java
deleted file mode 100644
index a0df4a8d0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.cdo.CDOObject;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Product</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getVat <em>Vat</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct()
- * @model
- * @extends CDOObject
- * @generated
- */
-public interface Product extends CDOObject
-{
-  /**
-   * 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.emf.cdo.tests.model1.Model1Package#getProduct_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product#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);
-
-  /**
-   * Returns the value of the '<em><b>Order Details</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Order Details</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>Order Details</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct_OrderDetails()
-   * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct
-   * @model opposite="product"
-   * @generated
-   */
-  EList<OrderDetail> getOrderDetails();
-
-  /**
-   * Returns the value of the '<em><b>Vat</b></em>' attribute. The default value is <code>"vat15"</code>. The
-   * literals are from the enumeration {@link org.eclipse.emf.cdo.tests.model1.VAT}. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Vat</em>' attribute isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Vat</em>' attribute.
-   * @see org.eclipse.emf.cdo.tests.model1.VAT
-   * @see #setVat(VAT)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct_Vat()
-   * @model default="vat15"
-   * @generated
-   */
-  VAT getVat();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product#getVat <em>Vat</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Vat</em>' attribute.
-   * @see org.eclipse.emf.cdo.tests.model1.VAT
-   * @see #getVat()
-   * @generated
-   */
-  void setVat(VAT value);
-
-} // Product
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
deleted file mode 100644
index 79974556db..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import java.util.Date;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Purchase Order</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder()
- * @model
- * @generated
- */
-public interface PurchaseOrder extends Order
-{
-  /**
-   * Returns the value of the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Date</em>' attribute isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Date</em>' attribute.
-   * @see #setDate(Date)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Date()
-   * @model
-   * @generated
-   */
-  Date getDate();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Date</em>' attribute.
-   * @see #getDate()
-   * @generated
-   */
-  void setDate(Date value);
-
-  /**
-   * Returns the value of the '<em><b>Supplier</b></em>' reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Supplier</em>' reference isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Supplier</em>' reference.
-   * @see #setSupplier(Supplier)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Supplier()
-   * @see org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders
-   * @model opposite="purchaseOrders" required="true"
-   * @generated
-   */
-  Supplier getSupplier();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Supplier</em>' reference.
-   * @see #getSupplier()
-   * @generated
-   */
-  void setSupplier(Supplier value);
-
-} // PurchaseOrder
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
deleted file mode 100644
index 7ecf63ac3a..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder()
- * @model
- * @generated
- */
-public interface SalesOrder extends Order
-{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>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>Id</em>' attribute.
-   * @see #setId(int)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Id()
-   * @model
-   * @generated
-   */
-  int getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}' attribute. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(int value);
-
-  /**
-   * Returns the value of the '<em><b>Customer</b></em>' reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Customer</em>' reference isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Customer</em>' reference.
-   * @see #setCustomer(Customer)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Customer()
-   * @see org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders
-   * @model opposite="salesOrders" required="true"
-   * @generated
-   */
-  Customer getCustomer();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Customer</em>' reference.
-   * @see #getCustomer()
-   * @generated
-   */
-  void setCustomer(Customer value);
-
-} // SalesOrder
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
deleted file mode 100644
index 9c36a6eccf..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Supplier</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier()
- * @model
- * @generated
- */
-public interface Supplier extends Address
-{
-  /**
-   * Returns the value of the '<em><b>Purchase Orders</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Purchase Orders</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>Purchase Orders</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier_PurchaseOrders()
-   * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier
-   * @model opposite="supplier"
-   * @generated
-   */
-  EList<PurchaseOrder> getPurchaseOrders();
-
-  /**
-   * Returns the value of the '<em><b>Preferred</b></em>' attribute. The default value is <code>"true"</code>.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Preferred</em>' attribute isn't clear, there really should be more of a description
-   * here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Preferred</em>' attribute.
-   * @see #setPreferred(boolean)
-   * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier_Preferred()
-   * @model default="true"
-   * @generated
-   */
-  boolean isPreferred();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Preferred</em>' attribute.
-   * @see #isPreferred()
-   * @generated
-   */
-  void setPreferred(boolean value);
-
-} // Supplier
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
deleted file mode 100644
index 1bd33f95c0..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: VAT.java,v 1.2 2008-03-08 09:41:45 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model1;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>VAT</b></em>', and utility
- * methods for working with them. <!-- end-user-doc -->
- * 
- * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getVAT()
- * @model
- * @generated
- */
-public enum VAT implements Enumerator
-{
-  /**
-   * The '<em><b>Vat0</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #VAT0_VALUE
-   * @generated
-   * @ordered
-   */
-  VAT0(0, "vat0", "vat0"),
-
-  /**
-   * The '<em><b>Vat7</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #VAT7_VALUE
-   * @generated
-   * @ordered
-   */
-  VAT7(7, "vat7", "vat7"),
-
-  /**
-   * The '<em><b>Vat15</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #VAT15_VALUE
-   * @generated
-   * @ordered
-   */
-  VAT15(15, "vat15", "vat15");
-
-  /**
-   * The '<em><b>Vat0</b></em>' literal value. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>Vat0</b></em>' literal object isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @see #VAT0
-   * @model name="vat0"
-   * @generated
-   * @ordered
-   */
-  public static final int VAT0_VALUE = 0;
-
-  /**
-   * The '<em><b>Vat7</b></em>' literal value. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>Vat7</b></em>' literal object isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @see #VAT7
-   * @model name="vat7"
-   * @generated
-   * @ordered
-   */
-  public static final int VAT7_VALUE = 7;
-
-  /**
-   * The '<em><b>Vat15</b></em>' literal value. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>Vat15</b></em>' literal object isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @see #VAT15
-   * @model name="vat15"
-   * @generated
-   * @ordered
-   */
-  public static final int VAT15_VALUE = 15;
-
-  /**
-   * An array of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private static final VAT[] VALUES_ARRAY = new VAT[] { VAT0, VAT7, VAT15, };
-
-  /**
-   * A public read-only list of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final List<VAT> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>VAT</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  public static VAT get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      VAT result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>VAT</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   */
-  public static VAT getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      VAT result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>VAT</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  public static VAT get(int value)
-  {
-    switch (value)
-    {
-    case VAT0_VALUE:
-      return VAT0;
-    case VAT7_VALUE:
-      return VAT7;
-    case VAT15_VALUE:
-      return VAT15;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private VAT(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-
-} // VAT
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
deleted file mode 100644
index 319b3cacb1..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
+++ /dev/null
@@ -1,790 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1.impl;
-
-import org.eclipse.emf.cdo.tests.model1.Address;
-import org.eclipse.emf.cdo.tests.model1.Category;
-import org.eclipse.emf.cdo.tests.model1.Company;
-import org.eclipse.emf.cdo.tests.model1.Customer;
-import org.eclipse.emf.cdo.tests.model1.Model1Factory;
-import org.eclipse.emf.cdo.tests.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.model1.Order;
-import org.eclipse.emf.cdo.tests.model1.OrderAddress;
-import org.eclipse.emf.cdo.tests.model1.OrderDetail;
-import org.eclipse.emf.cdo.tests.model1.Product;
-import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
-import org.eclipse.emf.cdo.tests.model1.SalesOrder;
-import org.eclipse.emf.cdo.tests.model1.Supplier;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-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 Model1PackageImpl extends EPackageImpl implements Model1Package
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass addressEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass supplierEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass purchaseOrderEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass orderDetailEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass productEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass orderAddressEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EEnum vatEEnum = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass categoryEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass companyEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass customerEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass orderEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass salesOrderEClass = 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.emf.cdo.tests.model1.Model1Package#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private Model1PackageImpl()
-  {
-    super(eNS_URI, Model1Factory.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.
-   * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
-   * method drives initialization for interdependent packages directly, in parallel with this package, itself.
-   * <p>
-   * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
-   * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
-   * packages are created before any are initialized, since one package's meta-model objects may refer to those of
-   * another.
-   * <p>
-   * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static Model1Package init()
-  {
-    if (isInited) return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI);
-
-    // Obtain or create and register package
-    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(eNS_URI)
-        : new Model1PackageImpl());
-
-    isInited = true;
-
-    // Create package meta-data objects
-    theModel1Package.createPackageContents();
-
-    // Initialize created meta-data
-    theModel1Package.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theModel1Package.freeze();
-
-    return theModel1Package;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getAddress()
-  {
-    return addressEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getAddress_Name()
-  {
-    return (EAttribute)addressEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getAddress_Street()
-  {
-    return (EAttribute)addressEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getAddress_City()
-  {
-    return (EAttribute)addressEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getSupplier()
-  {
-    return supplierEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getSupplier_PurchaseOrders()
-  {
-    return (EReference)supplierEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getSupplier_Preferred()
-  {
-    return (EAttribute)supplierEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getPurchaseOrder()
-  {
-    return purchaseOrderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getPurchaseOrder_Date()
-  {
-    return (EAttribute)purchaseOrderEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getPurchaseOrder_Supplier()
-  {
-    return (EReference)purchaseOrderEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getOrderDetail()
-  {
-    return orderDetailEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getOrderDetail_Order()
-  {
-    return (EReference)orderDetailEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getOrderDetail_Product()
-  {
-    return (EReference)orderDetailEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getOrderDetail_Price()
-  {
-    return (EAttribute)orderDetailEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getProduct()
-  {
-    return productEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getProduct_Name()
-  {
-    return (EAttribute)productEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getProduct_OrderDetails()
-  {
-    return (EReference)productEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getProduct_Vat()
-  {
-    return (EAttribute)productEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getOrderAddress()
-  {
-    return orderAddressEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getOrderAddress_TestAttribute()
-  {
-    return (EAttribute)orderAddressEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EEnum getVAT()
-  {
-    return vatEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getCategory()
-  {
-    return categoryEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getCategory_Name()
-  {
-    return (EAttribute)categoryEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCategory_Categories()
-  {
-    return (EReference)categoryEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCategory_Products()
-  {
-    return (EReference)categoryEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getCompany()
-  {
-    return companyEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_Categories()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_Suppliers()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_PurchaseOrders()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_Customers()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_SalesOrders()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getCustomer()
-  {
-    return customerEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCustomer_SalesOrders()
-  {
-    return (EReference)customerEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getOrder()
-  {
-    return orderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getOrder_OrderDetails()
-  {
-    return (EReference)orderEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getSalesOrder()
-  {
-    return salesOrderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getSalesOrder_Id()
-  {
-    return (EAttribute)salesOrderEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getSalesOrder_Customer()
-  {
-    return (EReference)salesOrderEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model1Factory getModel1Factory()
-  {
-    return (Model1Factory)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
-    addressEClass = createEClass(ADDRESS);
-    createEAttribute(addressEClass, ADDRESS__NAME);
-    createEAttribute(addressEClass, ADDRESS__STREET);
-    createEAttribute(addressEClass, ADDRESS__CITY);
-
-    companyEClass = createEClass(COMPANY);
-    createEReference(companyEClass, COMPANY__CATEGORIES);
-    createEReference(companyEClass, COMPANY__SUPPLIERS);
-    createEReference(companyEClass, COMPANY__CUSTOMERS);
-    createEReference(companyEClass, COMPANY__PURCHASE_ORDERS);
-    createEReference(companyEClass, COMPANY__SALES_ORDERS);
-
-    supplierEClass = createEClass(SUPPLIER);
-    createEReference(supplierEClass, SUPPLIER__PURCHASE_ORDERS);
-    createEAttribute(supplierEClass, SUPPLIER__PREFERRED);
-
-    customerEClass = createEClass(CUSTOMER);
-    createEReference(customerEClass, CUSTOMER__SALES_ORDERS);
-
-    orderEClass = createEClass(ORDER);
-    createEReference(orderEClass, ORDER__ORDER_DETAILS);
-
-    orderDetailEClass = createEClass(ORDER_DETAIL);
-    createEReference(orderDetailEClass, ORDER_DETAIL__ORDER);
-    createEReference(orderDetailEClass, ORDER_DETAIL__PRODUCT);
-    createEAttribute(orderDetailEClass, ORDER_DETAIL__PRICE);
-
-    purchaseOrderEClass = createEClass(PURCHASE_ORDER);
-    createEAttribute(purchaseOrderEClass, PURCHASE_ORDER__DATE);
-    createEReference(purchaseOrderEClass, PURCHASE_ORDER__SUPPLIER);
-
-    salesOrderEClass = createEClass(SALES_ORDER);
-    createEAttribute(salesOrderEClass, SALES_ORDER__ID);
-    createEReference(salesOrderEClass, SALES_ORDER__CUSTOMER);
-
-    categoryEClass = createEClass(CATEGORY);
-    createEAttribute(categoryEClass, CATEGORY__NAME);
-    createEReference(categoryEClass, CATEGORY__CATEGORIES);
-    createEReference(categoryEClass, CATEGORY__PRODUCTS);
-
-    productEClass = createEClass(PRODUCT);
-    createEAttribute(productEClass, PRODUCT__NAME);
-    createEReference(productEClass, PRODUCT__ORDER_DETAILS);
-    createEAttribute(productEClass, PRODUCT__VAT);
-
-    orderAddressEClass = createEClass(ORDER_ADDRESS);
-    createEAttribute(orderAddressEClass, ORDER_ADDRESS__TEST_ATTRIBUTE);
-
-    // Create enums
-    vatEEnum = createEEnum(VAT);
-  }
-
-  /**
-   * <!-- 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);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-    companyEClass.getESuperTypes().add(this.getAddress());
-    supplierEClass.getESuperTypes().add(this.getAddress());
-    customerEClass.getESuperTypes().add(this.getAddress());
-    purchaseOrderEClass.getESuperTypes().add(this.getOrder());
-    salesOrderEClass.getESuperTypes().add(this.getOrder());
-    orderAddressEClass.getESuperTypes().add(this.getAddress());
-    orderAddressEClass.getESuperTypes().add(this.getOrder());
-    orderAddressEClass.getESuperTypes().add(this.getOrderDetail());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAddress_Name(), ecorePackage.getEString(), "name", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddress_Street(), ecorePackage.getEString(), "street", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddress_City(), ecorePackage.getEString(), "city", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1,
-        Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(),
-        "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null,
-        0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null,
-        0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Product(), this.getProduct(), this.getProduct_OrderDetails(), "product", null, 0, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier",
-        null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1,
-        1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Products(), this.getProduct(), null, "products", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-
-    initEClass(productEClass, Product.class, "Product", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProduct_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails",
-        null, 0, -1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderAddressEClass, OrderAddress.class, "OrderAddress", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getOrderAddress_TestAttribute(), ecorePackage.getEBoolean(), "testAttribute", null, 0, 1,
-        OrderAddress.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    // Initialize enums and add enum literals
-    initEEnum(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.class, "VAT");
-    addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.VAT0);
-    addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.VAT7);
-    addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.VAT15);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} // Model1PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java
deleted file mode 100644
index ab8e6f179d..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OrderAddressImpl.java,v 1.1 2008-04-12 10:05:44 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model1.impl;
-
-import org.eclipse.emf.cdo.tests.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.model1.Order;
-import org.eclipse.emf.cdo.tests.model1.OrderAddress;
-import org.eclipse.emf.cdo.tests.model1.OrderDetail;
-import org.eclipse.emf.cdo.tests.model1.Product;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order Address</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrder <em>Order</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getProduct <em>Product</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getPrice <em>Price</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class OrderAddressImpl extends AddressImpl implements OrderAddress
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected OrderAddressImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.ORDER_ADDRESS;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  public EList<OrderDetail> getOrderDetails()
-  {
-    return (EList<OrderDetail>)eGet(Model1Package.Literals.ORDER__ORDER_DETAILS, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Order getOrder()
-  {
-    return (Order)eGet(Model1Package.Literals.ORDER_DETAIL__ORDER, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setOrder(Order newOrder)
-  {
-    eSet(Model1Package.Literals.ORDER_DETAIL__ORDER, newOrder);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Product getProduct()
-  {
-    return (Product)eGet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setProduct(Product newProduct)
-  {
-    eSet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, newProduct);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public float getPrice()
-  {
-    return ((Float)eGet(Model1Package.Literals.ORDER_DETAIL__PRICE, true)).floatValue();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setPrice(float newPrice)
-  {
-    eSet(Model1Package.Literals.ORDER_DETAIL__PRICE, new Float(newPrice));
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public boolean isTestAttribute()
-  {
-    return ((Boolean)eGet(Model1Package.Literals.ORDER_ADDRESS__TEST_ATTRIBUTE, true)).booleanValue();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setTestAttribute(boolean newTestAttribute)
-  {
-    eSet(Model1Package.Literals.ORDER_ADDRESS__TEST_ATTRIBUTE, new Boolean(newTestAttribute));
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-  {
-    if (baseClass == Order.class)
-    {
-      switch (derivedFeatureID)
-      {
-      case Model1Package.ORDER_ADDRESS__ORDER_DETAILS:
-        return Model1Package.ORDER__ORDER_DETAILS;
-      default:
-        return -1;
-      }
-    }
-    if (baseClass == OrderDetail.class)
-    {
-      switch (derivedFeatureID)
-      {
-      case Model1Package.ORDER_ADDRESS__ORDER:
-        return Model1Package.ORDER_DETAIL__ORDER;
-      case Model1Package.ORDER_ADDRESS__PRODUCT:
-        return Model1Package.ORDER_DETAIL__PRODUCT;
-      case Model1Package.ORDER_ADDRESS__PRICE:
-        return Model1Package.ORDER_DETAIL__PRICE;
-      default:
-        return -1;
-      }
-    }
-    return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-  {
-    if (baseClass == Order.class)
-    {
-      switch (baseFeatureID)
-      {
-      case Model1Package.ORDER__ORDER_DETAILS:
-        return Model1Package.ORDER_ADDRESS__ORDER_DETAILS;
-      default:
-        return -1;
-      }
-    }
-    if (baseClass == OrderDetail.class)
-    {
-      switch (baseFeatureID)
-      {
-      case Model1Package.ORDER_DETAIL__ORDER:
-        return Model1Package.ORDER_ADDRESS__ORDER;
-      case Model1Package.ORDER_DETAIL__PRODUCT:
-        return Model1Package.ORDER_ADDRESS__PRODUCT;
-      case Model1Package.ORDER_DETAIL__PRICE:
-        return Model1Package.ORDER_ADDRESS__PRICE;
-      default:
-        return -1;
-      }
-    }
-    return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-  }
-
-} // OrderAddressImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
deleted file mode 100644
index 3605a703f9..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1.impl;
-
-import org.eclipse.emf.cdo.tests.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.model1.Order;
-import org.eclipse.emf.cdo.tests.model1.OrderDetail;
-import org.eclipse.emf.cdo.tests.model1.Product;
-
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected OrderDetailImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.ORDER_DETAIL;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected int eStaticFeatureCount()
-  {
-    return 0;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Order getOrder()
-  {
-    return (Order)eGet(Model1Package.Literals.ORDER_DETAIL__ORDER, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setOrder(Order newOrder)
-  {
-    eSet(Model1Package.Literals.ORDER_DETAIL__ORDER, newOrder);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Product getProduct()
-  {
-    return (Product)eGet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setProduct(Product newProduct)
-  {
-    eSet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, newProduct);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public float getPrice()
-  {
-    return ((Float)eGet(Model1Package.Literals.ORDER_DETAIL__PRICE, true)).floatValue();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setPrice(float newPrice)
-  {
-    eSet(Model1Package.Literals.ORDER_DETAIL__PRICE, new Float(newPrice));
-  }
-
-} // OrderDetailImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
deleted file mode 100644
index e21a8bbcc2..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1.impl;
-
-import org.eclipse.emf.cdo.tests.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
-import org.eclipse.emf.cdo.tests.model1.Supplier;
-
-import org.eclipse.emf.ecore.EClass;
-
-import java.util.Date;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Purchase Order</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getDate <em>Date</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getSupplier <em>Supplier</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected PurchaseOrderImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.PURCHASE_ORDER;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Date getDate()
-  {
-    return (Date)eGet(Model1Package.Literals.PURCHASE_ORDER__DATE, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setDate(Date newDate)
-  {
-    eSet(Model1Package.Literals.PURCHASE_ORDER__DATE, newDate);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Supplier getSupplier()
-  {
-    return (Supplier)eGet(Model1Package.Literals.PURCHASE_ORDER__SUPPLIER, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setSupplier(Supplier newSupplier)
-  {
-    eSet(Model1Package.Literals.PURCHASE_ORDER__SUPPLIER, newSupplier);
-  }
-
-} // PurchaseOrderImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
deleted file mode 100644
index f5ca64938f..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1.impl;
-
-import org.eclipse.emf.cdo.tests.model1.Customer;
-import org.eclipse.emf.cdo.tests.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.model1.SalesOrder;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc
- * -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class SalesOrderImpl extends OrderImpl implements SalesOrder
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected SalesOrderImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.SALES_ORDER;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public int getId()
-  {
-    return ((Integer)eGet(Model1Package.Literals.SALES_ORDER__ID, true)).intValue();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setId(int newId)
-  {
-    eSet(Model1Package.Literals.SALES_ORDER__ID, new Integer(newId));
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Customer getCustomer()
-  {
-    return (Customer)eGet(Model1Package.Literals.SALES_ORDER__CUSTOMER, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setCustomer(Customer newCustomer)
-  {
-    eSet(Model1Package.Literals.SALES_ORDER__CUSTOMER, newCustomer);
-  }
-
-} // SalesOrderImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
deleted file mode 100644
index 3fa2016653..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1.util;
-
-import org.eclipse.emf.cdo.tests.model1.Address;
-import org.eclipse.emf.cdo.tests.model1.Category;
-import org.eclipse.emf.cdo.tests.model1.Company;
-import org.eclipse.emf.cdo.tests.model1.Customer;
-import org.eclipse.emf.cdo.tests.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.model1.Order;
-import org.eclipse.emf.cdo.tests.model1.OrderAddress;
-import org.eclipse.emf.cdo.tests.model1.OrderDetail;
-import org.eclipse.emf.cdo.tests.model1.Product;
-import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
-import org.eclipse.emf.cdo.tests.model1.SalesOrder;
-import org.eclipse.emf.cdo.tests.model1.Supplier;
-
-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.emf.cdo.tests.model1.Model1Package
- * @generated
- */
-public class Model1AdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static Model1Package modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model1AdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Model1Package.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 Model1Switch<Adapter> modelSwitch = new Model1Switch<Adapter>()
-  {
-    @Override
-    public Adapter caseAddress(Address object)
-    {
-      return createAddressAdapter();
-    }
-
-    @Override
-    public Adapter caseCompany(Company object)
-    {
-      return createCompanyAdapter();
-    }
-
-    @Override
-    public Adapter caseSupplier(Supplier object)
-    {
-      return createSupplierAdapter();
-    }
-
-    @Override
-    public Adapter caseCustomer(Customer object)
-    {
-      return createCustomerAdapter();
-    }
-
-    @Override
-    public Adapter caseOrder(Order object)
-    {
-      return createOrderAdapter();
-    }
-
-    @Override
-    public Adapter caseOrderDetail(OrderDetail object)
-    {
-      return createOrderDetailAdapter();
-    }
-
-    @Override
-    public Adapter casePurchaseOrder(PurchaseOrder object)
-    {
-      return createPurchaseOrderAdapter();
-    }
-
-    @Override
-    public Adapter caseSalesOrder(SalesOrder object)
-    {
-      return createSalesOrderAdapter();
-    }
-
-    @Override
-    public Adapter caseCategory(Category object)
-    {
-      return createCategoryAdapter();
-    }
-
-    @Override
-    public Adapter caseProduct(Product object)
-    {
-      return createProductAdapter();
-    }
-
-    @Override
-    public Adapter caseOrderAddress(OrderAddress object)
-    {
-      return createOrderAddressAdapter();
-    }
-
-    @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.emf.cdo.tests.model1.Address <em>Address</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.emf.cdo.tests.model1.Address
-   * @generated
-   */
-  public Adapter createAddressAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</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.emf.cdo.tests.model1.Supplier
-   * @generated
-   */
-  public Adapter createSupplierAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder <em>Purchase Order</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.emf.cdo.tests.model1.PurchaseOrder
-   * @generated
-   */
-  public Adapter createPurchaseOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail <em>Order Detail</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.emf.cdo.tests.model1.OrderDetail
-   * @generated
-   */
-  public Adapter createOrderDetailAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Product <em>Product</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.emf.cdo.tests.model1.Product
-   * @generated
-   */
-  public Adapter createProductAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress <em>Order Address</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.emf.cdo.tests.model1.OrderAddress
-   * @generated
-   */
-  public Adapter createOrderAddressAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</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.emf.cdo.tests.model1.Category
-   * @generated
-   */
-  public Adapter createCategoryAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</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.emf.cdo.tests.model1.Company
-   * @generated
-   */
-  public Adapter createCompanyAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</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.emf.cdo.tests.model1.Customer
-   * @generated
-   */
-  public Adapter createCustomerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</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.emf.cdo.tests.model1.Order
-   * @generated
-   */
-  public Adapter createOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder <em>Sales Order</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.emf.cdo.tests.model1.SalesOrder
-   * @generated
-   */
-  public Adapter createSalesOrderAdapter()
-  {
-    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;
-  }
-
-} // Model1AdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
deleted file mode 100644
index 920c3022d5..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1.util;
-
-import org.eclipse.emf.cdo.tests.model1.Address;
-import org.eclipse.emf.cdo.tests.model1.Category;
-import org.eclipse.emf.cdo.tests.model1.Company;
-import org.eclipse.emf.cdo.tests.model1.Customer;
-import org.eclipse.emf.cdo.tests.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.model1.Order;
-import org.eclipse.emf.cdo.tests.model1.OrderAddress;
-import org.eclipse.emf.cdo.tests.model1.OrderDetail;
-import org.eclipse.emf.cdo.tests.model1.Product;
-import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
-import org.eclipse.emf.cdo.tests.model1.SalesOrder;
-import org.eclipse.emf.cdo.tests.model1.Supplier;
-
-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.emf.cdo.tests.model1.Model1Package
- * @generated
- */
-public class Model1Switch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static Model1Package modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model1Switch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Model1Package.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 Model1Package.ADDRESS:
-    {
-      Address address = (Address)theEObject;
-      T result = caseAddress(address);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.COMPANY:
-    {
-      Company company = (Company)theEObject;
-      T result = caseCompany(company);
-      if (result == null) result = caseAddress(company);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.SUPPLIER:
-    {
-      Supplier supplier = (Supplier)theEObject;
-      T result = caseSupplier(supplier);
-      if (result == null) result = caseAddress(supplier);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.CUSTOMER:
-    {
-      Customer customer = (Customer)theEObject;
-      T result = caseCustomer(customer);
-      if (result == null) result = caseAddress(customer);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.ORDER:
-    {
-      Order order = (Order)theEObject;
-      T result = caseOrder(order);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.ORDER_DETAIL:
-    {
-      OrderDetail orderDetail = (OrderDetail)theEObject;
-      T result = caseOrderDetail(orderDetail);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.PURCHASE_ORDER:
-    {
-      PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject;
-      T result = casePurchaseOrder(purchaseOrder);
-      if (result == null) result = caseOrder(purchaseOrder);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.SALES_ORDER:
-    {
-      SalesOrder salesOrder = (SalesOrder)theEObject;
-      T result = caseSalesOrder(salesOrder);
-      if (result == null) result = caseOrder(salesOrder);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.CATEGORY:
-    {
-      Category category = (Category)theEObject;
-      T result = caseCategory(category);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.PRODUCT:
-    {
-      Product product = (Product)theEObject;
-      T result = caseProduct(product);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    case Model1Package.ORDER_ADDRESS:
-    {
-      OrderAddress orderAddress = (OrderAddress)theEObject;
-      T result = caseOrderAddress(orderAddress);
-      if (result == null) result = caseAddress(orderAddress);
-      if (result == null) result = caseOrder(orderAddress);
-      if (result == null) result = caseOrderDetail(orderAddress);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Address</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>Address</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseAddress(Address object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Supplier</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>Supplier</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseSupplier(Supplier object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Purchase Order</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>Purchase Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePurchaseOrder(PurchaseOrder object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Order Detail</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>Order Detail</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseOrderDetail(OrderDetail object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Product</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>Product</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseProduct(Product object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Order Address</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>Order Address</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseOrderAddress(OrderAddress object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Category</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>Category</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseCategory(Category object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Company</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>Company</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseCompany(Company object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Customer</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>Customer</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseCustomer(Customer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Order</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>Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseOrder(Order object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Sales Order</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>Sales Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseSalesOrder(SalesOrder 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;
-  }
-
-} // Model1Switch
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java
deleted file mode 100644
index 9f64e45ef5..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.emf.cdo.tests.model1.validation;
-
-import org.eclipse.emf.cdo.tests.model1.OrderDetail;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Order}. This doesn't really do anything,
- * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
- * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
- * -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface OrderValidator
-{
-  boolean validate();
-
-  boolean validateOrderDetails(EList<OrderDetail> value);
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
deleted file mode 100644
index 589d82ce83..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model2; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.tests.model2,
- org.eclipse.emf.cdo.tests.model2.impl,
- org.eclipse.emf.cdo.tests.model2.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.cdo;visibility:=reexport,
- org.eclipse.emf.cdo.tests.model1;visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/plugin.properties b/plugins/org.eclipse.emf.cdo.tests.model2/plugin.properties
deleted file mode 100644
index 4b221ad6c0..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id: plugin.properties,v 1.1 2008-04-07 07:36:36 estepper Exp $
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = CDO Tests Model2 (Incubation)
-providerName = Eclipse.org
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java
deleted file mode 100644
index 011ab5e987..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model2Package.java,v 1.3 2008-04-20 08:22:20 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model2;
-
-import org.eclipse.emf.cdo.tests.model1.Model1Package;
-
-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.emf.cdo.tests.model2.Model2Factory
- * @model kind="package"
- * @generated
- */
-public interface Model2Package extends EPackage
-{
-  /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNAME = "model2";
-
-  /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model2/1.0.0";
-
-  /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_PREFIX = "model2";
-
-  /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  Model2Package eINSTANCE = org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl <em>Special Purchase Order</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl
-   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getSpecialPurchaseOrder()
-   * @generated
-   */
-  int SPECIAL_PURCHASE_ORDER = 0;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SPECIAL_PURCHASE_ORDER__ORDER_DETAILS = Model1Package.PURCHASE_ORDER__ORDER_DETAILS;
-
-  /**
-   * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SPECIAL_PURCHASE_ORDER__DATE = Model1Package.PURCHASE_ORDER__DATE;
-
-  /**
-   * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SPECIAL_PURCHASE_ORDER__SUPPLIER = Model1Package.PURCHASE_ORDER__SUPPLIER;
-
-  /**
-   * The feature id for the '<em><b>Discount Code</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE = Model1Package.PURCHASE_ORDER_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Shipping Address</b></em>' containment reference. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS = Model1Package.PURCHASE_ORDER_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Special Purchase Order</em>' class. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SPECIAL_PURCHASE_ORDER_FEATURE_COUNT = Model1Package.PURCHASE_ORDER_FEATURE_COUNT + 2;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder <em>Special Purchase Order</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Special Purchase Order</em>'.
-   * @see org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder
-   * @generated
-   */
-  EClass getSpecialPurchaseOrder();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getDiscountCode <em>Discount Code</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Discount Code</em>'.
-   * @see org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getDiscountCode()
-   * @see #getSpecialPurchaseOrder()
-   * @generated
-   */
-  EAttribute getSpecialPurchaseOrder_DiscountCode();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getShippingAddress <em>Shipping Address</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference '<em>Shipping Address</em>'.
-   * @see org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getShippingAddress()
-   * @see #getSpecialPurchaseOrder()
-   * @generated
-   */
-  EReference getSpecialPurchaseOrder_ShippingAddress();
-
-  /**
-   * 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
-   */
-  Model2Factory getModel2Factory();
-
-  /**
-   * <!-- 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.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl <em>Special Purchase Order</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl
-     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getSpecialPurchaseOrder()
-     * @generated
-     */
-    EClass SPECIAL_PURCHASE_ORDER = eINSTANCE.getSpecialPurchaseOrder();
-
-    /**
-     * The meta object literal for the '<em><b>Discount Code</b></em>' attribute feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE = eINSTANCE.getSpecialPurchaseOrder_DiscountCode();
-
-    /**
-     * The meta object literal for the '<em><b>Shipping Address</b></em>' containment reference feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS = eINSTANCE.getSpecialPurchaseOrder_ShippingAddress();
-
-  }
-
-} // Model2Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java
deleted file mode 100644
index e3914d03ea..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SpecialPurchaseOrder.java,v 1.3 2008-04-20 08:22:20 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model2;
-
-import org.eclipse.emf.cdo.tests.model1.Address;
-import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Special Purchase Order</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getDiscountCode <em>Discount Code</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getShippingAddress <em>Shipping Address</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getSpecialPurchaseOrder()
- * @model
- * @generated
- */
-public interface SpecialPurchaseOrder extends PurchaseOrder
-{
-  /**
-   * Returns the value of the '<em><b>Discount Code</b></em>' attribute. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Discount Code</em>' attribute isn't clear, there really should be more of a
-   * description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Discount Code</em>' attribute.
-   * @see #setDiscountCode(String)
-   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getSpecialPurchaseOrder_DiscountCode()
-   * @model
-   * @generated
-   */
-  String getDiscountCode();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getDiscountCode <em>Discount Code</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Discount Code</em>' attribute.
-   * @see #getDiscountCode()
-   * @generated
-   */
-  void setDiscountCode(String value);
-
-  /**
-   * Returns the value of the '<em><b>Shipping Address</b></em>' containment reference. <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Shipping Address</em>' containment reference isn't clear, there really should be
-   * more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * 
-   * @return the value of the '<em>Shipping Address</em>' containment reference.
-   * @see #setShippingAddress(Address)
-   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getSpecialPurchaseOrder_ShippingAddress()
-   * @model containment="true"
-   * @generated
-   */
-  Address getShippingAddress();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getShippingAddress <em>Shipping Address</em>}'
-   * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Shipping Address</em>' containment reference.
-   * @see #getShippingAddress()
-   * @generated
-   */
-  void setShippingAddress(Address value);
-
-} // SpecialPurchaseOrder
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
deleted file mode 100644
index ed8daac972..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model2PackageImpl.java,v 1.3 2008-04-20 08:22:20 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model2.impl;
-
-import org.eclipse.emf.cdo.tests.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.model2.Model2Factory;
-import org.eclipse.emf.cdo.tests.model2.Model2Package;
-import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
-
-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 Model2PackageImpl extends EPackageImpl implements Model2Package
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass specialPurchaseOrderEClass = 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.emf.cdo.tests.model2.Model2Package#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private Model2PackageImpl()
-  {
-    super(eNS_URI, Model2Factory.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.
-   * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
-   * method drives initialization for interdependent packages directly, in parallel with this package, itself.
-   * <p>
-   * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
-   * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
-   * packages are created before any are initialized, since one package's meta-model objects may refer to those of
-   * another.
-   * <p>
-   * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static Model2Package init()
-  {
-    if (isInited) return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI);
-
-    // Obtain or create and register package
-    Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(eNS_URI)
-        : new Model2PackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    Model1Package.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theModel2Package.createPackageContents();
-
-    // Initialize created meta-data
-    theModel2Package.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theModel2Package.freeze();
-
-    return theModel2Package;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getSpecialPurchaseOrder()
-  {
-    return specialPurchaseOrderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getSpecialPurchaseOrder_DiscountCode()
-  {
-    return (EAttribute)specialPurchaseOrderEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getSpecialPurchaseOrder_ShippingAddress()
-  {
-    return (EReference)specialPurchaseOrderEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model2Factory getModel2Factory()
-  {
-    return (Model2Factory)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
-    specialPurchaseOrderEClass = createEClass(SPECIAL_PURCHASE_ORDER);
-    createEAttribute(specialPurchaseOrderEClass, SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE);
-    createEReference(specialPurchaseOrderEClass, SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS);
-  }
-
-  /**
-   * <!-- 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
-    Model1Package theModel1Package = (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-    specialPurchaseOrderEClass.getESuperTypes().add(theModel1Package.getPurchaseOrder());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(specialPurchaseOrderEClass, SpecialPurchaseOrder.class, "SpecialPurchaseOrder", !IS_ABSTRACT,
-        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSpecialPurchaseOrder_DiscountCode(), ecorePackage.getEString(), "discountCode", null, 0, 1,
-        SpecialPurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSpecialPurchaseOrder_ShippingAddress(), theModel1Package.getAddress(), null, "shippingAddress",
-        null, 0, 1, SpecialPurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} // Model2PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java
deleted file mode 100644
index 3c72133cd3..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SpecialPurchaseOrderImpl.java,v 1.3 2008-04-20 08:22:20 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model2.impl;
-
-import org.eclipse.emf.cdo.tests.model1.Address;
-import org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl;
-import org.eclipse.emf.cdo.tests.model2.Model2Package;
-import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Special Purchase Order</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl#getDiscountCode <em>Discount Code</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl#getShippingAddress <em>Shipping Address</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements SpecialPurchaseOrder
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected SpecialPurchaseOrderImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model2Package.Literals.SPECIAL_PURCHASE_ORDER;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getDiscountCode()
-  {
-    return (String)eGet(Model2Package.Literals.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setDiscountCode(String newDiscountCode)
-  {
-    eSet(Model2Package.Literals.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE, newDiscountCode);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Address getShippingAddress()
-  {
-    return (Address)eGet(Model2Package.Literals.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, true);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setShippingAddress(Address newShippingAddress)
-  {
-    eSet(Model2Package.Literals.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, newShippingAddress);
-  }
-
-} // SpecialPurchaseOrderImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java
deleted file mode 100644
index fd4931fbbc..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model2AdapterFactory.java,v 1.2 2008-04-07 08:28:21 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model2.util;
-
-import org.eclipse.emf.cdo.tests.model1.Order;
-import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
-import org.eclipse.emf.cdo.tests.model2.Model2Package;
-import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
-
-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.emf.cdo.tests.model2.Model2Package
- * @generated
- */
-public class Model2AdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static Model2Package modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model2AdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Model2Package.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 Model2Switch<Adapter> modelSwitch = new Model2Switch<Adapter>()
-  {
-    @Override
-    public Adapter caseSpecialPurchaseOrder(SpecialPurchaseOrder object)
-    {
-      return createSpecialPurchaseOrderAdapter();
-    }
-
-    @Override
-    public Adapter caseOrder(Order object)
-    {
-      return createOrderAdapter();
-    }
-
-    @Override
-    public Adapter casePurchaseOrder(PurchaseOrder object)
-    {
-      return createPurchaseOrderAdapter();
-    }
-
-    @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.emf.cdo.tests.model2.SpecialPurchaseOrder <em>Special Purchase Order</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.emf.cdo.tests.model2.SpecialPurchaseOrder
-   * @generated
-   */
-  public Adapter createSpecialPurchaseOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</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.emf.cdo.tests.model1.Order
-   * @generated
-   */
-  public Adapter createOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder <em>Purchase Order</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.emf.cdo.tests.model1.PurchaseOrder
-   * @generated
-   */
-  public Adapter createPurchaseOrderAdapter()
-  {
-    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;
-  }
-
-} // Model2AdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
deleted file mode 100644
index 2ca8024df8..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model2Switch.java,v 1.2 2008-04-07 08:28:21 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model2.util;
-
-import org.eclipse.emf.cdo.tests.model1.Order;
-import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
-import org.eclipse.emf.cdo.tests.model2.Model2Package;
-import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
-
-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.emf.cdo.tests.model2.Model2Package
- * @generated
- */
-public class Model2Switch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static Model2Package modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model2Switch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Model2Package.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 Model2Package.SPECIAL_PURCHASE_ORDER:
-    {
-      SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject;
-      T result = caseSpecialPurchaseOrder(specialPurchaseOrder);
-      if (result == null) result = casePurchaseOrder(specialPurchaseOrder);
-      if (result == null) result = caseOrder(specialPurchaseOrder);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Special Purchase Order</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>Special Purchase Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseSpecialPurchaseOrder(SpecialPurchaseOrder object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Order</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>Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseOrder(Order object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Purchase Order</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>Purchase Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePurchaseOrder(PurchaseOrder 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;
-  }
-
-} // Model2Switch
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
deleted file mode 100644
index 087ccc5fd4..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model3; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.tests.model3,
- org.eclipse.emf.cdo.tests.model3.impl,
- org.eclipse.emf.cdo.tests.model3.subpackage,
- org.eclipse.emf.cdo.tests.model3.subpackage.impl,
- org.eclipse.emf.cdo.tests.model3.subpackage.util,
- org.eclipse.emf.cdo.tests.model3.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.cdo;visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/plugin.properties b/plugins/org.eclipse.emf.cdo.tests.model3/plugin.properties
deleted file mode 100644
index fc8ab36603..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO Tests Model3 (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java
deleted file mode 100644
index 7c0557dbd1..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Class1.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model3;
-
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Class1</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClass1()
- * @model
- * @extends CDOObject
- * @generated
- */
-public interface Class1 extends CDOObject
-{
-  /**
-   * Returns the value of the '<em><b>Class2</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 <em>Class1</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Class2</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>Class2</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClass1_Class2()
-   * @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1
-   * @model opposite="class1"
-   * @generated
-   */
-  EList<Class2> getClass2();
-
-} // Class1
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
deleted file mode 100644
index ccb46bfbd7..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model3Package.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model3;
-
-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.emf.cdo.tests.model3.Model3Factory
- * @model kind="package"
- * @generated
- */
-public interface Model3Package extends EPackage
-{
-  /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNAME = "model3";
-
-  /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model3/1.0.0";
-
-  /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_PREFIX = "model3";
-
-  /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  Model3Package eINSTANCE = org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.Class1Impl <em>Class1</em>}' class. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model3.impl.Class1Impl
-   * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getClass1()
-   * @generated
-   */
-  int CLASS1 = 0;
-
-  /**
-   * The feature id for the '<em><b>Class2</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CLASS1__CLASS2 = 0;
-
-  /**
-   * The number of structural features of the '<em>Class1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CLASS1_FEATURE_COUNT = 1;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.Class1 <em>Class1</em>}'. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Class1</em>'.
-   * @see org.eclipse.emf.cdo.tests.model3.Class1
-   * @generated
-   */
-  EClass getClass1();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference list '<em>Class2</em>'.
-   * @see org.eclipse.emf.cdo.tests.model3.Class1#getClass2()
-   * @see #getClass1()
-   * @generated
-   */
-  EReference getClass1_Class2();
-
-  /**
-   * 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
-   */
-  Model3Factory getModel3Factory();
-
-  /**
-   * <!-- 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.emf.cdo.tests.model3.impl.Class1Impl <em>Class1</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model3.impl.Class1Impl
-     * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getClass1()
-     * @generated
-     */
-    EClass CLASS1 = eINSTANCE.getClass1();
-
-    /**
-     * The meta object literal for the '<em><b>Class2</b></em>' reference list feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference CLASS1__CLASS2 = eINSTANCE.getClass1_Class2();
-
-  }
-
-} // Model3Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
deleted file mode 100644
index 7c52dbe768..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model3PackageImpl.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model3.impl;
-
-import org.eclipse.emf.cdo.tests.model3.Class1;
-import org.eclipse.emf.cdo.tests.model3.Model3Factory;
-import org.eclipse.emf.cdo.tests.model3.Model3Package;
-import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage;
-import org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl;
-
-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 Model3PackageImpl extends EPackageImpl implements Model3Package
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass class1EClass = 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.emf.cdo.tests.model3.Model3Package#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private Model3PackageImpl()
-  {
-    super(eNS_URI, Model3Factory.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.
-   * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
-   * method drives initialization for interdependent packages directly, in parallel with this package, itself.
-   * <p>
-   * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
-   * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
-   * packages are created before any are initialized, since one package's meta-model objects may refer to those of
-   * another.
-   * <p>
-   * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static Model3Package init()
-  {
-    if (isInited) return (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI);
-
-    // Obtain or create and register package
-    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(eNS_URI)
-        : new Model3PackageImpl());
-
-    isInited = true;
-
-    // Obtain or create and register interdependencies
-    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI) : SubpackagePackage.eINSTANCE);
-
-    // Create package meta-data objects
-    theModel3Package.createPackageContents();
-    theSubpackagePackage.createPackageContents();
-
-    // Initialize created meta-data
-    theModel3Package.initializePackageContents();
-    theSubpackagePackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theModel3Package.freeze();
-
-    return theModel3Package;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getClass1()
-  {
-    return class1EClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getClass1_Class2()
-  {
-    return (EReference)class1EClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model3Factory getModel3Factory()
-  {
-    return (Model3Factory)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
-    class1EClass = createEClass(CLASS1);
-    createEReference(class1EClass, CLASS1__CLASS2);
-  }
-
-  /**
-   * <!-- 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
-    SubpackagePackage theSubpackagePackage = (SubpackagePackage)EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI);
-
-    // Add subpackages
-    getESubpackages().add(theSubpackagePackage);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(class1EClass, Class1.class, "Class1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getClass1_Class2(), theSubpackagePackage.getClass2(), theSubpackagePackage.getClass2_Class1(),
-        "class2", null, 0, -1, Class1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} // Model3PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java
deleted file mode 100644
index d225932d00..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Class2.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model3.subpackage;
-
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.tests.model3.Class1;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Class2</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 <em>Class1</em>}</li>
- * </ul>
- * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage#getClass2()
- * @model
- * @extends CDOObject
- * @generated
- */
-public interface Class2 extends CDOObject
-{
-  /**
-   * Returns the value of the '<em><b>Class1</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model3.Class1}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}'.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Class1</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>Class1</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage#getClass2_Class1()
-   * @see org.eclipse.emf.cdo.tests.model3.Class1#getClass2
-   * @model opposite="class2"
-   * @generated
-   */
-  EList<Class1> getClass1();
-
-} // Class2
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java
deleted file mode 100644
index 7d93d809be..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SubpackagePackage.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model3.subpackage;
-
-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.emf.cdo.tests.model3.subpackage.SubpackageFactory
- * @model kind="package"
- * @generated
- */
-public interface SubpackagePackage extends EPackage
-{
-  /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNAME = "subpackage";
-
-  /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/subpackage/1.0.0";
-
-  /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_PREFIX = "subpackage";
-
-  /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  SubpackagePackage eINSTANCE = org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl <em>Class2</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl
-   * @see org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl#getClass2()
-   * @generated
-   */
-  int CLASS2 = 0;
-
-  /**
-   * The feature id for the '<em><b>Class1</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CLASS2__CLASS1 = 0;
-
-  /**
-   * The number of structural features of the '<em>Class2</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CLASS2_FEATURE_COUNT = 1;
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2 <em>Class2</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Class2</em>'.
-   * @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2
-   * @generated
-   */
-  EClass getClass2();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 <em>Class1</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference list '<em>Class1</em>'.
-   * @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1()
-   * @see #getClass2()
-   * @generated
-   */
-  EReference getClass2_Class1();
-
-  /**
-   * 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
-   */
-  SubpackageFactory getSubpackageFactory();
-
-  /**
-   * <!-- 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.emf.cdo.tests.model3.subpackage.impl.Class2Impl <em>Class2</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl
-     * @see org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl#getClass2()
-     * @generated
-     */
-    EClass CLASS2 = eINSTANCE.getClass2();
-
-    /**
-     * The meta object literal for the '<em><b>Class1</b></em>' reference list feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference CLASS2__CLASS1 = eINSTANCE.getClass2_Class1();
-
-  }
-
-} // SubpackagePackage
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
deleted file mode 100644
index f80ec3e7c6..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SubpackagePackageImpl.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model3.subpackage.impl;
-
-import org.eclipse.emf.cdo.tests.model3.Model3Package;
-import org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl;
-import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
-import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory;
-import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage;
-
-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 SubpackagePackageImpl extends EPackageImpl implements SubpackagePackage
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass class2EClass = 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.emf.cdo.tests.model3.subpackage.SubpackagePackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private SubpackagePackageImpl()
-  {
-    super(eNS_URI, SubpackageFactory.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.
-   * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
-   * method drives initialization for interdependent packages directly, in parallel with this package, itself.
-   * <p>
-   * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
-   * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
-   * packages are created before any are initialized, since one package's meta-model objects may refer to those of
-   * another.
-   * <p>
-   * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static SubpackagePackage init()
-  {
-    if (isInited) return (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI);
-
-    // Obtain or create and register package
-    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI)
-        : new SubpackagePackageImpl());
-
-    isInited = true;
-
-    // Obtain or create and register interdependencies
-    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE);
-
-    // Create package meta-data objects
-    theSubpackagePackage.createPackageContents();
-    theModel3Package.createPackageContents();
-
-    // Initialize created meta-data
-    theSubpackagePackage.initializePackageContents();
-    theModel3Package.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theSubpackagePackage.freeze();
-
-    return theSubpackagePackage;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getClass2()
-  {
-    return class2EClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getClass2_Class1()
-  {
-    return (EReference)class2EClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public SubpackageFactory getSubpackageFactory()
-  {
-    return (SubpackageFactory)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
-    class2EClass = createEClass(CLASS2);
-    createEReference(class2EClass, CLASS2__CLASS1);
-  }
-
-  /**
-   * <!-- 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
-    Model3Package theModel3Package = (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(class2EClass, Class2.class, "Class2", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getClass2_Class1(), theModel3Package.getClass1(), theModel3Package.getClass1_Class2(), "class1",
-        null, 0, -1, Class2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-  }
-
-} // SubpackagePackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageAdapterFactory.java
deleted file mode 100644
index e4a9483189..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageAdapterFactory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SubpackageAdapterFactory.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model3.subpackage.util;
-
-import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
-import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage;
-
-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.emf.cdo.tests.model3.subpackage.SubpackagePackage
- * @generated
- */
-public class SubpackageAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static SubpackagePackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public SubpackageAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = SubpackagePackage.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 SubpackageSwitch<Adapter> modelSwitch = new SubpackageSwitch<Adapter>()
-  {
-    @Override
-    public Adapter caseClass2(Class2 object)
-    {
-      return createClass2Adapter();
-    }
-
-    @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.emf.cdo.tests.model3.subpackage.Class2 <em>Class2</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.emf.cdo.tests.model3.subpackage.Class2
-   * @generated
-   */
-  public Adapter createClass2Adapter()
-  {
-    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;
-  }
-
-} // SubpackageAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java
deleted file mode 100644
index a52c1bcd86..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SubpackageSwitch.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model3.subpackage.util;
-
-import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
-import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage;
-
-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.emf.cdo.tests.model3.subpackage.SubpackagePackage
- * @generated
- */
-public class SubpackageSwitch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static SubpackagePackage modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public SubpackageSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = SubpackagePackage.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 SubpackagePackage.CLASS2:
-    {
-      Class2 class2 = (Class2)theEObject;
-      T result = caseClass2(class2);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Class2</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>Class2</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseClass2(Class2 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;
-  }
-
-} // SubpackageSwitch
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java
deleted file mode 100644
index 3d6a87f037..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model3Switch.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.model3.util;
-
-import org.eclipse.emf.cdo.tests.model3.Class1;
-import org.eclipse.emf.cdo.tests.model3.Model3Package;
-
-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.emf.cdo.tests.model3.Model3Package
- * @generated
- */
-public class Model3Switch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static Model3Package modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model3Switch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Model3Package.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 Model3Package.CLASS1:
-    {
-      Class1 class1 = (Class1)theEObject;
-      T result = caseClass1(class1);
-      if (result == null) result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Class1</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>Class1</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseClass1(Class1 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;
-  }
-
-} // Model3Switch
diff --git a/plugins/org.eclipse.emf.cdo.ui/.classpath b/plugins/org.eclipse.emf.cdo.ui/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/.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.emf.cdo.ui/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.emf.cdo.ui/.options b/plugins/org.eclipse.emf.cdo.ui/.options
deleted file mode 100644
index 79322d02b3..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/.options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.emf.cdo.ui/debug = true
-
-org.eclipse.emf.cdo.ui/test = false
-org.eclipse.emf.cdo.ui/test.bulk_add = false
diff --git a/plugins/org.eclipse.emf.cdo.ui/.project b/plugins/org.eclipse.emf.cdo.ui/.project
deleted file mode 100644
index fb911caaaa..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.cdo.ui</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b781ba35a1..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:49:15 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index b7c1575976..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:49:15 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
deleted file mode 100644
index ac3730a692..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.emf.cdo,org.eclipse.emf.cdo.examples,org.eclipse.emf.cdo.protocol,org.eclipse.emf.cdo.ui,org.eclipse.net4j,org.eclipse.net4j.tcp,org.eclipse.net4j.ui,org.eclipse.net4j.util,org.eclipse.net4j.util.ui"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/CDOClient1"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../cdo.client1"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash&#13;&#10;-console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.aspectj.tracing.debug=false&#13;&#10;-Xms40m&#13;&#10;-Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo.ui"/>
-<stringAttribute key="selected_target_plugins" value="org.apache.commons.el*1.0.0.v200803061811,org.eclipse.core.runtime*3.4.0.v20080324-1725,org.eclipse.xsd.cheatsheets*2.3.0.v200803041800,org.eclipse.pde.doc.user*3.3.0.v20080323,org.eclipse.emf.importer.ecore*2.4.0.v200803041800,org.eclipse.emf.importer.rose*2.4.0.v200803041800,org.eclipse.core.resources.compatibility*3.4.0.v20071204,org.eclipse.emf.mapping.ecore2ecore.editor*2.4.0.v200803041800,org.eclipse.emf.ecore.change.edit*2.4.0.v200803041800,org.eclipse.pde.core*3.4.0.v20080407-1400,org.eclipse.core.filesystem.win32.x86*1.1.0.v20071126,org.eclipse.ui.views*3.3.0.v20080408-0800,org.eclipse.osgi*3.4.0.v20080407,org.eclipse.update.core*3.2.200.v20080318,org.eclipse.core.runtime.compatibility*3.2.0.v20071008,org.eclipse.debug.core*3.4.0.v20080407,org.eclipse.help.appserver*3.1.200.v20070510,org.eclipse.xsd.doc*2.4.0.v200803041800,org.eclipse.emf.cheatsheets*2.4.0.v200803041800,org.eclipse.core.net*1.0.100.I20080322,org.eclipse.emf.ant*2.4.0.v200803041800,org.eclipse.core.boot*3.1.100.v20080218,org.eclipse.emf.ecore.sdo.edit*2.4.0.v200803041800,org.eclipse.equinox.http.registry*1.0.100.v20080303,org.eclipse.ui.workbench.texteditor*3.4.0.v20080408-0800,org.eclipse.pde.ui*3.4.0.v20080407-1400,org.eclipse.update.ui*3.2.100.v20080318,org.eclipse.equinox.launcher.win32.win32.x86*1.0.100.v20080407,org.eclipse.ui.console*3.3.0.v20080407,org.eclipse.emf*2.4.0.v200803041800,org.eclipse.emf.edit*2.4.0.v200803041800,org.eclipse.equinox.launcher*1.0.100.v20080303,org.eclipse.jdt.doc.isv*3.4.0.v20080408-0800,org.eclipse.core.runtime.compatibility.registry*3.2.200.v20070717,org.eclipse.core.runtime.compatibility.auth*3.2.100.v20070502,org.eclipse.equinox.jsp.jasper*1.0.100.v20080201,org.eclipse.ui.intro*3.2.200.v20080303,org.eclipse.jface.text*3.4.0.v20080408-0800,org.eclipse.team.cvs.ui*3.3.100.I20080304,org.eclipse.team.ui*3.4.0.I20080328,org.eclipse.ui.views.properties.tabbed*3.4.0.I20080324-1800,org.eclipse.ui.navigator*3.3.100.v20080408-0800,org.eclipse.ui.intro.universal*3.2.200.v20080225,org.eclipse.osgi.services*3.1.200.v20071203,org.eclipse.ui.presentations.r21*3.2.100.v20080408-0800,org.eclipse.emf.commonj.sdo*2.4.0.v200803041800,org.eclipse.emf.ecore.edit*2.4.0.v200803041800,org.eclipse.pde.junit.runtime*3.4.0.v20070115-0800,org.eclipse.platform.source*3.3.100.v20080403,org.eclipse.ui.ide*3.4.0.v20080408-0800,org.eclipse.ui.editors*3.4.0.v20080408-0800,org.eclipse.help.base*3.3.100.v20080331,org.eclipse.jdt.compiler.tool*1.0.100.v_852,org.eclipse.core.contenttype*3.3.0.v20080407,org.eclipse.search*3.4.0.v20080408-0800,org.eclipse.help.ui*3.3.100.v20080407,org.eclipse.pde.ui.templates*3.4.0.v20080331-2030,org.eclipse.xsd.editor*2.4.0.v200803041800,org.junit*3.8.2.v200711021030,org.eclipse.jdt.junit.runtime*3.3.0.v20080408-0800,org.eclipse.equinox.jsp.jasper.registry*1.0.0.v20080303,org.eclipse.text*3.4.0.v20080408-0800,org.eclipse.ui.browser*3.2.200.v20080407,org.eclipse.emf.common.ui*2.4.0.v200803041800,org.eclipse.debug.ui*3.4.0.v20080407,org.eclipse.emf.source*2.4.0.v200803041800,org.eclipse.ltk.ui.refactoring*3.4.0.v20080408-0800,javax.servlet*2.4.0.v200803061910,org.eclipse.ui.ide.application*1.0.0.v20080408-0800,org.eclipse.equinox.app*1.0.100.v20080331,org.eclipse.jface.databinding*1.2.0.v20080408-0800,org.apache.ant*1.7.0.v200803061910,org.eclipse.core.databinding*1.1.0.v20080408-0800,org.eclipse.ui.externaltools*3.2.0.v20080407,org.eclipse.jdt.junit4.runtime*1.0.200.v20080408-0800,org.eclipse.core.databinding.beans*1.1.0.v20080408-0800,org.eclipse.emf.ecore.change*2.4.0.v200803041800,org.eclipse.core.expressions*3.4.0.v20080408-0800,javax.servlet.jsp*2.0.0.v200803061910,org.eclipse.emf.codegen.ecore*2.4.0.v200803041800,org.eclipse.xsd*2.4.0.v200803041800,org.eclipse.equinox.registry*3.4.0.v20080316,org.eclipse.emf.importer.java*2.4.0.v200803041800,org.eclipse.core.variables*3.2.100.v20080324-1600,org.eclipse.emf.ecore.sdo*2.4.0.v200803041800,org.eclipse.platform.doc.isv*3.4.0.v20080408-0800,org.eclipse.xsd.ecore.importer*2.4.0.v200803041800,org.eclipse.emf.mapping*2.4.0.v200803041800,org.eclipse.xsd.source*2.4.0.v200803041800,org.eclipse.emf.edit.ui*2.4.0.v200803041800,org.eclipse.emf.importer*2.4.0.v200803041800,org.apache.commons.logging*1.0.4.v200803061811,org.apache.lucene.analysis*1.9.1.v200803061811,org.eclipse.xsd.edit*2.4.0.v200803041800,org.eclipse.help*3.3.100.v20080407,org.eclipse.emf.converter*2.4.0.v200803041800,org.eclipse.emf.ecore*2.4.0.v200803041800,org.eclipse.team.core*3.3.100.I20080326,org.apache.jasper*5.5.17.v200803061811,org.eclipse.jdt.core*3.4.0.v_852,org.eclipse.jface*3.4.0.v20080408-0800,org.apache.lucene*1.9.1.v200803061811,org.eclipse.pde*3.4.0.v20080326-1300,org.eclipse.emf.ecore.xmi*2.4.0.v200803041800,org.eclipse.emf.mapping.ui*2.4.0.v200803041800,org.eclipse.update.scheduler*3.2.100.v20080404,org.eclipse.core.commands*3.4.0.v20080408-0800,org.eclipse.emf.mapping.ecore2ecore*2.4.0.v200803041800,org.eclipse.emf.mapping.xsd2ecore.editor*2.4.0.v200803041800,org.eclipse.jdt.source*3.4.0.v20080408-0800,org.eclipse.pde.source*3.4.0.v20080326-1300,org.eclipse.emf.ecore.sdo.doc*2.4.0.v200803041800,org.eclipse.emf.mapping.xsd2ecore*2.4.0.v200803041800,org.eclipse.rcp.source*3.4.0.v20080402,org.eclipse.help.webapp*3.3.100.v20080407,org.eclipse.emf.common*2.4.0.v200803041800,org.eclipse.core.jobs*3.4.0.v20080310,org.eclipse.update.configurator*3.2.200.v20080404,org.eclipse.compare*3.4.0.I20080322,org.eclipse.jdt.core.manipulation*1.2.0.v20080408-0800,org.eclipse.jdt.junit*3.3.100.v20080408-0800,org.eclipse.emf.doc*2.4.0.v200803041800,org.eclipse.emf.mapping.ecore2xml.ui*2.4.0.v200803041800,org.eclipse.jdt.compiler.apt*1.0.100.v20080407-1345,org.eclipse.equinox.http.servlet*1.0.100.v20080201,org.eclipse.cvs.source*1.0.100.v20080324,org.eclipse.ant.core*3.2.0.v20080319,org.eclipse.ui.workbench*3.4.0.v20080408-0800,org.eclipse.jsch.core*1.1.100.I20080226,org.eclipse.jdt.ui*3.4.0.v20080408-0800,org.eclipse.xsd.ecore.exporter*2.4.0.v200803041800,org.eclipse.ui.views.log*1.0.0.v20080324-0900,org.eclipse.ui.forms*3.3.100.v20080407,com.jcraft.jsch*0.1.37.v200803061811,org.eclipse.ltk.core.refactoring*3.4.0.v20080408-0800,org.eclipse.pde.build*3.4.0.v20080323,org.junit4*4.3.1,org.eclipse.equinox.launcher*1.0.100.v20080407,org.eclipse.core.filesystem*1.2.0.v20080407,org.eclipse.emf.ecore.sdo.source*2.4.0.v200803041800,org.eclipse.swt.win32.win32.x86*3.4.0.v3438,org.eclipse.jdt*3.4.0.v20080408-0800,org.eclipse.team.cvs.core*3.3.100.I20080326,org.eclipse.osgi*3.4.0.v20080331,org.eclipse.core.resources*3.4.0.v20080407,org.eclipse.emf.codegen*2.4.0.v200803041800,org.eclipse.ui.cheatsheets*3.3.100.v20080303,org.eclipse.sdk*3.4.0.v20080403,org.eclipse.equinox.common*3.4.0.v20080407,com.ibm.icu*3.8.1.v20080304,org.eclipse.team.cvs.ssh2*3.2.200.I20071113,org.eclipse.emf.mapping.ecore2xml*2.4.0.v200803041800,org.eclipse.emf.codegen.ecore.ui*2.4.0.v200803041800,org.eclipse.rcp*3.4.0.v20080402,org.eclipse.ant.ui*3.3.0.v20080407,org.eclipse.equinox.preferences*3.2.200.v20080201,org.eclipse.ui.workbench.compatibility*3.2.0.v20080408-0800,org.eclipse.jdt.debug.ui*3.3.0.v20080407,org.eclipse.jdt.launching*3.4.0.v20080407,org.eclipse.team.cvs.ssh*3.2.100.I20080322,org.eclipse.pde.runtime*3.4.0.v20080324-0900,org.eclipse.equinox.common*3.4.0.v20080320,org.eclipse.jdt.doc.user*3.4.0.v20080408-0800,org.eclipse.core.resources.win32.x86*3.4.0.v20071204,org.eclipse.emf.codegen.ui*2.4.0.v200803041800,org.eclipse.emf.ecore.sdo.editor*2.4.0.v200803041800,org.eclipse.platform*3.3.100.v20080403,org.eclipse.ui*3.4.0.v20080408-1602,org.mortbay.jetty*5.1.11.v200803061811,org.eclipse.update.core.win32*3.2.100.v20080107,org.eclipse.osgi.util*3.1.300.v20080303,org.eclipse.ui.win32*3.2.100.v20080408-0800,org.eclipse.emf.ecore.editor*2.4.0.v200803041800,org.eclipse.ui.navigator.resources*3.3.100.v20080408-0800,org.eclipse.core.filebuffers*3.4.0.v20080408-0800,org.eclipse.jdt.debug*3.4.0.v20080407,org.eclipse.swt*3.4.0.v3438,org.eclipse.cvs*1.0.100.v20080324,org.eclipse.equinox.http.jetty*1.0.100.v20080303,org.eclipse.emf.exporter*2.4.0.v200803041800"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.mango.edit*0.8.0.qualifer,org.eclipse.net4j.buddies*0.8.0.qualifier,org.eclipse.emf.cdo.examples*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model3.edit*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model1.edit*0.8.0.qualifier,org.eclipse.net4j.util.ui*0.8.0.qualifier,org.eclipse.emf.cdo.tests.mango*0.8.0.qualifier,org.eclipse.net4j.tcp*0.8.0.qualifier,org.eclipse.emf.cdo.doc*0.8.0.qualifier,org.eclipse.net4j.ui*0.8.0.qualifier,org.eclipse.emf.cdo.protocol*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model3*0.8.0.qualifier,org.eclipse.net4j.buddies.ui*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model2*0.8.0.qualifier,org.eclipse.ant.optional.junit*1.0.0,org.eclipse.net4j.chat*0.8.0.qualifier,org.eclipse.net4j.util*0.8.0.qualifier,org.eclipse.emf.cdo.server*0.8.0.qualifier,org.eclipse.emf.cdo.edit*0.8.0.qualifier,org.eclipse.emf.cdo.ui*0.8.0.qualifier,org.eclipse.net4j.buddies.protocol*0.8.0.qualifier,org.eclipse.emf.cdo*0.8.0.qualifier,org.eclipse.emf.cdo.weaver*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model2.edit*0.8.0.qualifier,org.eclipse.net4j.chat.ui*0.8.0.qualifier,org.eclipse.net4j*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model1*0.8.0.qualifier,org.eclipse.emf.cdo.weaver.ui*0.8.0.qualifier"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="true"/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/workingSets" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.types" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.net4j/perf" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.signal" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.net4j.fileshare/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/perf.revision" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.session" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/perf.revision" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/perf" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.net4j.jvm/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.ui.intro/flags/noBrowser" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug" value="true"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/perf.revision.reading" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.ui/test" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j.fileshare.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help/debug/search" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.ui/test.bulk_add" value="true"/>
-<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/perf.revision.writing" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.session" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.adapter" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.util.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.chat.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.chat/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug.model" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.net4j/debug.channel" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/perf.revision.loading" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/perf" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-</mapAttribute>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useNamedJRE" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
deleted file mode 100644
index e2a1a591dd..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.emf.cdo,org.eclipse.emf.cdo.examples,org.eclipse.emf.cdo.protocol,org.eclipse.emf.cdo.ui,org.eclipse.net4j,org.eclipse.net4j.tcp,org.eclipse.net4j.ui,org.eclipse.net4j.util,org.eclipse.net4j.util.ui"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/CDOClient2"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../cdo.client2"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash&#13;&#10;-console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.aspectj.tracing.debug=false&#13;&#10;-Xms40m&#13;&#10;-Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/>
-<stringAttribute key="selected_target_plugins" value="org.apache.commons.el*1.0.0.v200803061811,org.eclipse.core.runtime*3.4.0.v20080324-1725,org.eclipse.xsd.cheatsheets*2.3.0.v200803041800,org.eclipse.pde.doc.user*3.3.0.v20080323,org.eclipse.emf.importer.ecore*2.4.0.v200803041800,org.eclipse.emf.importer.rose*2.4.0.v200803041800,org.eclipse.core.resources.compatibility*3.4.0.v20071204,org.eclipse.emf.mapping.ecore2ecore.editor*2.4.0.v200803041800,org.eclipse.emf.ecore.change.edit*2.4.0.v200803041800,org.eclipse.pde.core*3.4.0.v20080407-1400,org.eclipse.core.filesystem.win32.x86*1.1.0.v20071126,org.eclipse.ui.views*3.3.0.v20080408-0800,org.eclipse.osgi*3.4.0.v20080407,org.eclipse.update.core*3.2.200.v20080318,org.eclipse.core.runtime.compatibility*3.2.0.v20071008,org.eclipse.debug.core*3.4.0.v20080407,org.eclipse.help.appserver*3.1.200.v20070510,org.eclipse.xsd.doc*2.4.0.v200803041800,org.eclipse.emf.cheatsheets*2.4.0.v200803041800,org.eclipse.core.net*1.0.100.I20080322,org.eclipse.emf.ant*2.4.0.v200803041800,org.eclipse.core.boot*3.1.100.v20080218,org.eclipse.emf.ecore.sdo.edit*2.4.0.v200803041800,org.eclipse.equinox.http.registry*1.0.100.v20080303,org.eclipse.ui.workbench.texteditor*3.4.0.v20080408-0800,org.eclipse.pde.ui*3.4.0.v20080407-1400,org.eclipse.update.ui*3.2.100.v20080318,org.eclipse.equinox.launcher.win32.win32.x86*1.0.100.v20080407,org.eclipse.ui.console*3.3.0.v20080407,org.eclipse.emf*2.4.0.v200803041800,org.eclipse.emf.edit*2.4.0.v200803041800,org.eclipse.equinox.launcher*1.0.100.v20080303,org.eclipse.jdt.doc.isv*3.4.0.v20080408-0800,org.eclipse.core.runtime.compatibility.registry*3.2.200.v20070717,org.eclipse.core.runtime.compatibility.auth*3.2.100.v20070502,org.eclipse.equinox.jsp.jasper*1.0.100.v20080201,org.eclipse.ui.intro*3.2.200.v20080303,org.eclipse.jface.text*3.4.0.v20080408-0800,org.eclipse.team.cvs.ui*3.3.100.I20080304,org.eclipse.team.ui*3.4.0.I20080328,org.eclipse.ui.views.properties.tabbed*3.4.0.I20080324-1800,org.eclipse.ui.navigator*3.3.100.v20080408-0800,org.eclipse.ui.intro.universal*3.2.200.v20080225,org.eclipse.osgi.services*3.1.200.v20071203,org.eclipse.ui.presentations.r21*3.2.100.v20080408-0800,org.eclipse.emf.commonj.sdo*2.4.0.v200803041800,org.eclipse.emf.ecore.edit*2.4.0.v200803041800,org.eclipse.pde.junit.runtime*3.4.0.v20070115-0800,org.eclipse.platform.source*3.3.100.v20080403,org.eclipse.ui.ide*3.4.0.v20080408-0800,org.eclipse.ui.editors*3.4.0.v20080408-0800,org.eclipse.help.base*3.3.100.v20080331,org.eclipse.jdt.compiler.tool*1.0.100.v_852,org.eclipse.core.contenttype*3.3.0.v20080407,org.eclipse.search*3.4.0.v20080408-0800,org.eclipse.help.ui*3.3.100.v20080407,org.eclipse.pde.ui.templates*3.4.0.v20080331-2030,org.eclipse.xsd.editor*2.4.0.v200803041800,org.junit*3.8.2.v200711021030,org.eclipse.jdt.junit.runtime*3.3.0.v20080408-0800,org.eclipse.equinox.jsp.jasper.registry*1.0.0.v20080303,org.eclipse.text*3.4.0.v20080408-0800,org.eclipse.ui.browser*3.2.200.v20080407,org.eclipse.emf.common.ui*2.4.0.v200803041800,org.eclipse.debug.ui*3.4.0.v20080407,org.eclipse.emf.source*2.4.0.v200803041800,org.eclipse.ltk.ui.refactoring*3.4.0.v20080408-0800,javax.servlet*2.4.0.v200803061910,org.eclipse.ui.ide.application*1.0.0.v20080408-0800,org.eclipse.equinox.app*1.0.100.v20080331,org.eclipse.jface.databinding*1.2.0.v20080408-0800,org.apache.ant*1.7.0.v200803061910,org.eclipse.core.databinding*1.1.0.v20080408-0800,org.eclipse.ui.externaltools*3.2.0.v20080407,org.eclipse.jdt.junit4.runtime*1.0.200.v20080408-0800,org.eclipse.core.databinding.beans*1.1.0.v20080408-0800,org.eclipse.emf.ecore.change*2.4.0.v200803041800,org.eclipse.core.expressions*3.4.0.v20080408-0800,javax.servlet.jsp*2.0.0.v200803061910,org.eclipse.emf.codegen.ecore*2.4.0.v200803041800,org.eclipse.xsd*2.4.0.v200803041800,org.eclipse.equinox.registry*3.4.0.v20080316,org.eclipse.emf.importer.java*2.4.0.v200803041800,org.eclipse.core.variables*3.2.100.v20080324-1600,org.eclipse.emf.ecore.sdo*2.4.0.v200803041800,org.eclipse.platform.doc.isv*3.4.0.v20080408-0800,org.eclipse.xsd.ecore.importer*2.4.0.v200803041800,org.eclipse.emf.mapping*2.4.0.v200803041800,org.eclipse.xsd.source*2.4.0.v200803041800,org.eclipse.emf.edit.ui*2.4.0.v200803041800,org.eclipse.emf.importer*2.4.0.v200803041800,org.apache.commons.logging*1.0.4.v200803061811,org.apache.lucene.analysis*1.9.1.v200803061811,org.eclipse.xsd.edit*2.4.0.v200803041800,org.eclipse.help*3.3.100.v20080407,org.eclipse.emf.converter*2.4.0.v200803041800,org.eclipse.emf.ecore*2.4.0.v200803041800,org.eclipse.team.core*3.3.100.I20080326,org.apache.jasper*5.5.17.v200803061811,org.eclipse.jdt.core*3.4.0.v_852,org.eclipse.jface*3.4.0.v20080408-0800,org.apache.lucene*1.9.1.v200803061811,org.eclipse.pde*3.4.0.v20080326-1300,org.eclipse.emf.ecore.xmi*2.4.0.v200803041800,org.eclipse.emf.mapping.ui*2.4.0.v200803041800,org.eclipse.update.scheduler*3.2.100.v20080404,org.eclipse.core.commands*3.4.0.v20080408-0800,org.eclipse.emf.mapping.ecore2ecore*2.4.0.v200803041800,org.eclipse.emf.mapping.xsd2ecore.editor*2.4.0.v200803041800,org.eclipse.jdt.source*3.4.0.v20080408-0800,org.eclipse.pde.source*3.4.0.v20080326-1300,org.eclipse.emf.ecore.sdo.doc*2.4.0.v200803041800,org.eclipse.emf.mapping.xsd2ecore*2.4.0.v200803041800,org.eclipse.rcp.source*3.4.0.v20080402,org.eclipse.help.webapp*3.3.100.v20080407,org.eclipse.emf.common*2.4.0.v200803041800,org.eclipse.core.jobs*3.4.0.v20080310,org.eclipse.update.configurator*3.2.200.v20080404,org.eclipse.compare*3.4.0.I20080322,org.eclipse.jdt.core.manipulation*1.2.0.v20080408-0800,org.eclipse.jdt.junit*3.3.100.v20080408-0800,org.eclipse.emf.doc*2.4.0.v200803041800,org.eclipse.emf.mapping.ecore2xml.ui*2.4.0.v200803041800,org.eclipse.jdt.compiler.apt*1.0.100.v20080407-1345,org.eclipse.equinox.http.servlet*1.0.100.v20080201,org.eclipse.cvs.source*1.0.100.v20080324,org.eclipse.ant.core*3.2.0.v20080319,org.eclipse.ui.workbench*3.4.0.v20080408-0800,org.eclipse.jsch.core*1.1.100.I20080226,org.eclipse.jdt.ui*3.4.0.v20080408-0800,org.eclipse.xsd.ecore.exporter*2.4.0.v200803041800,org.eclipse.ui.views.log*1.0.0.v20080324-0900,org.eclipse.ui.forms*3.3.100.v20080407,com.jcraft.jsch*0.1.37.v200803061811,org.eclipse.ltk.core.refactoring*3.4.0.v20080408-0800,org.eclipse.pde.build*3.4.0.v20080323,org.junit4*4.3.1,org.eclipse.equinox.launcher*1.0.100.v20080407,org.eclipse.core.filesystem*1.2.0.v20080407,org.eclipse.emf.ecore.sdo.source*2.4.0.v200803041800,org.eclipse.swt.win32.win32.x86*3.4.0.v3438,org.eclipse.jdt*3.4.0.v20080408-0800,org.eclipse.team.cvs.core*3.3.100.I20080326,org.eclipse.osgi*3.4.0.v20080331,org.eclipse.core.resources*3.4.0.v20080407,org.eclipse.emf.codegen*2.4.0.v200803041800,org.eclipse.ui.cheatsheets*3.3.100.v20080303,org.eclipse.sdk*3.4.0.v20080403,org.eclipse.equinox.common*3.4.0.v20080407,com.ibm.icu*3.8.1.v20080304,org.eclipse.team.cvs.ssh2*3.2.200.I20071113,org.eclipse.emf.mapping.ecore2xml*2.4.0.v200803041800,org.eclipse.emf.codegen.ecore.ui*2.4.0.v200803041800,org.eclipse.rcp*3.4.0.v20080402,org.eclipse.ant.ui*3.3.0.v20080407,org.eclipse.equinox.preferences*3.2.200.v20080201,org.eclipse.ui.workbench.compatibility*3.2.0.v20080408-0800,org.eclipse.jdt.debug.ui*3.3.0.v20080407,org.eclipse.jdt.launching*3.4.0.v20080407,org.eclipse.team.cvs.ssh*3.2.100.I20080322,org.eclipse.pde.runtime*3.4.0.v20080324-0900,org.eclipse.equinox.common*3.4.0.v20080320,org.eclipse.jdt.doc.user*3.4.0.v20080408-0800,org.eclipse.core.resources.win32.x86*3.4.0.v20071204,org.eclipse.emf.codegen.ui*2.4.0.v200803041800,org.eclipse.emf.ecore.sdo.editor*2.4.0.v200803041800,org.eclipse.platform*3.3.100.v20080403,org.eclipse.ui*3.4.0.v20080408-1602,org.mortbay.jetty*5.1.11.v200803061811,org.eclipse.update.core.win32*3.2.100.v20080107,org.eclipse.osgi.util*3.1.300.v20080303,org.eclipse.ui.win32*3.2.100.v20080408-0800,org.eclipse.emf.ecore.editor*2.4.0.v200803041800,org.eclipse.ui.navigator.resources*3.3.100.v20080408-0800,org.eclipse.core.filebuffers*3.4.0.v20080408-0800,org.eclipse.jdt.debug*3.4.0.v20080407,org.eclipse.swt*3.4.0.v3438,org.eclipse.cvs*1.0.100.v20080324,org.eclipse.equinox.http.jetty*1.0.100.v20080303,org.eclipse.emf.exporter*2.4.0.v200803041800"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.tests.mango.edit*0.8.0.qualifer,org.eclipse.net4j.buddies*0.8.0.qualifier,org.eclipse.emf.cdo.examples*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model1.edit*0.8.0.qualifier,org.eclipse.net4j.util.ui*0.8.0.qualifier,org.eclipse.emf.cdo.tests.mango*0.8.0.qualifier,org.eclipse.net4j.tcp*0.8.0.qualifier,org.eclipse.emf.cdo.doc*0.8.0.qualifier,org.eclipse.net4j.ui*0.8.0.qualifier,org.eclipse.emf.cdo.protocol*0.8.0.qualifier,org.eclipse.net4j.buddies.ui*0.8.0.qualifier,org.eclipse.ant.optional.junit*1.0.0,org.eclipse.net4j.chat*0.8.0.qualifier,org.eclipse.net4j.util*0.8.0.qualifier,org.eclipse.emf.cdo.server*0.8.0.qualifier,org.eclipse.emf.cdo.edit*0.8.0.qualifier,org.eclipse.emf.cdo.ui*0.8.0.qualifier,org.eclipse.net4j.buddies.protocol*0.8.0.qualifier,org.eclipse.emf.cdo*0.8.0.qualifier,org.eclipse.emf.cdo.weaver*0.8.0.qualifier,org.eclipse.net4j.chat.ui*0.8.0.qualifier,org.eclipse.net4j*0.8.0.qualifier,org.eclipse.emf.cdo.tests.model1*0.8.0.qualifier,org.eclipse.emf.cdo.weaver.ui*0.8.0.qualifier"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="true"/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/workingSets" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.types" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.net4j/perf" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.signal" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.net4j.fileshare/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/perf.revision" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.session" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/perf.revision" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/perf" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.net4j.jvm/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.ui.intro/flags/noBrowser" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug" value="true"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/perf.revision.reading" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
-<mapEntry key="org.eclipse.net4j.fileshare.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/>
-<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.help/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/perf.revision.writing" value="true"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.session" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.adapter" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.util.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.chat.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.chat/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug.model" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.net4j/debug.channel" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/perf.revision.loading" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/perf" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-</mapAttribute>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useNamedJRE" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index c018d23b63..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.ui;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.emf.cdo.internal.ui.bundle.OM$Activator
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.net4j;visibility:=reexport,
- org.eclipse.net4j.util.ui;visibility:=reexport,
- org.eclipse.emf.cdo;visibility:=reexport,
- org.eclipse.emf.cdo.edit
-Export-Package: org.eclipse.emf.cdo.internal.ui;version="0.8.0",
- org.eclipse.emf.cdo.internal.ui.actions;version="0.8.0",
- org.eclipse.emf.cdo.internal.ui.dialogs;version="0.8.0",
- org.eclipse.emf.cdo.internal.ui.editor;version="0.8.0",
- org.eclipse.emf.cdo.internal.ui.preferences;version="0.8.0",
- org.eclipse.emf.cdo.internal.ui.views;version="0.8.0",
- org.eclipse.emf.cdo.ui;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.ui/about.html b/plugins/org.eclipse.emf.cdo.ui/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/about.html
+++ /dev/null
@@ -1,28 +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.emf.cdo.ui/build.properties b/plugins/org.eclipse.emf.cdo.ui/build.properties
deleted file mode 100644
index 5fa621d71a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               model/,\
-               icons/,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html
diff --git a/plugins/org.eclipse.emf.cdo.ui/copyright.txt b/plugins/org.eclipse.emf.cdo.ui/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui/epl-v10.html b/plugins/org.eclipse.emf.cdo.ui/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/icons.sample/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/acceptor.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/acceptor.gif
deleted file mode 100644
index a830867191..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/acceptor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/adapter.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/adapter.gif
deleted file mode 100644
index e8c1e6ff7e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/adapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/add.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/add.gif
deleted file mode 100644
index 7df3bfe7d4..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/add.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/add_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/add_obj.gif
deleted file mode 100644
index 252d7ebcb8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/add_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/channel.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/channel.gif
deleted file mode 100644
index df67abd507..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/channel.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/connector.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/connector.gif
deleted file mode 100644
index 3b3ad7c16e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/connector.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von deadlock_ovr.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von deadlock_ovr.gif
deleted file mode 100644
index 4499ad076d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von deadlock_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von doc_co.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von doc_co.gif
deleted file mode 100644
index 52ef67722a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von doc_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von file_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von file_obj.gif
deleted file mode 100644
index 061161ae1c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von file_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von pagedmedia_props.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von pagedmedia_props.gif
deleted file mode 100644
index 6b635b03d8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von pagedmedia_props.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von read_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von read_obj.gif
deleted file mode 100644
index c876ebd2fd..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Kopie von read_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Resource.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Resource.gif
deleted file mode 100644
index b226e41c52..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/Resource.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/ResourceSet.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/ResourceSet.gif
deleted file mode 100644
index 2e4de3d12a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/ResourceSet.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/deadlock_ovr.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/deadlock_ovr.gif
deleted file mode 100644
index 4499ad076d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/deadlock_ovr.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/doc_co.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/doc_co.gif
deleted file mode 100644
index 05ef403308..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/doc_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/file_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/file_obj.gif
deleted file mode 100644
index 061161ae1c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/file_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/pagedmedia_props.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/pagedmedia_props.gif
deleted file mode 100644
index 6b635b03d8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/pagedmedia_props.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/read_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/read_obj.gif
deleted file mode 100644
index c876ebd2fd..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/read_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/readwrite_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/readwrite_obj.gif
deleted file mode 100644
index b11bfe201e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/readwrite_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/resource_persp.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/resource_persp.gif
deleted file mode 100644
index 2a3eb9190a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/resource_persp.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/searchhit_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/searchhit_obj.gif
deleted file mode 100644
index ead314f664..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/searchhit_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/textpane_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/textpane_obj.gif
deleted file mode 100644
index c77fa1308d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/textpane_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/write_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/write_obj.gif
deleted file mode 100644
index feb8e94a74..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/edit/write_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/factory.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/factory.gif
deleted file mode 100644
index 955d5e87a5..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/factory.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/folder.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/folder.gif
deleted file mode 100644
index 42e027c933..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/folder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/channel.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/channel.gif
deleted file mode 100644
index df67abd507..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/channel.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/history_view.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/history_view.gif
deleted file mode 100644
index c5f904abb8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/history_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/launch_publish.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/launch_publish.gif
deleted file mode 100644
index 87827af379..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/launch_publish.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/properties.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/properties.gif
deleted file mode 100644
index b2361a3a05..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/properties.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repo_rep.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repo_rep.gif
deleted file mode 100644
index c13bea1ca4..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repo_rep.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repository_rep.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repository_rep.gif
deleted file mode 100644
index 0470e1588d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/repository_rep.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/server_explorer.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/server_explorer.gif
deleted file mode 100644
index 7ef3c2c80b..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/repo/server_explorer.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/app_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/app_obj.gif
deleted file mode 100644
index 753cad744c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/app_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/apply.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/apply.gif
deleted file mode 100644
index 136235eeaa..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/apply.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/config_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/config_obj.gif
deleted file mode 100644
index c984fba703..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/config_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/history_working_set_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/history_working_set_obj.gif
deleted file mode 100644
index 4fc84e4c3a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/history_working_set_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/launch_profile.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/launch_profile.gif
deleted file mode 100644
index 89c33404b6..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/launch_profile.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/profile_on_server.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/profile_on_server.gif
deleted file mode 100644
index aca952208a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/profile_on_server.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/resource_obj.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/resource_obj.gif
deleted file mode 100644
index 3bd4e36057..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/resource_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/synch_co.gif b/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/synch_co.gif
deleted file mode 100644
index 2069e1d409..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons.sample/time/synch_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/icons/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/icons/full/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/delete.gif
deleted file mode 100644
index b6922ac11c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/delete.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/open_editor.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/open_editor.gif
deleted file mode 100644
index 8838433ebd..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/open_editor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/open_session.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/open_session.gif
deleted file mode 100644
index 80d31435a0..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/etool16/open_session.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif
deleted file mode 100644
index d5cfa16f12..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EClass.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EClass.gif
deleted file mode 100644
index 2b8da630d8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EClass.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackage.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackage.gif
deleted file mode 100644
index 30c5c10cc4..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackage.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageConverted.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageConverted.gif
deleted file mode 100644
index f7c0a7608a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageConverted.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageLegacy.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageLegacy.gif
deleted file mode 100644
index 30c5c10cc4..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageLegacy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageNative.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageNative.gif
deleted file mode 100644
index 3f98b284a7..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EPackageNative.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EditorModelFile.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EditorModelFile.gif
deleted file mode 100644
index d5cfa16f12..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/EditorModelFile.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor.gif
deleted file mode 100644
index acd9c16732..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_historical.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_historical.gif
deleted file mode 100644
index dddb821a8e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_historical.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_readonly.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_readonly.gif
deleted file mode 100644
index e5cc6b6f86..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_readonly.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_readwrite.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_readwrite.gif
deleted file mode 100644
index 93be7ea8a8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_editor_readwrite.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_session.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_session.gif
deleted file mode 100644
index 672ae6ea34..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/cdo_session.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/.cvsignore b/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/cdo_sessions.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/cdo_sessions.gif
deleted file mode 100644
index 672ae6ea34..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/view16/cdo_sessions.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewCDO.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewCDO.gif
deleted file mode 100644
index 2054126392..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewCDO.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewEditor.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewEditor.gif
deleted file mode 100644
index 2054126392..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/NewEditor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/PackageManager.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/PackageManager.gif
deleted file mode 100644
index 25980e99a5..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/full/wizban/PackageManager.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/sample.gif b/plugins/org.eclipse.emf.cdo.ui/icons/sample.gif
deleted file mode 100644
index 34fb3c9d8c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/icons/sample.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.cdo.ui/license.html b/plugins/org.eclipse.emf.cdo.ui/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.ui/model/DONT_GENERATE_MODEL.txt b/plugins/org.eclipse.emf.cdo.ui/model/DONT_GENERATE_MODEL.txt
deleted file mode 100644
index 964c62f4fd..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/model/DONT_GENERATE_MODEL.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Don't generate the model!
-
-Only generate the editor!
-
diff --git a/plugins/org.eclipse.emf.cdo.ui/model/editor.ecore b/plugins/org.eclipse.emf.cdo.ui/model/editor.ecore
deleted file mode 100644
index 8fbdda4f33..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/model/editor.ecore
+++ /dev/null
@@ -1,7 +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="editor"
-    nsURI="http://www.eclipse.org/emf/CDO/editor/1.0.0" nsPrefix="editor">
-  <eClassifiers xsi:type="ecore:EClass" name="Dummy"/>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.ui/model/editor.genmodel b/plugins/org.eclipse.emf.cdo.ui/model/editor.genmodel
deleted file mode 100644
index 37af764811..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/model/editor.genmodel
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.ui/src"
-    editDirectory="" editorDirectory="/org.eclipse.emf.cdo.ui/src" modelPluginID="org.eclipse.emf.cdo.ui"
-    modelName="Editor" editorPluginClass="org.eclipse.emf.cdo.internal.ui.editor.PluginDelegator"
-    updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0">
-  <foreignModel>editor.ecore</foreignModel>
-  <genPackages prefix="CDO" basePackage="org.eclipse.emf.cdo.internal.ui" disposableProviderFactory="true"
-      presentationPackageSuffix="" multipleEditorPages="false" generateModelWizard="false"
-      extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="editor.ecore#/">
-    <genClasses ecoreClass="editor.ecore#//Dummy"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
deleted file mode 100644
index cdaf64e14a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = CDO UI (Incubation)
-providerName = Eclipse.org
-
-_UI_CreateChild_menu_item = &New Child
-_UI_CreateSibling_menu_item = N&ew Sibling
-
_UI_ShowPropertiesView_menu_item = Show &Properties View
-_UI_RefreshViewer_menu_item = &Refresh
-
_UI_SelectionPage_label = Selection
-
_UI_NoObjectSelected = Selected Nothing
-_UI_SingleObjectSelected = Selected Object: {0}
-_UI_MultiObjectSelected = Selected {0} Objects
-
_UI_OpenEditorError_label = Open Editor
-
_UI_Wizard_category = Example EMF Model Creation Wizards
-
_UI_CreateModelError_message = Problems encountered in file "{0}"
-
_UI_Wizard_label = New
-
_WARN_FilenameExtension = The file name must end in ".{0}"
-
_UI_ModelObject = Model Object
-_UI_XMLEncoding = XML Encoding
-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
-_UI_Wizard_initial_object_description = Select a model object to create
-
_UI_FileConflict_label = File Conflict
-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
-
-_UI_EditorEditor_menu = &Editor Editor
-
_UI_ParentPage_label = Parent
-_UI_ListPage_label = List
-_UI_TreePage_label = Tree
-_UI_TablePage_label = Table
-_UI_TreeWithColumnsPage_label = Tree with Columns
-_UI_ObjectColumn_label = Object
-_UI_SelfColumn_label = Self
-
_UI_EditorModelWizard_label = Editor Model
-_UI_EditorModelWizard_description = Create a new Editor model
-
_UI_EditorEditor_label = Editor Model Editor
-
_UI_EditorEditorFilenameDefaultBase = My
-_UI_EditorEditorFilenameExtension = editor
-
-_UI_CDOEditor_menu = &CDO Editor
-
_UI_CDOModelWizard_label = CDO Model
-_UI_CDOModelWizard_description = Create a new CDO model
-
_UI_CDOEditor_label = CDO Model Editor
-
_UI_CDOEditorFilenameDefaultBase = My
-_UI_CDOEditorFilenameExtension = cdo
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
deleted file mode 100644
index 87fc2fb68f..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-<!--
-  <extension point="org.eclipse.net4j.util.elementProcessors">
-     <elementProcessor class="org.eclipse.emf.cdo.protocol.util.CDOGZIPStreamWrapperInjector"/>
-  </extension>
--->
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            id="org.eclipse.emf.cdo"
-            name="CDO">
-      </category>
-      <view
-            category="org.eclipse.emf.cdo"
-            class="org.eclipse.emf.cdo.internal.ui.views.CDOSessionsView"
-            icon="icons/full/view16/cdo_sessions.gif"
-            id="org.eclipse.emf.cdo.CDOSessionsView"
-            name="CDO Sessions">
-      </view>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.ui.resourcePerspective">
-         <view
-               id="org.eclipse.emf.cdo.CDOSessionsView"
-               ratio="0.2"
-               relationship="bottom"
-               relative="org.eclipse.ui.views.ResourceNavigator">
-         </view>
-      </perspectiveExtension>
-   </extension>
-   
-  <extension point = "org.eclipse.ui.editors">
-    <editor
-        id = "org.eclipse.emf.cdo.ui.CDOEditor"
-        name = "CDO Editor"
-        icon = "icons/full/obj16/cdo_editor.gif"
-        extensions = "*"
-        class = "org.eclipse.emf.cdo.internal.ui.editor.CDOEditor" 
-        contributorClass="org.eclipse.emf.cdo.internal.ui.editor.CDOActionBarContributor" >
-    </editor>
-  </extension>
-  
-  <extension
-        point="org.eclipse.ui.preferencePages">
-     <page
-           class="org.eclipse.emf.cdo.internal.ui.preferences.CDOPreferencePage"
-           id="org.eclipse.emf.cdo.ui.CDOPreferencePage"
-           name="CDO">
-     </page>
-     <page
-           category="org.eclipse.emf.cdo.ui.CDOPreferencePage"
-           class="org.eclipse.emf.cdo.internal.ui.preferences.CDOUIPreferencePage"
-           id="org.eclipse.emf.cdo.ui.CDOUIPreferencePage"
-           name="User Interface">
-     </page>
-  </extension>
-  
-</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
deleted file mode 100644
index 6229b17686..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-
-import org.eclipse.emf.internal.cdo.InternalCDOObject;
-import org.eclipse.emf.internal.cdo.util.FSMUtil;
-
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.widgets.TreeItem;
-
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ItemsProcessor
-{
-  private CDOView view;
-
-  public ItemsProcessor(CDOView view)
-  {
-    this.view = view;
-  }
-
-  public CDOView getView()
-  {
-    return view;
-  }
-
-  public void processCDOObjects(TreeViewer viewer)
-  {
-    processCDOObjects(viewer, null);
-  }
-
-  public void processCDOObjects(final TreeViewer viewer, final Set<CDOID> ids)
-  {
-    try
-    {
-      viewer.getControl().getDisplay().syncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            processObject(viewer, ids, viewer.getInput());
-            processItems(viewer, ids, viewer.getTree().getItems());
-          }
-          catch (Exception ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (Exception ignore)
-    {
-    }
-  }
-
-  protected InternalCDOObject getCDOObject(Object object)
-  {
-    if (object instanceof InternalCDOObject)
-    {
-      return (InternalCDOObject)object;
-    }
-
-    if (object != null && view != null)
-    {
-      return FSMUtil.adapt(object, view);
-    }
-
-    return null;
-  }
-
-  protected abstract void processCDOObject(TreeViewer viewer, InternalCDOObject cdoObject);
-
-  private void processItems(TreeViewer viewer, Set<CDOID> ids, TreeItem[] items)
-  {
-    for (TreeItem item : items)
-    {
-      Object object = item.getData();
-      processObject(viewer, ids, object);
-      if (item.getItemCount() != 0)
-      {
-        processItems(viewer, ids, item.getItems());
-      }
-    }
-  }
-
-  private void processObject(TreeViewer viewer, Set<CDOID> ids, Object object)
-  {
-    InternalCDOObject cdoObject = getCDOObject(object);
-    if (cdoObject != null)
-    {
-      if (ids == null || ids.contains(cdoObject.cdoID()))
-      {
-        processCDOObject(viewer, cdoObject);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java
deleted file mode 100644
index e5ccfa98b9..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SharedIcons.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui;
-
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class SharedIcons
-{
-  private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
-
-  private static final String ETOOL = "etool16/";
-
-  private static final String OBJ = "obj16/";
-
-  private static final String VIEW = "view16/";
-
-  private static final String WIZBAN = "wizban/";
-
-  public static final String ETOOL_OPEN_SESSION = ETOOL + "open_session";
-
-  public static final String ETOOL_OPEN_EDITOR = ETOOL + "open_editor";
-
-  public static final String OBJ_SESSION = OBJ + "cdo_session";
-
-  public static final String OBJ_EDITOR = OBJ + "cdo_editor";
-
-  public static final String OBJ_EDITOR_READWRITE = OBJ + "cdo_editor_readwrite";
-
-  public static final String OBJ_EDITOR_READONLY = OBJ + "cdo_editor_readonly";
-
-  public static final String OBJ_EDITOR_HISTORICAL = OBJ + "cdo_editor_historical";
-
-  public static final String OBJ_EPACKAGE = OBJ + "EPackage";
-
-  public static final String OBJ_EPACKAGE_CONVERTED = OBJ + "EPackageConverted";
-
-  public static final String OBJ_EPACKAGE_LEGACY = OBJ + "EPackageLegacy";
-
-  public static final String OBJ_EPACKAGE_NATIVE = OBJ + "EPackageNative";
-
-  public static final String OBJ_ECLASS = OBJ + "EClass";
-
-  public static final String VIEW_SESSIONS = VIEW + "cdo_sessions";
-
-  public static final String WIZBAN_PACKAGE_MANAGER = WIZBAN + "PackageManager";
-
-  public static Image getImage(String key)
-  {
-    key = mangleKey(key);
-    Image image = REGISTRY.get(key);
-    if (image == null)
-    {
-      createDescriptor(key);
-      image = REGISTRY.get(key);
-    }
-
-    return image;
-  }
-
-  public static ImageDescriptor getDescriptor(String key)
-  {
-    key = mangleKey(key);
-    ImageDescriptor descriptor = REGISTRY.getDescriptor(key);
-    if (descriptor == null)
-    {
-      descriptor = createDescriptor(key);
-    }
-
-    return descriptor;
-  }
-
-  private static ImageDescriptor createDescriptor(String key)
-  {
-    ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
-    if (descriptor != null)
-    {
-      REGISTRY.put(key, descriptor);
-    }
-
-    return descriptor;
-  }
-
-  private static Display getDisplay()
-  {
-    Display display = Display.getCurrent();
-    if (display == null)
-    {
-      display = Display.getDefault();
-    }
-
-    if (display == null)
-    {
-      throw new IllegalStateException("display == null");
-    }
-
-    return display;
-  }
-
-  private static String mangleKey(String key)
-  {
-    return "icons/full/" + key + ".gif";
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
deleted file mode 100644
index a08c6c709a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractOpenViewAction extends SessionAction
-{
-  public AbstractOpenViewAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOSession session)
-  {
-    super(page, text, toolTipText, image, session);
-  }
-
-  @Override
-  public boolean isEnabled()
-  {
-    return !getSession().getPackageRegistry().isEmpty() && super.isEnabled();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
deleted file mode 100644
index cd120f46da..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class CloseSessionAction extends SessionAction
-{
-  private static final String TITLE = "Close";
-
-  private static final String TOOL_TIP = "Close the CDO session";
-
-  public CloseSessionAction(IWorkbenchPage page, CDOSession session)
-  {
-    super(page, TITLE, TOOL_TIP, null, session);
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    getSession().close();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
deleted file mode 100644
index f4d86dca2e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOView;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class CloseViewAction extends ViewAction
-{
-  private static final String TITLE = "Close";
-
-  private static final String TOOL_TIP = "Close the CDO view";
-
-  public CloseViewAction(IWorkbenchPage page, CDOView view)
-  {
-    super(page, TITLE, TOOL_TIP, null, view);
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    getView().close();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java
deleted file mode 100644
index e960f7da6b..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOView;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class CommitTransactionAction extends ViewAction
-{
-  private static final String TITLE = "Commit";
-
-  private static final String TOOL_TIP = "Commit this transaction";
-
-  public CommitTransactionAction(IWorkbenchPage page, CDOView view)
-  {
-    super(page, TITLE, TOOL_TIP, null, view);
-    setEnabled(getTransaction().isDirty());
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    getTransaction().commit();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java
deleted file mode 100644
index e99ae6cd39..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
-
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class CreateResourceAction extends ViewAction
-{
-  private static final String TITLE = "Create Resource";
-
-  private static final String TOOL_TIP = "Create a CDO resource";
-
-  private String resourcePath;
-
-  public CreateResourceAction(IWorkbenchPage page, CDOView view)
-  {
-    super(page, TITLE + INTERACTIVE, TOOL_TIP, null, view);
-  }
-
-  @Override
-  protected void preRun() throws Exception
-  {
-    InputDialog dialog = new InputDialog(getShell(), TITLE, "Enter resource path:", "/res"
-        + (ViewAction.lastResourceNumber + 1), null);
-    if (dialog.open() == InputDialog.OK)
-    {
-      ++ViewAction.lastResourceNumber;
-      resourcePath = dialog.getValue();
-    }
-    else
-    {
-      cancel();
-    }
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    getTransaction().createResource(resourcePath);
-    CDOEditor.open(getPage(), getView(), resourcePath);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java
deleted file mode 100644
index 052ff16910..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Eike Stepper
- * @ADDED
- */
-public abstract class EditingDomainAction extends LongRunningAction
-{
-  protected EditingDomain editingDomain;
-
-  public EditingDomainAction(String text, ImageDescriptor image)
-  {
-    super(text, image);
-  }
-
-  public EditingDomainAction(String text, int style)
-  {
-    super(text, style);
-  }
-
-  public EditingDomainAction(String text, String toolTipText, ImageDescriptor image)
-  {
-    super(text, toolTipText, image);
-  }
-
-  public EditingDomainAction(String text, String toolTipText)
-  {
-    super(text, toolTipText);
-  }
-
-  public EditingDomainAction(String text)
-  {
-    super(text);
-  }
-
-  public EditingDomain getEditingDomain()
-  {
-    return editingDomain;
-  }
-
-  public void setEditingDomain(EditingDomain editingDomain)
-  {
-    this.editingDomain = editingDomain;
-  }
-
-  public void setActiveWorkbenchPart(IWorkbenchPart workbenchPart)
-  {
-    setPage(workbenchPart == null ? null : workbenchPart.getSite().getPage());
-    setEditingDomain(workbenchPart instanceof IEditingDomainProvider ? ((IEditingDomainProvider)workbenchPart)
-        .getEditingDomain() : null);
-  }
-
-  public void update()
-  {
-    setEnabled(editingDomain != null);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java
deleted file mode 100644
index 8eb83a1593..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory;
-
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public abstract class EntryAction extends LongRunningAction
-{
-  private CDOViewHistory.Entry entry;
-
-  public EntryAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOViewHistory.Entry entry)
-  {
-    super(page, text, toolTipText, image);
-    this.entry = entry;
-  }
-
-  public CDOViewHistory.Entry getEntry()
-  {
-    return entry;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
deleted file mode 100644
index f8ab70255c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-/**
- * @author Eike Stepper
- */
-@Deprecated
-public class ExportResourceAction extends EditingDomainAction
-{
-  public static final String ID = "export-resource";
-
-  private static final String TITLE = "Export Resource";
-
-  public ExportResourceAction()
-  {
-    super(TITLE + INTERACTIVE);
-    setId(ID);
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
deleted file mode 100644
index b14341e54d..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOTransaction;
-import org.eclipse.emf.cdo.CDOView;
-
-import org.eclipse.emf.common.ui.dialogs.ResourceDialog;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class ImportResourceAction extends ViewAction
-{
-  public static final String ID = "import-resource";
-
-  private static final String TITLE = "Import Resource";
-
-  private URI sourceURI;
-
-  private String targetPath;
-
-  public ImportResourceAction(IWorkbenchPage page, CDOView view)
-  {
-    super(page, TITLE + INTERACTIVE, "Import a CDO resource", null, view);
-    setId(ID);
-  }
-
-  @Override
-  protected void preRun() throws Exception
-  {
-    ImportResourceDialog dialog = new ImportResourceDialog(getShell(), TITLE, SWT.OPEN);
-    if (dialog.open() == ImportResourceDialog.OK)
-    {
-      List<URI> uris = dialog.getURIs();
-      if (uris.size() == 1)
-      {
-        sourceURI = uris.get(0);
-        targetPath = dialog.getTargetPath();
-      }
-      else
-      {
-        MessageDialog.openError(getShell(), TITLE, "A single URI must be entered!");
-        cancel();
-      }
-    }
-    else
-    {
-      cancel();
-    }
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    CDOTransaction transaction = getTransaction();
-
-    // Source ResourceSet
-    ResourceSet sourceSet = new ResourceSetImpl();
-    Map<String, Object> map = sourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();
-    map.put("*", new XMIResourceFactoryImpl());
-    sourceSet.setPackageRegistry(transaction.getSession().getPackageRegistry());
-
-    // Source Resource
-    Resource source = sourceSet.getResource(sourceURI, true);
-    List<EObject> sourceContents = new ArrayList<EObject>(source.getContents());
-
-    // Target Resource
-    Resource target = transaction.createResource(targetPath);
-    EList<EObject> targetContents = target.getContents();
-
-    // Move contents over
-    for (EObject root : sourceContents)
-    {
-      targetContents.add(root);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class ImportResourceDialog extends ResourceDialog
-  {
-    private String targetPath = "/";
-
-    private Text targetText;
-
-    public ImportResourceDialog(Shell parent, String title, int style)
-    {
-      super(parent, title, style);
-    }
-
-    public String getTargetPath()
-    {
-      return targetPath;
-    }
-
-    public void setTargetPath(String targetPath)
-    {
-      this.targetPath = targetPath;
-    }
-
-    @Override
-    protected Control createDialogArea(Composite parent)
-    {
-      Composite composite = (Composite)super.createDialogArea(parent);
-
-      Label separatorLabel1 = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
-      {
-        FormData data = new FormData();
-        data.top = new FormAttachment(uriField, (int)(1.5 * CONTROL_OFFSET));
-        data.left = new FormAttachment(0, -CONTROL_OFFSET);
-        data.right = new FormAttachment(100, CONTROL_OFFSET);
-        separatorLabel1.setLayoutData(data);
-      }
-
-      Label label = new Label(composite, SWT.NONE);
-      label.setText("Target path:");
-      {
-        FormData data = new FormData();
-        data.top = new FormAttachment(separatorLabel1, CONTROL_OFFSET);
-        data.left = new FormAttachment(0, CONTROL_OFFSET);
-        data.right = new FormAttachment(100, -CONTROL_OFFSET);
-        label.setLayoutData(data);
-      }
-
-      targetText = new Text(composite, SWT.BORDER);
-      {
-        FormData data = new FormData();
-        data.top = new FormAttachment(label, CONTROL_OFFSET);
-        data.left = new FormAttachment(0, CONTROL_OFFSET);
-        data.right = new FormAttachment(100, -CONTROL_OFFSET);
-        targetText.setLayoutData(data);
-        targetText.setText(targetPath);
-        targetText.addModifyListener(new ModifyListener()
-        {
-          public void modifyText(ModifyEvent e)
-          {
-            targetPath = targetText.getText();
-          }
-        });
-      }
-
-      Label separatorLabel2 = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
-      {
-        FormData data = new FormData();
-        data.top = new FormAttachment(targetText, (int)(1.5 * CONTROL_OFFSET));
-        data.left = new FormAttachment(0, -CONTROL_OFFSET);
-        data.right = new FormAttachment(100, CONTROL_OFFSET);
-        separatorLabel2.setLayoutData(data);
-      }
-
-      return composite;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
deleted file mode 100644
index 2481c21c10..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.util.CDOPackageRegistry;
-
-import org.eclipse.emf.common.ui.dialogs.ResourceDialog;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.swt.SWT;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class ImportRootsAction extends EditingDomainAction
-{
-  public static final String ID = "import-roots";
-
-  private static final String TITLE = "Import Roots";
-
-  private CDOResource targetResource;
-
-  private transient List<URI> uris;
-
-  public ImportRootsAction()
-  {
-    super(TITLE + INTERACTIVE);
-    setId(ID);
-  }
-
-  public CDOResource getTargetResource()
-  {
-    return targetResource;
-  }
-
-  public void setTargetResource(CDOResource targetResource)
-  {
-    this.targetResource = targetResource;
-  }
-
-  @Override
-  public boolean isEnabled()
-  {
-    return targetResource != null && super.isEnabled();
-  }
-
-  @Override
-  protected void preRun() throws Exception
-  {
-    ResourceDialog dialog = new ResourceDialog(getShell(), TITLE, SWT.OPEN | SWT.MULTI)
-    {
-      @Override
-      protected boolean processResources()
-      {
-        return true;
-      }
-    };
-
-    if (dialog.open() == ResourceDialog.OK)
-    {
-      uris = dialog.getURIs();
-    }
-    else
-    {
-      cancel();
-    }
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    EList<EObject> targetContents = targetResource.getContents();
-    List<Resource> resources = getSourceResources();
-    for (Resource resource : resources)
-    {
-      List<EObject> contents = new ArrayList<EObject>(resource.getContents());
-      for (EObject root : contents)
-      {
-        targetContents.add(root);
-      }
-    }
-  }
-
-  protected List<Resource> getSourceResources()
-  {
-    ResourceSetImpl resourceSet = createSourceResourceSet();
-    List<Resource> resources = new ArrayList<Resource>(uris.size());
-    for (URI uri : uris)
-    {
-      Resource resource = resourceSet.getResource(uri, true);
-      resources.add(resource);
-    }
-
-    return resources;
-  }
-
-  protected ResourceSetImpl createSourceResourceSet()
-  {
-    CDOView view = targetResource.cdoView();
-    CDOSession session = view.getSession();
-    CDOPackageRegistry packageRegistry = session.getPackageRegistry();
-
-    ResourceSetImpl resourceSet = new ResourceSetImpl();
-    resourceSet.setPackageRegistry(packageRegistry);
-    return resourceSet;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java
deleted file mode 100644
index 95208cbc87..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
-
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class LoadResourceAction extends ViewAction
-{
-  private static final String TITLE = "Load Resource";
-
-  private String resourcePath;
-
-  public LoadResourceAction(IWorkbenchPage page, CDOView view)
-  {
-    super(page, TITLE + INTERACTIVE, "Load a CDO resource", null, view);
-  }
-
-  @Override
-  protected void preRun() throws Exception
-  {
-    String uri = ViewAction.lastResourceNumber == 0 ? "" : "/res" + ViewAction.lastResourceNumber;
-    InputDialog dialog = new InputDialog(getShell(), TITLE, "Enter resource path:", uri, null);
-    if (dialog.open() == InputDialog.OK)
-    {
-      resourcePath = dialog.getValue();
-    }
-    else
-    {
-      cancel();
-    }
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    CDOEditor.open(getPage(), getView(), resourcePath);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java
deleted file mode 100644
index c591936c53..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.dialogs.PackageManagerDialog;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public class ManagePackagesAction extends SessionAction
-{
-  private static final String TITLE = "Package Manager";
-
-  private static final String TOOL_TIP = "Browse and install model packages";
-
-  public ManagePackagesAction(IWorkbenchPage page, CDOSession session)
-  {
-    super(page, TITLE + INTERACTIVE, TOOL_TIP, null, session);
-  }
-
-  @Override
-  protected void preRun() throws Exception
-  {
-    PackageManagerDialog dialog = new PackageManagerDialog(getPage(), getSession());
-    dialog.open();
-    cancel();
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
deleted file mode 100644
index 9b2a6dad99..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-import org.eclipse.emf.cdo.internal.ui.dialogs.OpenAuditDialog;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class OpenAuditAction extends AbstractOpenViewAction
-{
-  private static final String TITLE = "Open Audit";
-
-  private static final String TOOL_TIP = "Open a historical CDO view";
-
-  private long timeStamp;
-
-  public OpenAuditAction(IWorkbenchPage page, CDOSession session)
-  {
-    super(page, TITLE + INTERACTIVE, TOOL_TIP, SharedIcons.getDescriptor(SharedIcons.ETOOL_OPEN_EDITOR), session);
-  }
-
-  @Override
-  protected void preRun() throws Exception
-  {
-    OpenAuditDialog dialog = new OpenAuditDialog(getPage());
-    if (dialog.open() == OpenAuditDialog.OK)
-    {
-      timeStamp = dialog.getTimeStamp();
-    }
-    else
-    {
-      cancel();
-    }
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    getSession().openAudit(new ResourceSetImpl(), timeStamp);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
deleted file mode 100644
index 0ce2887973..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class OpenResourceEditorAction extends EntryAction
-{
-  private static final String TITLE = "Open Editor";
-
-  private static final String TOOL_TIP = "Open a CDO editor for this resource";
-
-  public OpenResourceEditorAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOViewHistory.Entry entry)
-  {
-    super(page, TITLE, TOOL_TIP, null, entry);
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    CDOView view = getEntry().getView();
-    String resourcePath = getEntry().getResourcePath();
-    CDOEditor.open(getPage(), view, resourcePath);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
deleted file mode 100644
index d73923a829..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-import org.eclipse.emf.cdo.internal.ui.dialogs.OpenSessionDialog;
-import org.eclipse.emf.cdo.internal.ui.views.CDOSessionsView;
-import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
-
-import org.eclipse.emf.internal.cdo.CDOSessionFactory;
-
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class OpenSessionAction extends LongRunningAction
-{
-  private static final String TITLE = OpenSessionDialog.TITLE;
-
-  private static final String TOOL_TIP = "Open a new CDO session";
-
-  private String description;
-
-  public OpenSessionAction(IWorkbenchPage page)
-  {
-    super(page, TITLE + INTERACTIVE, TOOL_TIP, CDOSessionsView.getAddImageDescriptor());
-  }
-
-  @Override
-  protected void preRun() throws Exception
-  {
-    OpenSessionDialog dialog = new OpenSessionDialog(getPage());
-    if (dialog.open() == OpenSessionDialog.OK)
-    {
-      description = dialog.getServerDescription() + "/" + dialog.getRepositoryName();
-      StringBuilder builder = new StringBuilder();
-      if (dialog.isAutomaticPackageRegistry())
-      {
-        builder.append("automaticPackageRegistry=true");
-      }
-
-      if (!dialog.isLegacyModelSupport())
-      {
-        if (builder.length() != 0)
-        {
-          builder.append("&");
-        }
-
-        builder.append("disableLegacyObjects=true");
-      }
-
-      if (builder.length() != 0)
-      {
-        description += "?" + builder;
-      }
-    }
-    else
-    {
-      cancel();
-    }
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    CDOSession session = null;
-
-    try
-    {
-      String productGroup = CDOSessionFactory.PRODUCT_GROUP;
-      String type = CDOProtocolConstants.PROTOCOL_NAME;
-      session = (CDOSession)IPluginContainer.INSTANCE.getElement(productGroup, type, description);
-    }
-    catch (RuntimeException ex)
-    {
-      OM.LOG.error(ex);
-    }
-
-    if (session == null)
-    {
-      try
-      {
-        getShell().getDisplay().syncExec(new Runnable()
-        {
-          public void run()
-          {
-            try
-            {
-              MessageDialog.openError(getShell(), getText(), "Unable to open a session on the specified repository.\n"
-                  + description);
-            }
-            catch (RuntimeException ignoe)
-            {
-            }
-          }
-        });
-      }
-      catch (RuntimeException ignoe)
-      {
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
deleted file mode 100644
index ff7729e30c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class OpenTransactionAction extends AbstractOpenViewAction
-{
-  private static final String TITLE = "Open Transaction";
-
-  private static final String TOOL_TIP = "Open a read-write CDO view";
-
-  public OpenTransactionAction(IWorkbenchPage page, CDOSession session)
-  {
-    super(page, TITLE, TOOL_TIP, SharedIcons.getDescriptor(SharedIcons.ETOOL_OPEN_EDITOR), session);
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    getSession().openTransaction();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
deleted file mode 100644
index 1e77c62159..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class OpenViewAction extends AbstractOpenViewAction
-{
-  private static final String TITLE = "Open View";
-
-  private static final String TOOL_TIP = "Open a read-only CDO view";
-
-  public OpenViewAction(IWorkbenchPage page, CDOSession session)
-  {
-    super(page, TITLE, TOOL_TIP, SharedIcons.getDescriptor(SharedIcons.ETOOL_OPEN_EDITOR), session);
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    getSession().openView(new ResourceSetImpl());
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java
deleted file mode 100644
index 03e7be5e00..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class OpenViewEditorAction extends ViewAction
-{
-  private static final String TITLE = "Open Editor";
-
-  private static final String TOOL_TIP = "Open a CDO editor for this view";
-
-  public OpenViewEditorAction(IWorkbenchPage page, CDOView view)
-  {
-    super(page, TITLE, TOOL_TIP, null, view);
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    CDOEditor.open(getPage(), getView(), null);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
deleted file mode 100644
index 056ba8f6f6..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.util.EMFUtil;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class RegisterFilesystemPackagesAction extends RegisterPackagesAction
-{
-  private static final String TITLE = "Register Filesystem Packages";
-
-  private static final String TOOL_TIP = "Register dynamic packages from the filesystem";
-
-  private static final String[] FILTER_NAMES = { "Ecore models (*.ecore)", "XMI files (*.xmi)", "XML files (*.xml)",
-      "All files (*.*)" };
-
-  private static final String[] FILTER_EXTENSIONS = { "ecore", "xmi", "xml", null };
-
-  public RegisterFilesystemPackagesAction(IWorkbenchPage page, CDOSession session)
-  {
-    super(page, TITLE, TOOL_TIP, null, session);
-  }
-
-  @Override
-  protected List<EPackage> getEPackages(IWorkbenchPage page, CDOSession session)
-  {
-    Shell shell = page.getWorkbenchWindow().getShell();
-    FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI);
-    dialog.setFileName("*.ecore");
-    dialog.setFilterNames(FILTER_NAMES);
-    dialog.setFilterExtensions(FILTER_EXTENSIONS);
-    if (dialog.open() != null)
-    {
-      String filterPath = dialog.getFilterPath();
-      String[] fileNames = dialog.getFileNames();
-      if (fileNames != null && fileNames.length != 0)
-      {
-        ResourceSet resourceSet = EMFUtil.newEcoreResourceSet();
-        List<EPackage> ePackages = new ArrayList<EPackage>(fileNames.length);
-        for (String fileName : fileNames)
-        {
-          String path = filterPath + File.separator + fileName;
-          URI uri = URI.createFileURI(path);
-          Resource resource = resourceSet.getResource(uri, true);
-          EPackage ePackage = (EPackage)resource.getContents().get(0);
-          ePackages.add(ePackage);
-        }
-
-        return ePackages;
-      }
-    }
-
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
deleted file mode 100644
index 9aed0b080a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-import org.eclipse.emf.cdo.internal.ui.dialogs.SelectPackageDialog;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
-{
-  private static final String TITLE = "Register Generated Packages";
-
-  private static final String TOOL_TIP = "Register native, legacy or converted packages";
-
-  private EPackage.Registry registry = EPackage.Registry.INSTANCE;
-
-  public RegisterGeneratedPackagesAction(IWorkbenchPage page, CDOSession session)
-  {
-    super(page, TITLE, TOOL_TIP, null, session);
-  }
-
-  @Override
-  protected List<EPackage> getEPackages(IWorkbenchPage page, CDOSession session)
-  {
-    Shell shell = page.getWorkbenchWindow().getShell();
-    SelectPackageDialog dialog = new SelectPackageDialog(shell, "Generated Packages",
-        "Select one or more packages for registration with the CDO package registry", session.getPackageRegistry()
-            .keySet());
-
-    if (dialog.open() == SelectPackageDialog.OK)
-    {
-      Set<String> checkedURIs = dialog.getCheckedURIs();
-      List<EPackage> ePackages = new ArrayList<EPackage>(checkedURIs.size());
-      for (String uri : checkedURIs)
-      {
-        try
-        {
-          EPackage ePackage = registry.getEPackage(uri);
-          ePackages.add(ePackage);
-        }
-        catch (RuntimeException ex)
-        {
-          OM.LOG.error(ex);
-        }
-      }
-
-      return ePackages;
-    }
-
-    return null;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class EPackageFactoryValidator implements IInputValidator
-  {
-    public String isValid(String uri)
-    {
-      if (uri == null || uri.length() == 0)
-      {
-        return "";
-      }
-
-      return registry.containsKey(uri) ? null : "Package " + uri + " not found.";
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
deleted file mode 100644
index f7c7084103..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-import org.eclipse.emf.cdo.util.CDOPackageRegistry;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public abstract class RegisterPackagesAction extends SessionAction
-{
-  private List<EPackage> ePackages;
-
-  private int errors;
-
-  public RegisterPackagesAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image,
-      CDOSession session)
-  {
-    super(page, text, toolTipText, image, session);
-  }
-
-  @Override
-  protected void preRun() throws Exception
-  {
-    ePackages = getEPackages(getPage(), getSession());
-    if (ePackages == null)
-    {
-      cancel();
-    }
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    errors = 0;
-    CDOPackageRegistry packageRegistry = getSession().getPackageRegistry();
-    for (EPackage ePackage : ePackages)
-    {
-      Resource resource = ePackage.eResource();
-      URI uri = resource == null ? null : resource.getURI();
-
-      try
-      {
-        packageRegistry.putEPackage(ePackage);
-      }
-      catch (RuntimeException ex)
-      {
-        ++errors;
-        if (uri == null)
-        {
-          OM.LOG.error(ex);
-        }
-        else
-        {
-          OM.LOG.error("Failed to register package " + uri, ex);
-        }
-      }
-    }
-
-    postRegistration(ePackages);
-    if (errors != 0)
-    {
-      final String label = String.valueOf(errors) + (errors == 1 ? " package has" : " packages have");
-      final Shell shell = getShell();
-      shell.getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          MessageDialog.openError(shell, getText(), label
-              + " not been registered due to errors.\nSee the log for details.");
-        }
-      });
-    }
-  }
-
-  protected void postRegistration(List<EPackage> ePackages)
-  {
-  }
-
-  protected abstract List<EPackage> getEPackages(IWorkbenchPage page, CDOSession session);
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
deleted file mode 100644
index fa3d5db48c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-import org.eclipse.emf.cdo.util.CDOPackageType;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class RegisterSinglePackageAction extends RegisterPackagesAction
-{
-  private String packageURI;
-
-  private EPackage.Registry registry = EPackage.Registry.INSTANCE;
-
-  public RegisterSinglePackageAction(IWorkbenchPage page, CDOSession session, String packageURI,
-      CDOPackageType packageType)
-  {
-    super(page, packageURI, "Register the package " + packageURI, getDescriptor(packageType), session);
-    this.packageURI = packageURI;
-  }
-
-  @Override
-  protected List<EPackage> getEPackages(IWorkbenchPage page, CDOSession session)
-  {
-    EPackage ePackage = registry.getEPackage(packageURI);
-    if (ePackage != null)
-    {
-      return Collections.singletonList(ePackage);
-    }
-
-    return Collections.emptyList();
-  }
-
-  private static ImageDescriptor getDescriptor(CDOPackageType packageType)
-  {
-    switch (packageType)
-    {
-    case CONVERTED:
-      return SharedIcons.getDescriptor(SharedIcons.OBJ_EPACKAGE_CONVERTED);
-
-    case LEGACY:
-      return SharedIcons.getDescriptor(SharedIcons.OBJ_EPACKAGE_LEGACY);
-
-    case NATIVE:
-      return SharedIcons.getDescriptor(SharedIcons.OBJ_EPACKAGE_NATIVE);
-
-    default:
-      return null;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java
deleted file mode 100644
index 13b6f7f83c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.dialogs.OpenResourcesDialog;
-import org.eclipse.emf.cdo.util.EMFUtil;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class RegisterWorkspacePackagesAction extends RegisterPackagesAction
-{
-  private static final String TITLE = "Register Workspace Packages";
-
-  private static final String TOOL_TIP = "Register dynamic packages from the workspace";
-
-  public RegisterWorkspacePackagesAction(IWorkbenchPage page, CDOSession session)
-  {
-    super(page, TITLE, TOOL_TIP, null, session);
-  }
-
-  @Override
-  protected List<EPackage> getEPackages(IWorkbenchPage page, CDOSession session)
-  {
-    Shell shell = page.getWorkbenchWindow().getShell();
-    OpenResourcesDialog dialog = new OpenResourcesDialog(shell);
-    if (dialog.open() == OpenResourcesDialog.OK)
-    {
-      Object[] result = dialog.getResult();
-      if (result != null && result.length != 0)
-      {
-        ResourceSet resourceSet = EMFUtil.newEcoreResourceSet();
-        List<EPackage> ePackages = new ArrayList<EPackage>(result.length);
-        for (Object object : result)
-        {
-          if (object instanceof IFile)
-          {
-            IFile file = (IFile)object;
-            URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
-            Resource resource = resourceSet.getResource(uri, true);
-            EPackage ePackage = (EPackage)resource.getContents().get(0);
-            ePackages.add(ePackage);
-          }
-        }
-
-        return ePackages;
-      }
-    }
-
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java
deleted file mode 100644
index cbabbc30f7..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
-
-import org.eclipse.emf.internal.cdo.CDOStateMachine;
-import org.eclipse.emf.internal.cdo.InternalCDOObject;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class ReloadObjectsAction extends EditingDomainAction
-{
-  public static final String ID = "reload-objects";
-
-  private static final String TITLE = "Reload";
-
-  private List<InternalCDOObject> objects = new ArrayList<InternalCDOObject>();
-
-  public ReloadObjectsAction()
-  {
-    super(TITLE);
-    setId(ID);
-  }
-
-  public void selectionChanged(IStructuredSelection selection)
-  {
-    objects.clear();
-    if (selection != null)
-    {
-      for (Iterator<?> it = selection.iterator(); it.hasNext();)
-      {
-        Object object = it.next();
-        if (object instanceof InternalCDOObject)
-        {
-          objects.add((InternalCDOObject)object);
-        }
-      }
-    }
-
-    update();
-  }
-
-  @Override
-  public void update()
-  {
-    setEnabled(!objects.isEmpty());
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    if (!objects.isEmpty())
-    {
-      InternalCDOObject[] array = objects.toArray(new InternalCDOObject[objects.size()]);
-
-      CDOStateMachine.INSTANCE.reload(array);
-
-      IWorkbenchPage page = getPage();
-      if (page != null)
-      {
-        CDOView view = array[0].cdoView();
-        CDOEditor.refresh(page, view);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java
deleted file mode 100644
index ab9c6dff45..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class ReloadViewAction extends ViewAction
-{
-  private static final String TITLE = "Reload";
-
-  private static final String TOOL_TIP = "Reload this view";
-
-  public ReloadViewAction(IWorkbenchPage page, CDOView view)
-  {
-    super(page, TITLE, TOOL_TIP, null, view);
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    if (getView().reload() != 0)
-    {
-      CDOEditor.refresh(getPage(), getView());
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java
deleted file mode 100644
index c1c135ea2a..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOTransaction;
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.dialogs.RollbackTransactionDialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public final class RollbackTransactionAction extends ViewAction
-{
-  private static final String TITLE = "Rollback";
-
-  private static final String TOOL_TIP = "Rollback this transaction";
-
-  private boolean remote;
-
-  public RollbackTransactionAction(IWorkbenchPage page, CDOView view)
-  {
-    super(page, TITLE + INTERACTIVE, TOOL_TIP, null, view);
-    setEnabled(getTransaction().isDirty());
-  }
-
-  @Override
-  protected void preRun() throws Exception
-  {
-    CDOTransaction transaction = (CDOTransaction)getView();
-    Dialog dialog = new RollbackTransactionDialog(getPage(), TITLE, "Choose how to rollback this transaction.",
-        transaction);
-    switch (dialog.open())
-    {
-    case RollbackTransactionDialog.REMOTE:
-      remote = true;
-      break;
-    case RollbackTransactionDialog.LOCAL:
-      remote = false;
-      break;
-    default:
-      cancel();
-      break;
-    }
-  }
-
-  @Override
-  protected void doRun() throws Exception
-  {
-    getTransaction().rollback(remote);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java
deleted file mode 100644
index 99debcf1cf..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOSession;
-
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public abstract class SessionAction extends LongRunningAction
-{
-  private CDOSession session;
-
-  public SessionAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image, CDOSession session)
-  {
-    super(page, text, toolTipText, image);
-    this.session = session;
-  }
-
-  public CDOSession getSession()
-  {
-    return session;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ViewAction.java
deleted file mode 100644
index 926bd4f88e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ViewAction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.actions;
-
-import org.eclipse.emf.cdo.CDOTransaction;
-import org.eclipse.emf.cdo.CDOView;
-
-import org.eclipse.emf.internal.cdo.CDOViewImpl;
-
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ViewAction extends LongRunningAction
-{
-  protected static int lastResourceNumber = 0;
-
-  private CDOView view;
-
-  public ViewAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image, CDOView view)
-  {
-    super(page, text, toolTipText, image);
-    this.view = view;
-  }
-
-  public CDOView getView()
-  {
-    return view;
-  }
-
-  public CDOTransaction getTransaction()
-  {
-    return ((CDOViewImpl)view).toTransaction();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
deleted file mode 100644
index f5e0adac73..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.bundle;
-
-import org.eclipse.emf.cdo.ui.CDOLabelProvider;
-
-import org.eclipse.net4j.internal.util.security.ResponseNegotiator;
-import org.eclipse.net4j.util.internal.ui.security.InteractiveCredentialsProvider;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-import org.eclipse.net4j.util.om.pref.OMPreferences;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-import org.eclipse.net4j.util.ui.UIActivator;
-
-import org.eclipse.internal.net4j.Net4jTransportInjector;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.emf.cdo.ui"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer TEST = BUNDLE.tracer("test"); //$NON-NLS-1$
-
-  public static final OMTracer TEST_BULK_ADD = TEST.tracer("bulk_add"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  public static final OMPreferences PREFS = BUNDLE.preferences();
-
-  public static final OMPreference<String> PREF_LABEL_DECORATION = //
-  PREFS.init("PREF_LABEL_DECORATION", CDOLabelProvider.DEFAULT_DECORATION); //$NON-NLS-1$
-
-  public static final OMPreference<String[]> PREF_HISTORY_SELECT_PACKAGES = //
-  PREFS.initArray("PREF_HISTORY_SELECT_PACKAGES"); //$NON-NLS-1$
-
-  public static final OMPreference<String[]> PREF_HISTORY_CONNECTORS = //
-  PREFS.initArray("PREF_HISTORY_CONNECTORS"); //$NON-NLS-1$
-
-  public static final OMPreference<String[]> PREF_HISTORY_REPOSITORIES = //
-  PREFS.initArray("PREF_HISTORY_REPOSITORIES"); //$NON-NLS-1$
-
-  public static final OMPreference<Boolean> PREF_AUTOMATIC_PACKAGE_REGISTY = //
-  PREFS.init("PREF_AUTOMATIC_PACKAGE_REGISTY", true); //$NON-NLS-1$
-
-  public static final OMPreference<Boolean> PREF_LEGACY_MODEL_SUPPORT = //
-  PREFS.init("PREF_LEGACY_MODEL_SUPPORT", false); //$NON-NLS-1$
-
-  static void start()
-  {
-    if (false)
-    {
-      try
-      {
-        ResponseNegotiator responseNegotiator = new ResponseNegotiator();
-        responseNegotiator.setCredentialsProvider(new InteractiveCredentialsProvider());
-        responseNegotiator.activate();
-
-        Net4jTransportInjector.clientNegotiator = responseNegotiator;
-      }
-      catch (Exception ex)
-      {
-        LOG.error(ex);
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends UIActivator
-  {
-    public static Activator INSTANCE;
-
-    public Activator()
-    {
-      super(BUNDLE);
-      INSTANCE = this;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java
deleted file mode 100644
index 807f2bf114..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.dialogs;
-
-import org.eclipse.net4j.util.ui.StaticContentProvider;
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class BulkAddDialog extends TitleAreaDialog
-{
-  public static final String TITLE = "Bulk Add";
-
-  private IWorkbenchPage page;
-
-  private List<EReference> features = new ArrayList<EReference>();
-
-  private EReference feature;
-
-  private int instances = 100;
-
-  public BulkAddDialog(IWorkbenchPage page, List<EReference> features)
-  {
-    super(new Shell(page.getWorkbenchWindow().getShell()));
-    setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.MAX | SWT.TITLE | SWT.RESIZE);
-    this.page = page;
-    this.features = features;
-  }
-
-  public IWorkbenchPage getPage()
-  {
-    return page;
-  }
-
-  public List<EReference> getFeatures()
-  {
-    return features;
-  }
-
-  public EReference getFeature()
-  {
-    return feature;
-  }
-
-  public int getInstances()
-  {
-    return instances;
-  }
-
-  @Override
-  protected void configureShell(Shell newShell)
-  {
-    super.configureShell(newShell);
-    newShell.setText(TITLE);
-  }
-
-  @Override
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = new Composite((Composite)super.createDialogArea(parent), SWT.NONE);
-    composite.setLayoutData(UIUtil.createGridData());
-    composite.setLayout(new GridLayout(2, false));
-
-    setTitle("Select a child type and number of child instances");
-
-    Label label = new Label(composite, SWT.NONE);
-    label.setText("Type:");
-    label.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false));
-
-    final TableViewer featureViewer = new TableViewer(composite, SWT.BORDER | SWT.SINGLE);
-    featureViewer.getTable().setLayoutData(UIUtil.createGridData(true, true));
-    featureViewer.setContentProvider(new StaticContentProvider(features));
-    featureViewer.setLabelProvider(new LabelProvider()
-    {
-      @Override
-      public String getText(Object element)
-      {
-        return ((EReference)element).getName();
-      }
-    });
-
-    featureViewer.setInput(features);
-    featureViewer.addSelectionChangedListener(new ISelectionChangedListener()
-    {
-      public void selectionChanged(SelectionChangedEvent event)
-      {
-        IStructuredSelection selection = (IStructuredSelection)featureViewer.getSelection();
-        feature = selection.isEmpty() ? null : (EReference)selection.getFirstElement();
-        dialogChanged();
-      }
-    });
-
-    new Label(composite, SWT.NONE).setText("Instances:");
-    final Text instancesText = new Text(composite, SWT.BORDER);
-    instancesText.setLayoutData(UIUtil.createGridData(true, false));
-    instancesText.setText(String.valueOf(instances));
-    instancesText.addModifyListener(new ModifyListener()
-    {
-      public void modifyText(ModifyEvent e)
-      {
-        try
-        {
-          String text = instancesText.getText();
-          instances = Integer.parseInt(text);
-        }
-        catch (NumberFormatException ex)
-        {
-          instances = 0;
-        }
-
-        dialogChanged();
-      }
-    });
-
-    return composite;
-  }
-
-  @Override
-  protected Control createButtonBar(Composite parent)
-  {
-    try
-    {
-      return super.createButtonBar(parent);
-    }
-    finally
-    {
-      dialogChanged();
-    }
-  }
-
-  protected void dialogChanged()
-  {
-    getButton(IDialogConstants.OK_ID).setEnabled(false);
-    if (feature == null)
-    {
-      setErrorMessage("Select a feature");
-      return;
-    }
-
-    if (instances == 0)
-    {
-      setErrorMessage("Enter a valid number of instances (>0)");
-      return;
-    }
-
-    getButton(IDialogConstants.OK_ID).setEnabled(true);
-    setErrorMessage(null);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/IPackageProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/IPackageProvider.java
deleted file mode 100644
index 2003814a8e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/IPackageProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.dialogs;
-
-import org.eclipse.emf.cdo.CDOSession;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.swt.events.SelectionEvent;
-
-/**
- * TODO Is this used/needed?
- * 
- * @author Eike Stepper
- */
-public interface IPackageProvider
-{
-  public String getTitle();
-
-  public EPackage getPackage(CDOSession session, SelectionEvent event);
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java
deleted file mode 100644
index 9f19c208b7..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenAuditDialog.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.dialogs;
-
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DateTime;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-/**
- * @author Eike Stepper
- */
-public class OpenAuditDialog extends TitleAreaDialog
-{
-  public static final String TITLE = "Open Audit";
-
-  private IWorkbenchPage page;
-
-  private DateTime dateControl;
-
-  private DateTime timeControl;
-
-  private long timeStamp;
-
-  public OpenAuditDialog(IWorkbenchPage page)
-  {
-    super(new Shell(page.getWorkbenchWindow().getShell()));
-    this.page = page;
-    setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.MAX | SWT.TITLE | SWT.RESIZE);
-  }
-
-  public IWorkbenchPage getPage()
-  {
-    return page;
-  }
-
-  public long getTimeStamp()
-  {
-    return timeStamp;
-  }
-
-  @Override
-  protected void configureShell(Shell newShell)
-  {
-    super.configureShell(newShell);
-    newShell.setText(TITLE);
-  }
-
-  @Override
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = new Composite((Composite)super.createDialogArea(parent), SWT.NONE);
-    composite.setLayoutData(UIUtil.createGridData());
-    composite.setLayout(new GridLayout(3, false));
-
-    setTitle(TITLE);
-    setTitleImage(SharedIcons.getImage(SharedIcons.WIZBAN_PACKAGE_MANAGER));
-
-    new Label(composite, SWT.NONE).setText("Target Time:");
-    dateControl = new DateTime(composite, SWT.DATE);
-    timeControl = new DateTime(composite, SWT.TIME);
-
-    return composite;
-  }
-
-  @Override
-  protected void okPressed()
-  {
-    GregorianCalendar calendar = new GregorianCalendar();
-    calendar.set(Calendar.YEAR, dateControl.getYear());
-    calendar.set(Calendar.MONTH, dateControl.getMonth());
-    calendar.set(Calendar.DATE, dateControl.getDay());
-    calendar.set(Calendar.HOUR_OF_DAY, timeControl.getHours());
-    calendar.set(Calendar.MINUTE, timeControl.getMinutes());
-    calendar.set(Calendar.SECOND, timeControl.getSeconds());
-
-    timeStamp = calendar.getTimeInMillis();
-    super.okPressed();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenResourcesDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenResourcesDialog.java
deleted file mode 100644
index fc49e85604..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenResourcesDialog.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.dialogs;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.FilteredResourcesSelectionDialog;
-
-public class OpenResourcesDialog extends FilteredResourcesSelectionDialog
-{
-  public OpenResourcesDialog(Shell parentShell)
-  {
-    super(parentShell, true, ResourcesPlugin.getWorkspace().getRoot(), IResource.FILE);
-    setTitle("Open Resources");
-    setInitialPattern("*.ecore");
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
deleted file mode 100644
index ae7e380b72..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/OpenSessionDialog.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.dialogs;
-
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-
-import org.eclipse.emf.internal.cdo.util.FSMUtil;
-
-import org.eclipse.net4j.internal.util.collection.PreferenceHistory;
-import org.eclipse.net4j.util.collection.IHistory;
-import org.eclipse.net4j.util.ui.UIUtil;
-import org.eclipse.net4j.util.ui.widgets.HistoryText;
-import org.eclipse.net4j.util.ui.widgets.PreferenceButton;
-
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public class OpenSessionDialog extends TitleAreaDialog
-{
-  public static final String TITLE = "Open Session";
-
-  private IWorkbenchPage page;
-
-  private IHistory<String> connectorHistory = new PreferenceHistory(OM.PREF_HISTORY_CONNECTORS);
-
-  private IHistory<String> repositoryHistory = new PreferenceHistory(OM.PREF_HISTORY_REPOSITORIES);
-
-  private HistoryText connectorText;
-
-  private Label exampleLabel;
-
-  private HistoryText repositoryText;
-
-  private PreferenceButton automaticButton;
-
-  private PreferenceButton legacyButton;
-
-  private String serverDescription;
-
-  private String repositoryName;
-
-  private boolean automaticPackageRegistry;
-
-  private boolean legacyModelSupport;
-
-  static
-  {
-    OM.PREF_LEGACY_MODEL_SUPPORT.setValue(FSMUtil.isLegacySystemAvailable());
-  }
-
-  public OpenSessionDialog(IWorkbenchPage page)
-  {
-    super(new Shell(page.getWorkbenchWindow().getShell()));
-    this.page = page;
-    setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.MAX | SWT.TITLE | SWT.RESIZE);
-  }
-
-  public IWorkbenchPage getPage()
-  {
-    return page;
-  }
-
-  public String getServerDescription()
-  {
-    return serverDescription;
-  }
-
-  public String getRepositoryName()
-  {
-    return repositoryName;
-  }
-
-  public boolean isAutomaticPackageRegistry()
-  {
-    return automaticPackageRegistry;
-  }
-
-  public boolean isLegacyModelSupport()
-  {
-    return legacyModelSupport;
-  }
-
-  @Override
-  protected void configureShell(Shell newShell)
-  {
-    super.configureShell(newShell);
-    newShell.setText(TITLE);
-  }
-
-  @Override
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = new Composite((Composite)super.createDialogArea(parent), SWT.NONE);
-    composite.setLayoutData(UIUtil.createGridData());
-    composite.setLayout(new GridLayout(2, false));
-
-    setTitle(TITLE);
-    setTitleImage(SharedIcons.getImage(SharedIcons.WIZBAN_PACKAGE_MANAGER));
-
-    new Label(composite, SWT.NONE).setText("Server Description:");
-    connectorText = new HistoryText(composite, SWT.BORDER | SWT.SINGLE, connectorHistory);
-    connectorText.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-
-    if (connectorHistory.isEmpty())
-    {
-      new Label(composite, SWT.NONE);
-      exampleLabel = new Label(composite, SWT.NONE);
-      exampleLabel.setText("for example 'tcp://estepper@dev.eclipse.org:2036'");
-      exampleLabel.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
-    }
-
-    new Label(composite, SWT.NONE).setText("Repository Name:");
-    repositoryText = new HistoryText(composite, SWT.BORDER | SWT.SINGLE, repositoryHistory);
-    repositoryText.getCombo().setLayoutData(new GridData(150, SWT.DEFAULT));
-
-    new Label(composite, SWT.NONE);
-    automaticButton = new PreferenceButton(composite, SWT.CHECK, "Automatic Package Registry",
-        OM.PREF_AUTOMATIC_PACKAGE_REGISTY);
-
-    new Label(composite, SWT.NONE);
-    legacyButton = new PreferenceButton(composite, SWT.CHECK, "Legacy Model Support", OM.PREF_LEGACY_MODEL_SUPPORT);
-    legacyButton.getButton().setEnabled(FSMUtil.isLegacySystemAvailable());
-
-    connectorText.setFocus();
-    connectorText.getCombo().addFocusListener(new FocusListener()
-    {
-      public void focusGained(FocusEvent e)
-      {
-        if (exampleLabel != null)
-        {
-          exampleLabel.setVisible(true);
-        }
-      }
-
-      public void focusLost(FocusEvent e)
-      {
-        if (exampleLabel != null)
-        {
-          exampleLabel.setVisible(false);
-        }
-      }
-    });
-
-    return composite;
-  }
-
-  @Override
-  protected void okPressed()
-  {
-    serverDescription = connectorText.getText(true);
-    repositoryName = repositoryText.getText(true);
-    automaticPackageRegistry = automaticButton.getSelection(true);
-    legacyModelSupport = legacyButton.getSelection(true);
-    super.okPressed();
-  }
-
-  public void closeWithSuccess()
-  {
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java
deleted file mode 100644
index 70c0268233..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.dialogs;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-import org.eclipse.emf.cdo.internal.ui.actions.RegisterFilesystemPackagesAction;
-import org.eclipse.emf.cdo.internal.ui.actions.RegisterGeneratedPackagesAction;
-import org.eclipse.emf.cdo.internal.ui.actions.RegisterWorkspacePackagesAction;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.ui.CDOItemProvider;
-import org.eclipse.emf.cdo.util.CDOPackageRegistry;
-import org.eclipse.emf.cdo.util.CDOPackageType;
-import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry;
-
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.BaseLabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * @author Eike Stepper
- */
-public class PackageManagerDialog extends TitleAreaDialog
-{
-  private static final int REGISTER_GENERATED_PACKAGES_ID = IDialogConstants.CLIENT_ID + 1;
-
-  private static final int REGISTER_WORKSPACE_PACKAGES_ID = IDialogConstants.CLIENT_ID + 2;
-
-  private static final int REGISTER_FILESYSTEM_PACKAGES_ID = IDialogConstants.CLIENT_ID + 3;
-
-  private static final String TITLE = "CDO Package Manager";
-
-  private static final String EMPTY = "";
-
-  private IWorkbenchPage page;
-
-  private CDOSession session;
-
-  private TableViewer viewer;
-
-  public PackageManagerDialog(IWorkbenchPage page, CDOSession session)
-  {
-    super(new Shell(page.getWorkbenchWindow().getShell()));
-    this.page = page;
-    this.session = session;
-    setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.MAX | SWT.TITLE | SWT.RESIZE);
-  }
-
-  @Override
-  protected void configureShell(Shell newShell)
-  {
-    super.configureShell(newShell);
-    newShell.setText(TITLE);
-  }
-
-  @Override
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = (Composite)super.createDialogArea(parent);
-    setTitle(CDOItemProvider.getSessionLabel(session));
-    setTitleImage(SharedIcons.getImage(SharedIcons.WIZBAN_PACKAGE_MANAGER));
-
-    viewer = new TableViewer(composite, SWT.NONE);
-    Table table = viewer.getTable();
-
-    table.setHeaderVisible(true);
-    table.setLayoutData(UIUtil.createGridData());
-    addColumn(table, "Package", 400, SWT.LEFT);
-    addColumn(table, "Registry", 80, SWT.CENTER);
-    addColumn(table, "Repository", 80, SWT.CENTER);
-
-    viewer.setContentProvider(new ContentProvider());
-    viewer.setLabelProvider(new LabelProvider());
-    viewer.setInput(session);
-
-    return composite;
-  }
-
-  @Override
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    createButton(parent, REGISTER_GENERATED_PACKAGES_ID, "Generated...", false);
-    createButton(parent, REGISTER_WORKSPACE_PACKAGES_ID, "Workspace...", false);
-    createButton(parent, REGISTER_FILESYSTEM_PACKAGES_ID, "Filesystem...", false);
-    createButton(parent, IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL, false);
-  }
-
-  @Override
-  protected void buttonPressed(int buttonId)
-  {
-    switch (buttonId)
-    {
-    case REGISTER_GENERATED_PACKAGES_ID:
-      new RegisterGeneratedPackagesAction(page, session)
-      {
-        @Override
-        protected void postRegistration(List<EPackage> ePackages)
-        {
-          refreshViewer();
-        }
-      }.run();
-      break;
-
-    case REGISTER_WORKSPACE_PACKAGES_ID:
-      new RegisterWorkspacePackagesAction(page, session)
-      {
-        @Override
-        protected void postRegistration(List<EPackage> ePackages)
-        {
-          refreshViewer();
-        }
-      }.run();
-      break;
-
-    case REGISTER_FILESYSTEM_PACKAGES_ID:
-      new RegisterFilesystemPackagesAction(page, session)
-      {
-        @Override
-        protected void postRegistration(List<EPackage> ePackages)
-        {
-          refreshViewer();
-        }
-      }.run();
-      break;
-
-    case IDialogConstants.CLOSE_ID:
-      close();
-      break;
-    }
-  }
-
-  protected Image getContentIcon(Content content)
-  {
-    return null;
-  }
-
-  protected String getEPackageText(Object ePackage)
-  {
-    if (ePackage == EcorePackage.eINSTANCE)
-    {
-      return "ECORE";
-    }
-
-    if (ePackage.getClass() == EPackageImpl.class)
-    {
-      return "DYNAMIC";
-    }
-
-    String uri = EMPTY;
-    if (ePackage instanceof EPackage.Descriptor)
-    {
-      CDOPackageRegistry registry = session.getPackageRegistry();
-      for (Map.Entry<String, Object> entry : registry.entrySet())
-      {
-        if (entry.getValue() == ePackage)
-        {
-          uri = entry.getKey();
-          break;
-        }
-      }
-    }
-    else
-    {
-      uri = ((EPackage)ePackage).getNsURI();
-    }
-
-    CDOPackageType packageType = CDOPackageTypeRegistry.INSTANCE.get(uri);
-    if (packageType == null)
-    {
-      return "?";
-    }
-
-    return packageType.toString();
-  }
-
-  protected String getCDOPackageText(CDOPackage cdoPackage)
-  {
-    if (cdoPackage.isSystem())
-    {
-      return "SYSTEM";
-    }
-
-    if (!cdoPackage.isPersistent())
-    {
-      return EMPTY;
-    }
-
-    return cdoPackage.isDynamic() ? "DYNAMIC" : "STATIC";
-  }
-
-  private void addColumn(Table table, String title, int width, int alignment)
-  {
-    TableColumn column = new TableColumn(table, alignment);
-    column.setText(title);
-    column.setWidth(width);
-  }
-
-  protected void refreshViewer()
-  {
-    page.getWorkbenchWindow().getShell().getDisplay().syncExec(new Runnable()
-    {
-      public void run()
-      {
-        try
-        {
-          viewer.refresh();
-        }
-        catch (RuntimeException ignore)
-        {
-        }
-      }
-    });
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class LabelProvider extends BaseLabelProvider implements ITableLabelProvider
-  {
-    public LabelProvider()
-    {
-    }
-
-    public String getColumnText(Object element, int columnIndex)
-    {
-      if (element instanceof Content)
-      {
-        Content content = (Content)element;
-        switch (columnIndex)
-        {
-        case 0:
-          return content.getPackageURI();
-        case 1:
-          return content.getEPackage() == null ? EMPTY : getEPackageText(content.getEPackage());
-        case 2:
-          return content.getCDOPackage() == null ? EMPTY : getCDOPackageText(content.getCDOPackage());
-        }
-      }
-
-      return element.toString();
-    }
-
-    public Image getColumnImage(Object element, int columnIndex)
-    {
-      if (element instanceof Content)
-      {
-        Content content = (Content)element;
-        if (columnIndex == 0)
-        {
-          return getContentIcon(content);
-        }
-      }
-
-      return null;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class ContentProvider implements IStructuredContentProvider
-  {
-    private static final Object[] NO_ELEMENTS = {};
-
-    private CDOSession session;
-
-    public ContentProvider()
-    {
-    }
-
-    public void dispose()
-    {
-    }
-
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-      if (newInput instanceof CDOSession)
-      {
-        if (!ObjectUtil.equals(session, newInput))
-        {
-          session = (CDOSession)newInput;
-        }
-      }
-    }
-
-    public Object[] getElements(Object inputElement)
-    {
-      if (inputElement != session)
-      {
-        return NO_ELEMENTS;
-      }
-
-      Map<String, Content> map = new HashMap<String, Content>();
-      for (Entry<String, Object> entry : session.getPackageRegistry().entrySet())
-      {
-        String packageURI = entry.getKey();
-        Content content = new Content(packageURI);
-        map.put(packageURI, content);
-        content.setEPackage(entry.getValue());
-      }
-
-      for (CDOPackage cdoPackage : session.getPackageManager().getPackages())
-      {
-        String packageURI = cdoPackage.getPackageURI();
-        Content content = map.get(packageURI);
-        if (content == null)
-        {
-          content = new Content(packageURI);
-          map.put(packageURI, content);
-        }
-
-        content.setCDOPackage(cdoPackage);
-      }
-
-      ArrayList<Content> list = new ArrayList<Content>(map.values());
-      Collections.sort(list);
-      return list.toArray(new Content[list.size()]);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Content implements Comparable<Content>
-  {
-    private String packageURI;
-
-    private Object ePackage;
-
-    private CDOPackage cdoPackage;
-
-    public Content(String packageURI)
-    {
-      this.packageURI = packageURI;
-    }
-
-    public String getPackageURI()
-    {
-      return packageURI;
-    }
-
-    public Object getEPackage()
-    {
-      return ePackage;
-    }
-
-    public void setEPackage(Object ePackage)
-    {
-      this.ePackage = ePackage;
-    }
-
-    public CDOPackage getCDOPackage()
-    {
-      return cdoPackage;
-    }
-
-    public void setCDOPackage(CDOPackage cdoPackage)
-    {
-      this.cdoPackage = cdoPackage;
-    }
-
-    public int compareTo(Content content)
-    {
-      return packageURI.compareTo(content.packageURI);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-      if (obj == this)
-      {
-        return true;
-      }
-
-      if (obj instanceof Content)
-      {
-        Content that = (Content)obj;
-        return ObjectUtil.equals(packageURI, that.packageURI);
-      }
-
-      return false;
-    }
-
-    @Override
-    public int hashCode()
-    {
-      return ObjectUtil.hashCode(packageURI);
-    }
-
-    @Override
-    public String toString()
-    {
-      return packageURI;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
deleted file mode 100644
index 7e20f9cadf..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.dialogs;
-
-import org.eclipse.emf.cdo.CDOTransaction;
-
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author Eike Stepper
- */
-public class RollbackTransactionDialog extends TitleAreaDialog
-{
-  // public static final String TITLE = "Rollback Transaction";
-
-  public static final int REMOTE = CANCEL + 1;
-
-  public static final int LOCAL = CANCEL + 2;
-
-  private static final int REMOTE_ID = IDialogConstants.CLIENT_ID + REMOTE;
-
-  private static final int LOCAL_ID = IDialogConstants.CLIENT_ID + LOCAL;
-
-  private IWorkbenchPage page;
-
-  private String title;
-
-  private String description;
-
-  private CDOTransaction transaction;
-
-  public RollbackTransactionDialog(IWorkbenchPage page, String title, String description, CDOTransaction transaction)
-  {
-    super(new Shell(page.getWorkbenchWindow().getShell()));
-    this.page = page;
-    this.title = title;
-    this.description = description;
-    this.transaction = transaction;
-    setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.MAX | SWT.TITLE | SWT.RESIZE);
-  }
-
-  public IWorkbenchPage getPage()
-  {
-    return page;
-  }
-
-  @Override
-  protected void configureShell(Shell newShell)
-  {
-    super.configureShell(newShell);
-    newShell.setText(title);
-  }
-
-  @Override
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = new Composite((Composite)super.createDialogArea(parent), SWT.NONE);
-    composite.setLayoutData(UIUtil.createGridData());
-    composite.setLayout(new GridLayout(1, false));
-
-    setTitle(description);
-    setTitleImage(getShell().getDisplay().getSystemImage(SWT.ICON_QUESTION));
-
-    Label label = new Label(composite, SWT.NONE);
-    label.setText(formatMessage());
-    label.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true));
-
-    return composite;
-  }
-
-  @Override
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    createButton(parent, REMOTE_ID, "Remote Rollback", true);
-    createButton(parent, LOCAL_ID, "Local Rollback", false);
-    createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-  }
-
-  @Override
-  protected void buttonPressed(int buttonId)
-  {
-    if (buttonId == REMOTE_ID)
-    {
-      setReturnCode(REMOTE);
-      close();
-    }
-    else if (buttonId == LOCAL_ID)
-    {
-      setReturnCode(LOCAL);
-      close();
-    }
-    else
-    {
-      super.buttonPressed(buttonId);
-    }
-  }
-
-  protected String formatMessage()
-  {
-    int newObjects = transaction.getNewObjects().size();
-    int dirtyObjects = transaction.getDirtyObjects().size();
-    int count = (newObjects > 0 ? 1 : 0) + (dirtyObjects > 0 ? 1 : 0);
-
-    StringBuilder builder = new StringBuilder();
-    builder.append("This transaction contains ");
-
-    if (newObjects > 0)
-    {
-      builder.append(newObjects);
-      builder.append(" new object");
-      if (newObjects > 1)
-      {
-        builder.append("s");
-      }
-    }
-
-    if (dirtyObjects > 0)
-    {
-      if (count > 0)
-      {
-        builder.append(" and ");
-      }
-
-      builder.append(dirtyObjects);
-      builder.append(" dirty object");
-      if (dirtyObjects > 1)
-      {
-        builder.append("s");
-      }
-    }
-
-    builder.append(".\n\nBe careful, rolling back to local state can result\n"
-        + "in visible state that is different from the remote state!");
-    builder.append("\n\nAre you sure to rollback this transaction?");
-    return builder.toString();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
deleted file mode 100644
index a79be83ee0..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.dialogs;
-
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-import org.eclipse.emf.cdo.util.CDOPackageType;
-import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry;
-
-import org.eclipse.net4j.util.ui.UIUtil;
-import org.eclipse.net4j.util.ui.widgets.BaseDialog;
-
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableColorProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class SelectPackageDialog extends BaseDialog<CheckboxTableViewer>
-{
-  private static final Set<String> NO_URIS = Collections.emptySet();
-
-  private Set<String> excludedURIs = new HashSet<String>();
-
-  private Set<String> checkedURIs = new HashSet<String>();
-
-  public SelectPackageDialog(Shell shell, String title, String message, Set<String> excludedURIs)
-  {
-    super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, title, message, OM.Activator.INSTANCE.getDialogSettings());
-    this.excludedURIs = excludedURIs;
-  }
-
-  public SelectPackageDialog(Shell shell, String title, String message)
-  {
-    this(shell, title, message, NO_URIS);
-  }
-
-  public Set<String> getCheckedURIs()
-  {
-    return checkedURIs;
-  }
-
-  @Override
-  protected void createUI(Composite parent)
-  {
-    CheckboxTableViewer viewer = CheckboxTableViewer.newCheckList(parent, SWT.SINGLE | SWT.BORDER);
-    viewer.getTable().setLayoutData(UIUtil.createGridData());
-    viewer.setContentProvider(new PackageContentProvider());
-    viewer.setLabelProvider(new PackageLabelProvider());
-    viewer.setInput(CDOPackageTypeRegistry.INSTANCE);
-
-    String[] uris = OM.PREF_HISTORY_SELECT_PACKAGES.getValue();
-    if (uris != null)
-    {
-      viewer.setCheckedElements(uris);
-    }
-
-    setCurrentViewer(viewer);
-  }
-
-  @Override
-  protected void okPressed()
-  {
-    Object[] checkedElements = getCurrentViewer().getCheckedElements();
-    for (Object checkedElement : checkedElements)
-    {
-      checkedURIs.add((String)checkedElement);
-    }
-
-    OM.PREF_HISTORY_SELECT_PACKAGES.setValue(checkedURIs.toArray(new String[checkedURIs.size()]));
-    super.okPressed();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private class PackageContentProvider implements IStructuredContentProvider
-  {
-    public PackageContentProvider()
-    {
-    }
-
-    public void dispose()
-    {
-    }
-
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-    }
-
-    public Object[] getElements(Object inputElement)
-    {
-      Set<String> uris = new HashSet<String>(CDOPackageTypeRegistry.INSTANCE.keySet());
-      uris.removeAll(excludedURIs);
-
-      List<String> elements = new ArrayList<String>(uris);
-      Collections.sort(elements);
-      return elements.toArray();
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private class PackageLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider
-  {
-    private final Color red = Display.getCurrent().getSystemColor(SWT.COLOR_DARK_MAGENTA);
-
-    public PackageLabelProvider()
-    {
-    }
-
-    @Override
-    public String getText(Object element)
-    {
-      return element.toString();
-    }
-
-    @Override
-    public Image getImage(Object element)
-    {
-      if (element instanceof String)
-      {
-        CDOPackageType packageType = CDOPackageTypeRegistry.INSTANCE.get(element);
-        switch (packageType)
-        {
-        case CONVERTED:
-          return SharedIcons.getImage(SharedIcons.OBJ_EPACKAGE_CONVERTED);
-
-        case LEGACY:
-          return SharedIcons.getImage(SharedIcons.OBJ_EPACKAGE_LEGACY);
-
-        case NATIVE:
-          return SharedIcons.getImage(SharedIcons.OBJ_EPACKAGE_NATIVE);
-        }
-      }
-
-      return null;
-    }
-
-    public String getColumnText(Object element, int columnIndex)
-    {
-      return getText(element);
-    }
-
-    public Image getColumnImage(Object element, int columnIndex)
-    {
-      return getImage(element);
-    }
-
-    public Color getBackground(Object element, int columnIndex)
-    {
-      return null;
-    }
-
-    public Color getForeground(Object element, int columnIndex)
-    {
-      if (EcorePackage.eINSTANCE.getNsURI().equals(element))
-      {
-        return red;
-      }
-
-      return null;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
deleted file mode 100644
index 3be982ccf5..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
+++ /dev/null
@@ -1,654 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.editor;
-
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.internal.ui.actions.ImportRootsAction;
-import org.eclipse.emf.cdo.internal.ui.actions.ReloadObjectsAction;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.ControlAction;
-import org.eclipse.emf.edit.ui.action.CreateChildAction;
-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.LoadResourceAction;
-import org.eclipse.emf.edit.ui.action.ValidateAction;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * @author Eike Stepper
- * @generated
- */
-public class CDOActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener
-{
-  /**
-   * @ADDED
-   */
-  public static final String LOAD_RESOURCE_ID = "load-resource";
-
-  /**
-   * @ADDED
-   */
-  public static final String REFRESH_VIEWER_ID = "refresh-viewer";
-
-  /**
-   * @ADDED
-   */
-  protected ImportRootsAction importRootsAction;
-
-  /**
-   * @ADDED
-   */
-  protected ReloadObjectsAction reloadObjectsAction;
-
-  /**
-   * This keeps track of the active editor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IEditorPart activeEditorPart;
-
-  /**
-   * This keeps track of the current selection provider. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected ISelectionProvider selectionProvider;
-
-  /**
-   * This action opens the Properties view. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IAction showPropertiesViewAction = new Action(PluginDelegator.INSTANCE
-      .getString("_UI_ShowPropertiesView_menu_item"))
-  {
-    @Override
-    public void run()
-    {
-      try
-      {
-        getPage().showView("org.eclipse.ui.views.PropertySheet");
-      }
-      catch (PartInitException exception)
-      {
-        PluginDelegator.INSTANCE.log(exception);
-      }
-    }
-  };
-
-  /**
-   * This action refreshes the viewer of the current editor if the editor implements
-   * {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IAction refreshViewerAction = new Action(PluginDelegator.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
-  {
-    @Override
-    public boolean isEnabled()
-    {
-      return activeEditorPart instanceof IViewerProvider;
-    }
-
-    @Override
-    public void run()
-    {
-      if (activeEditorPart instanceof IViewerProvider)
-      {
-        Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
-        if (viewer != null)
-        {
-          viewer.refresh();
-        }
-      }
-    }
-  };
-
-  /**
-   * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-   * generated for the current selection by the item provider. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Collection<IAction> createChildActions;
-
-  /**
-   * This is the menu manager into which menu contribution items should be added for CreateChild actions. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IMenuManager createChildMenuManager;
-
-  /**
-   * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-   * generated for the current selection by the item provider. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Collection<IAction> createSiblingActions;
-
-  /**
-   * This is the menu manager into which menu contribution items should be added for CreateSibling actions. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IMenuManager createSiblingMenuManager;
-
-  /**
-   * This creates an instance of the contributor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated NOT
-   */
-  public CDOActionBarContributor()
-  {
-    super(ADDITIONS_LAST_STYLE);
-    loadResourceAction = new LoadResourceAction();
-    loadResourceAction.setId(LOAD_RESOURCE_ID);
-
-    importRootsAction = new ImportRootsAction();
-    importRootsAction.setId(ImportRootsAction.ID);
-
-    reloadObjectsAction = new ReloadObjectsAction();
-
-    validateAction = new ValidateAction();
-    controlAction = new ControlAction();
-  }
-
-  /**
-   * This adds Separators for editor additions to the tool bar. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void contributeToToolBar(IToolBarManager toolBarManager)
-  {
-    toolBarManager.add(new Separator("cdo-settings"));
-    toolBarManager.add(new Separator("cdo-additions"));
-  }
-
-  /**
-   * This adds to the menu bar a menu and some separators for editor additions, as well as the sub-menus for object
-   * creation items. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void contributeToMenu(IMenuManager menuManager)
-  {
-    super.contributeToMenu(menuManager);
-
-    IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"),
-        "org.eclipse.emf.cdo.internal.ui.editorMenuID");
-    menuManager.insertAfter("additions", submenuManager);
-    submenuManager.add(new Separator("settings"));
-    submenuManager.add(new Separator("actions"));
-    submenuManager.add(new Separator("additions"));
-    submenuManager.add(new Separator("additions-end"));
-
-    // Prepare for CreateChild item addition or removal.
-    //
-    createChildMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item"));
-    submenuManager.insertBefore("additions", createChildMenuManager);
-
-    // Prepare for CreateSibling item addition or removal.
-    //
-    createSiblingMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-    submenuManager.insertBefore("additions", createSiblingMenuManager);
-
-    // Force an update because Eclipse hides empty menus now.
-    //
-    submenuManager.addMenuListener(new IMenuListener()
-    {
-      public void menuAboutToShow(IMenuManager menuManager)
-      {
-        menuManager.updateAll(true);
-      }
-    });
-
-    addGlobalActions(submenuManager);
-  }
-
-  /**
-   * When the active editor changes, this remembers the change and registers with it as a selection provider. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void setActiveEditor(IEditorPart part)
-  {
-    super.setActiveEditor(part);
-    activeEditorPart = part;
-
-    // Switch to the new selection provider.
-    //
-    if (selectionProvider != null)
-    {
-      selectionProvider.removeSelectionChangedListener(this);
-    }
-    if (part == null)
-    {
-      selectionProvider = null;
-    }
-    else
-    {
-      selectionProvider = part.getSite().getSelectionProvider();
-      selectionProvider.addSelectionChangedListener(this);
-
-      // Fake a selection changed event to update the menus.
-      //
-      if (selectionProvider.getSelection() != null)
-      {
-        selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
-      }
-    }
-  }
-
-  /**
-   * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, handling
-   * {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings that can be
-   * added to the selected object and updating the menus accordingly. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void selectionChangedGen(SelectionChangedEvent event)
-  {
-    // Remove any menu items for old selection.
-    //
-    if (createChildMenuManager != null)
-    {
-      depopulateManager(createChildMenuManager, createChildActions);
-    }
-    if (createSiblingMenuManager != null)
-    {
-      depopulateManager(createSiblingMenuManager, createSiblingActions);
-    }
-
-    // Query the new selection for appropriate new child/sibling descriptors
-    //
-    Collection<?> newChildDescriptors = null;
-    Collection<?> newSiblingDescriptors = null;
-
-    ISelection selection = event.getSelection();
-    if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1)
-    {
-      Object object = ((IStructuredSelection)selection).getFirstElement();
-
-      EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
-
-      newChildDescriptors = domain.getNewChildDescriptors(object, null);
-      newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-    }
-
-    // Generate actions for selection; populate and redraw the menus.
-    //
-    createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-    createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-
-    if (createChildMenuManager != null)
-    {
-      populateManager(createChildMenuManager, createChildActions, null);
-      createChildMenuManager.update(true);
-    }
-    if (createSiblingMenuManager != null)
-    {
-      populateManager(createSiblingMenuManager, createSiblingActions, null);
-      createSiblingMenuManager.update(true);
-    }
-  }
-
-  /**
-   * @ADDED
-   */
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    // Remove any menu items for old selection.
-    //
-    if (createChildMenuManager != null)
-    {
-      depopulateManager(createChildMenuManager, createChildActions);
-    }
-    if (createSiblingMenuManager != null)
-    {
-      depopulateManager(createSiblingMenuManager, createSiblingActions);
-    }
-
-    // Query the new selection for appropriate new child/sibling descriptors
-    //
-    Collection<?> newChildDescriptors = null;
-    Collection<?> newSiblingDescriptors = null;
-
-    ISelection selection = event.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      if (reloadObjectsAction != null)
-      {
-        reloadObjectsAction.selectionChanged((IStructuredSelection)selection);
-      }
-
-      if (((IStructuredSelection)selection).size() == 1)
-      {
-        Object object = ((IStructuredSelection)selection).getFirstElement();
-
-        EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
-
-        newChildDescriptors = domain.getNewChildDescriptors(object, null);
-        newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-
-        if (importRootsAction != null)
-        {
-          if (object instanceof CDOResource)
-          {
-            importRootsAction.setTargetResource((CDOResource)object);
-          }
-          else
-          {
-            importRootsAction.setTargetResource(null);
-          }
-        }
-      }
-    }
-
-    // Generate actions for selection; populate and redraw the menus.
-    //
-    createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-    createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-
-    if (createChildMenuManager != null)
-    {
-      populateManager(createChildMenuManager, createChildActions, null);
-      createChildMenuManager.update(true);
-    }
-    if (createSiblingMenuManager != null)
-    {
-      populateManager(createSiblingMenuManager, createSiblingActions, null);
-      createSiblingMenuManager.update(true);
-    }
-  }
-
-  /**
-   * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in
-   * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   */
-  protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection)
-  {
-    Collection<IAction> actions = new ArrayList<IAction>();
-    if (descriptors != null)
-    {
-      for (Object descriptor : descriptors)
-      {
-        actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
-      }
-    }
-    return actions;
-  }
-
-  /**
-   * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in
-   * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   */
-  protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection)
-  {
-    Collection<IAction> actions = new ArrayList<IAction>();
-    if (descriptors != null)
-    {
-      for (Object descriptor : descriptors)
-      {
-        actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
-      }
-    }
-    return actions;
-  }
-
-  /**
-   * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-   * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection, by
-   * inserting them before the specified contribution item <code>contributionID</code>. If
-   * <code>contributionID</code> is <code>null</code>, they are simply added. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-      String contributionID)
-  {
-    if (actions != null)
-    {
-      for (IAction action : actions)
-      {
-        if (contributionID != null)
-        {
-          manager.insertBefore(contributionID, action);
-        }
-        else
-        {
-          manager.add(action);
-        }
-      }
-    }
-  }
-
-  /**
-   * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-   * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions)
-  {
-    if (actions != null)
-    {
-      IContributionItem[] items = manager.getItems();
-      for (int i = 0; i < items.length; i++)
-      {
-        // Look into SubContributionItems
-        //
-        IContributionItem contributionItem = items[i];
-        while (contributionItem instanceof SubContributionItem)
-        {
-          contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
-        }
-
-        // Delete the ActionContributionItems with matching action.
-        //
-        if (contributionItem instanceof ActionContributionItem)
-        {
-          IAction action = ((ActionContributionItem)contributionItem).getAction();
-          if (actions.contains(action))
-          {
-            manager.remove(contributionItem);
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * This populates the pop-up menu before it appears. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void menuAboutToShow(IMenuManager menuManager)
-  {
-    super.menuAboutToShow(menuManager);
-    MenuManager submenuManager = null;
-
-    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item"));
-    populateManager(submenuManager, createChildActions, null);
-    menuManager.insertBefore("edit", submenuManager);
-
-    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-    populateManager(submenuManager, createSiblingActions, null);
-    menuManager.insertBefore("edit", submenuManager);
-  }
-
-  /**
-   * This inserts global actions before the "additions-end" separator. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addGlobalActionsGen(IMenuManager menuManager)
-  {
-    menuManager.insertAfter("additions-end", new Separator("ui-actions"));
-    menuManager.insertAfter("ui-actions", showPropertiesViewAction);
-
-    refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-    menuManager.insertAfter("ui-actions", refreshViewerAction);
-
-    super.addGlobalActions(menuManager);
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  protected void addGlobalActions(IMenuManager menuManager)
-  {
-    menuManager.insertAfter("additions-end", new Separator("ui-actions"));
-    menuManager.insertAfter("ui-actions", showPropertiesViewAction);
-
-    refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-    refreshViewerAction.setId(REFRESH_VIEWER_ID);
-    menuManager.insertAfter("ui-actions", refreshViewerAction);
-    menuManager.insertBefore(refreshViewerAction.getId(), reloadObjectsAction);
-    super.addGlobalActions(menuManager);
-
-    if (loadResourceAction != null)
-    {
-      if (importRootsAction != null)
-      {
-        menuManager.insertAfter(loadResourceAction.getId(), importRootsAction);
-      }
-    }
-    else
-    {
-      if (importRootsAction != null)
-      {
-        menuManager.insertBefore("additions-end", importRootsAction);
-      }
-
-      menuManager.insertBefore("additions-end", new Separator());
-    }
-  }
-
-  /**
-   * This ensures that a delete action will clean up all references to deleted objects. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected boolean removeAllReferencesOnDelete()
-  {
-    return true;
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  public void activate()
-  {
-    if (importRootsAction != null)
-    {
-      importRootsAction.setActiveWorkbenchPart(activeEditor);
-      Object input = ((CDOEditor)getActiveEditor()).getViewer().getInput();
-      if (input instanceof CDOResource)
-      {
-        importRootsAction.setTargetResource((CDOResource)input);
-      }
-      else
-      {
-        importRootsAction.setTargetResource(null);
-      }
-    }
-
-    if (reloadObjectsAction != null)
-    {
-      reloadObjectsAction.setActiveWorkbenchPart(activeEditor);
-    }
-
-    super.activate();
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  public void deactivate()
-  {
-    if (importRootsAction != null)
-    {
-      importRootsAction.setActiveWorkbenchPart(null);
-      importRootsAction.setTargetResource(null);
-    }
-
-    if (reloadObjectsAction != null)
-    {
-      reloadObjectsAction.setActiveWorkbenchPart(null);
-    }
-
-    super.deactivate();
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  public void update()
-  {
-    super.update();
-    if (importRootsAction != null)
-    {
-      importRootsAction.update();
-    }
-
-    if (reloadObjectsAction != null)
-    {
-      reloadObjectsAction.update();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
deleted file mode 100644
index 4225f9d0f7..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ /dev/null
@@ -1,2336 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.editor;
-
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.CDOTransaction;
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-import org.eclipse.emf.cdo.internal.ui.dialogs.BulkAddDialog;
-import org.eclipse.emf.cdo.internal.ui.dialogs.RollbackTransactionDialog;
-import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOPackage;
-import org.eclipse.emf.cdo.ui.CDOEventHandler;
-import org.eclipse.emf.cdo.ui.CDOLabelProvider;
-import org.eclipse.emf.cdo.util.CDOUtil;
-
-import org.eclipse.emf.internal.cdo.CDOLegacyImpl;
-import org.eclipse.emf.internal.cdo.CDOStateMachine;
-import org.eclipse.emf.internal.cdo.CDOTransactionImpl;
-import org.eclipse.emf.internal.cdo.InternalCDOObject;
-
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.transaction.TransactionException;
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.MarkerHelper;
-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.EMFEditPlugin;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory.Descriptor.Registry;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- * @generated
- */
-public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker
-{
-  /**
-   * @ADDED
-   */
-  public static final String EDITOR_ID = "org.eclipse.emf.cdo.ui.CDOEditor";
-
-  /**
-   * @ADDED
-   */
-  private CDOView view;
-
-  /**
-   * @ADDED
-   */
-  private Object viewerInput;
-
-  /**
-   * @ADDED
-   */
-  private CDOEventHandler eventHandler;
-
-  /**
-   * This keeps track of the editing domain that is used to track all changes to the model. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  protected AdapterFactoryEditingDomain editingDomain;
-
-  /**
-   * This is the one adapter factory used for providing views of the model. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   */
-  protected ComposedAdapterFactory adapterFactory;
-
-  /**
-   * This is the content outline page. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IContentOutlinePage contentOutlinePage;
-
-  /**
-   * This is a kludge... <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IStatusLineManager contentOutlineStatusLineManager;
-
-  /**
-   * This is the content outline page's viewer. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected TreeViewer contentOutlineViewer;
-
-  /**
-   * This is the property sheet page. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected PropertySheetPage propertySheetPage;
-
-  /**
-   * This is the viewer that shadows the selection in the content outline. The parent relation must be correctly defined
-   * for this to work. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected TreeViewer selectionViewer;
-
-  /**
-   * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content
-   * outline viewer. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Viewer currentViewer;
-
-  /**
-   * This listens to which ever viewer is active. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected ISelectionChangedListener selectionChangedListener;
-
-  /**
-   * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to
-   * this editor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
-
-  /**
-   * This keeps track of the selection of the editor as a whole. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected ISelection editorSelection = StructuredSelection.EMPTY;
-
-  /**
-   * The MarkerHelper is responsible for creating workspace resource markers presented in Eclipse's Problems View. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected MarkerHelper markerHelper = new EditUIMarkerHelper();
-
-  /**
-   * This listens for when the outline becomes active <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IPartListener partListener = new IPartListener()
-  {
-    public void partActivated(IWorkbenchPart p)
-    {
-      if (p instanceof ContentOutline)
-      {
-        if (((ContentOutline)p).getCurrentPage() == contentOutlinePage)
-        {
-          getActionBarContributor().setActiveEditor(CDOEditor.this);
-
-          setCurrentViewer(contentOutlineViewer);
-        }
-      }
-      else if (p instanceof PropertySheet)
-      {
-        if (((PropertySheet)p).getCurrentPage() == propertySheetPage)
-        {
-          getActionBarContributor().setActiveEditor(CDOEditor.this);
-          handleActivate();
-        }
-      }
-      else if (p == CDOEditor.this)
-      {
-        handleActivate();
-      }
-    }
-
-    public void partBroughtToTop(IWorkbenchPart p)
-    {
-      // Ignore.
-    }
-
-    public void partClosed(IWorkbenchPart p)
-    {
-      // Ignore.
-    }
-
-    public void partDeactivated(IWorkbenchPart p)
-    {
-      // Ignore.
-    }
-
-    public void partOpened(IWorkbenchPart p)
-    {
-      // Ignore.
-    }
-  };
-
-  /**
-   * Resources that have been removed since last activation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-  /**
-   * Resources that have been changed since last activation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-  /**
-   * Resources that have been saved. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Collection<Resource> savedResources = new ArrayList<Resource>();
-
-  /**
-   * Map to store the diagnostic associated with a resource. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
-
-  /**
-   * Controls whether the problem indication should be updated. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected boolean updateProblemIndication = true;
-
-  /**
-   * Adapter used to update the problem indication when resources are demanded loaded. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  protected EContentAdapter problemIndicationAdapter = new EContentAdapter()
-  {
-    @Override
-    public void notifyChanged(Notification notification)
-    {
-      if (notification.getNotifier() instanceof Resource)
-      {
-        switch (notification.getFeatureID(Resource.class))
-        {
-        case Resource.RESOURCE__IS_LOADED:
-        case Resource.RESOURCE__ERRORS:
-        case Resource.RESOURCE__WARNINGS:
-        {
-          Resource resource = (Resource)notification.getNotifier();
-          Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-          if (diagnostic.getSeverity() != Diagnostic.OK)
-          {
-            resourceToDiagnosticMap.put(resource, diagnostic);
-          }
-          else
-          {
-            resourceToDiagnosticMap.remove(resource);
-          }
-
-          if (updateProblemIndication)
-          {
-            getSite().getShell().getDisplay().asyncExec(new Runnable()
-            {
-              public void run()
-              {
-                updateProblemIndication();
-              }
-            });
-          }
-          break;
-        }
-        }
-      }
-      else
-      {
-        super.notifyChanged(notification);
-      }
-    }
-
-    @Override
-    protected void setTarget(Resource target)
-    {
-      basicSetTarget(target);
-    }
-
-    @Override
-    protected void unsetTarget(Resource target)
-    {
-      basicUnsetTarget(target);
-    }
-  };
-
-  /**
-   * This listens for workspace changes. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener()
-  {
-    public void resourceChanged(IResourceChangeEvent event)
-    {
-      IResourceDelta delta = event.getDelta();
-      try
-      {
-        class ResourceDeltaVisitor implements IResourceDeltaVisitor
-        {
-          protected ResourceSet resourceSet = editingDomain.getResourceSet();
-
-          protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-          protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-          public boolean visit(IResourceDelta delta)
-          {
-            if (delta.getResource().getType() == IResource.FILE)
-            {
-              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED
-                  && delta.getFlags() != IResourceDelta.MARKERS)
-              {
-                Resource resource = resourceSet.getResource(URI.createURI(delta.getFullPath().toString()), false);
-                if (resource != null)
-                {
-                  if (delta.getKind() == IResourceDelta.REMOVED)
-                  {
-                    removedResources.add(resource);
-                  }
-                  else if (!savedResources.remove(resource))
-                  {
-                    changedResources.add(resource);
-                  }
-                }
-              }
-            }
-
-            return true;
-          }
-
-          public Collection<Resource> getChangedResources()
-          {
-            return changedResources;
-          }
-
-          public Collection<Resource> getRemovedResources()
-          {
-            return removedResources;
-          }
-        }
-
-        ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-        delta.accept(visitor);
-
-        if (!visitor.getRemovedResources().isEmpty())
-        {
-          removedResources.addAll(visitor.getRemovedResources());
-          if (!isDirty())
-          {
-            getSite().getShell().getDisplay().asyncExec(new Runnable()
-            {
-              public void run()
-              {
-                getSite().getPage().closeEditor(CDOEditor.this, false);
-                CDOEditor.this.dispose();
-              }
-            });
-          }
-        }
-
-        if (!visitor.getChangedResources().isEmpty())
-        {
-          changedResources.addAll(visitor.getChangedResources());
-          if (getSite().getPage().getActiveEditor() == CDOEditor.this)
-          {
-            getSite().getShell().getDisplay().asyncExec(new Runnable()
-            {
-              public void run()
-              {
-                handleActivate();
-              }
-            });
-          }
-        }
-      }
-      catch (CoreException exception)
-      {
-        PluginDelegator.INSTANCE.log(exception);
-      }
-    }
-  };
-
-  /**
-   * Handles activation of the editor or it's associated views. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void handleActivate()
-  {
-    // Recompute the read only state.
-    //
-    if (editingDomain.getResourceToReadOnlyMap() != null)
-    {
-      editingDomain.getResourceToReadOnlyMap().clear();
-
-      // Refresh any actions that may become enabled or disabled.
-      //
-      setSelection(getSelection());
-    }
-
-    if (!removedResources.isEmpty())
-    {
-      if (handleDirtyConflict())
-      {
-        getSite().getPage().closeEditor(CDOEditor.this, false);
-        CDOEditor.this.dispose();
-      }
-      else
-      {
-        removedResources.clear();
-        changedResources.clear();
-        savedResources.clear();
-      }
-    }
-    else if (!changedResources.isEmpty())
-    {
-      changedResources.removeAll(savedResources);
-      handleChangedResources();
-      changedResources.clear();
-      savedResources.clear();
-    }
-  }
-
-  /**
-   * Handles what to do with changed resources on activation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void handleChangedResources()
-  {
-    if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict()))
-    {
-      if (isDirty())
-      {
-        changedResources.addAll(editingDomain.getResourceSet().getResources());
-      }
-      editingDomain.getCommandStack().flush();
-
-      updateProblemIndication = false;
-      for (Resource resource : changedResources)
-      {
-        if (resource.isLoaded())
-        {
-          resource.unload();
-          try
-          {
-            resource.load(Collections.EMPTY_MAP);
-          }
-          catch (IOException exception)
-          {
-            if (!resourceToDiagnosticMap.containsKey(resource))
-            {
-              resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-            }
-          }
-        }
-      }
-
-      if (AdapterFactoryEditingDomain.isStale(editorSelection))
-      {
-        setSelection(StructuredSelection.EMPTY);
-      }
-
-      updateProblemIndication = true;
-      updateProblemIndication();
-    }
-  }
-
-  /**
-   * Updates the problems indication with the information described in the specified diagnostic. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void updateProblemIndication()
-  {
-    if (updateProblemIndication)
-    {
-      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.ui.editor", 0, null,
-          new Object[] { editingDomain.getResourceSet() });
-      for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
-      {
-        if (childDiagnostic.getSeverity() != Diagnostic.OK)
-        {
-          diagnostic.add(childDiagnostic);
-        }
-      }
-
-      int lastEditorPage = getPageCount() - 1;
-      if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart)
-      {
-        ((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
-        if (diagnostic.getSeverity() != Diagnostic.OK)
-        {
-          setActivePage(lastEditorPage);
-        }
-      }
-      else if (diagnostic.getSeverity() != Diagnostic.OK)
-      {
-        ProblemEditorPart problemEditorPart = new ProblemEditorPart();
-        problemEditorPart.setDiagnostic(diagnostic);
-        problemEditorPart.setMarkerHelper(markerHelper);
-        try
-        {
-          addPage(++lastEditorPage, problemEditorPart, getEditorInput());
-          setPageText(lastEditorPage, problemEditorPart.getPartName());
-          setActivePage(lastEditorPage);
-          showTabs();
-        }
-        catch (PartInitException exception)
-        {
-          PluginDelegator.INSTANCE.log(exception);
-        }
-      }
-
-      if (markerHelper.hasMarkers(editingDomain.getResourceSet()))
-      {
-        markerHelper.deleteMarkers(editingDomain.getResourceSet());
-        if (diagnostic.getSeverity() != Diagnostic.OK)
-        {
-          try
-          {
-            markerHelper.createMarkers(diagnostic);
-          }
-          catch (CoreException exception)
-          {
-            PluginDelegator.INSTANCE.log(exception);
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Shows a dialog that asks if conflicting changes should be discarded. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected boolean handleDirtyConflict()
-  {
-    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"),
-        getString("_WARN_FileConflict"));
-  }
-
-  /**
-   * This creates a model editor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public CDOEditor()
-  {
-    super();
-    initializeEditingDomain();
-  }
-
-  /**
-   * This sets up the editing domain for the model editor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void initializeEditingDomainGen()
-  {
-    // Create an adapter factory that yields item providers.
-    //
-    adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
-    adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-    adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
-    // Create the command stack that will notify this editor as commands are executed.
-    //
-    BasicCommandStack commandStack = new BasicCommandStack();
-
-    // Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
-    //
-    commandStack.addCommandStackListener(new CommandStackListener()
-    {
-      public void commandStackChanged(final EventObject event)
-      {
-        getContainer().getDisplay().asyncExec(new Runnable()
-        {
-          public void run()
-          {
-            firePropertyChange(IEditorPart.PROP_DIRTY);
-
-            // Try to select the affected objects.
-            //
-            Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
-            if (mostRecentCommand != null)
-            {
-              setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-            }
-            if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed())
-            {
-              propertySheetPage.refresh();
-            }
-          }
-        });
-      }
-    });
-
-    // Create the editing domain with a special command stack.
-    //
-    editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
-  }
-
-  /**
-   * @ADDED
-   */
-  protected void initializeEditingDomain()
-  {
-    Registry registry = EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry();
-    adapterFactory = new ComposedAdapterFactory(registry);
-  }
-
-  /**
-   * This is here for the listener to be able to call it. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected void firePropertyChange(int action)
-  {
-    super.firePropertyChange(action);
-  }
-
-  /**
-   * This sets the selection into whichever viewer is active. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setSelectionToViewer(Collection<?> collection)
-  {
-    final Collection<?> theSelection = collection;
-    // Make sure it's okay.
-    //
-    if (theSelection != null && !theSelection.isEmpty())
-    {
-      // I don't know if this should be run this deferred
-      // because we might have to give the editor a chance to process the viewer update events
-      // and hence to update the views first.
-      //
-      //
-      Runnable runnable = new Runnable()
-      {
-        public void run()
-        {
-          // Try to select the items in the current content viewer of the editor.
-          //
-          if (currentViewer != null)
-          {
-            currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
-          }
-        }
-      };
-      runnable.run();
-    }
-  }
-
-  /**
-   * This returns the editing domain as required by the {@link IEditingDomainProvider} interface. This is important for
-   * implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting
-   * {@link org.eclipse.emf.edit.ui.action.CommandAction}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EditingDomain getEditingDomain()
-  {
-    return editingDomain;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider
-  {
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory)
-    {
-      super(adapterFactory);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object[] getElements(Object object)
-    {
-      Object parent = super.getParent(object);
-      return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object[] getChildren(Object object)
-    {
-      Object parent = super.getParent(object);
-      return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public boolean hasChildren(Object object)
-    {
-      Object parent = super.getParent(object);
-      return parent != null;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getParent(Object object)
-    {
-      return null;
-    }
-  }
-
-  /**
-   * This makes sure that one content viewer, either for the current page or the outline view, if it has focus, is the
-   * current one. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setCurrentViewer(Viewer viewer)
-  {
-    // If it is changing...
-    //
-    if (currentViewer != viewer)
-    {
-      if (selectionChangedListener == null)
-      {
-        // Create the listener on demand.
-        //
-        selectionChangedListener = new ISelectionChangedListener()
-        {
-          // This just notifies those things that are affected by the section.
-          //
-          public void selectionChanged(SelectionChangedEvent selectionChangedEvent)
-          {
-            setSelection(selectionChangedEvent.getSelection());
-          }
-        };
-      }
-
-      // Stop listening to the old one.
-      //
-      if (currentViewer != null)
-      {
-        currentViewer.removeSelectionChangedListener(selectionChangedListener);
-      }
-
-      // Start listening to the new one.
-      //
-      if (viewer != null)
-      {
-        viewer.addSelectionChangedListener(selectionChangedListener);
-      }
-
-      // Remember it.
-      //
-      currentViewer = viewer;
-
-      // Set the editors selection based on the current viewer's selection.
-      //
-      setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
-    }
-  }
-
-  /**
-   * This returns the viewer as required by the {@link IViewerProvider} interface. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  public Viewer getViewer()
-  {
-    return currentViewer;
-  }
-
-  /**
-   * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void createContextMenuFor(StructuredViewer viewer)
-  {
-    MenuManager contextMenu = new MenuManager("#PopUp");
-    contextMenu.add(new Separator("additions"));
-    contextMenu.setRemoveAllWhenShown(true);
-    contextMenu.addMenuListener(this);
-    Menu menu = contextMenu.createContextMenu(viewer.getControl());
-    viewer.getControl().setMenu(menu);
-    getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
-
-    int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-    Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
-    viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
-    viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
-  }
-
-  /**
-   * @ADDED
-   */
-  public CDOView getView()
-  {
-    return view;
-  }
-
-  /**
-   * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void createModelGen()
-  {
-    URI resourceURI = EditUIUtil.getURI(getEditorInput());
-    Exception exception = null;
-    Resource resource = null;
-    try
-    {
-      // Load the resource through the editing domain.
-      //
-      resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-    }
-    catch (Exception e)
-    {
-      exception = e;
-      resource = editingDomain.getResourceSet().getResource(resourceURI, false);
-    }
-
-    Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-    if (diagnostic.getSeverity() != Diagnostic.OK)
-    {
-      resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-    }
-    editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
-  }
-
-  /**
-   * @ADDED
-   */
-  public void createModel()
-  {
-    try
-    {
-      CDOEditorInput editorInput = (CDOEditorInput)getEditorInput();
-      view = editorInput.getView();
-
-      // TODO Check if a CommandStack is needed
-      BasicCommandStack commandStack = new BasicCommandStack();
-      commandStack.addCommandStackListener(new CommandStackListener()
-      {
-        public void commandStackChanged(final EventObject event)
-        {
-          getContainer().getDisplay().asyncExec(new Runnable()
-          {
-            public void run()
-            {
-              Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
-              if (mostRecentCommand != null)
-              {
-                setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-              }
-              if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed())
-              {
-                propertySheetPage.refresh();
-              }
-            }
-          });
-        }
-      });
-
-      ResourceSet resourceSet = view.getResourceSet();
-      editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, resourceSet);
-
-      String resourcePath = editorInput.getResourcePath();
-      if (resourcePath == null)
-      {
-        viewerInput = resourceSet;
-      }
-      else
-      {
-        URI resourceURI = CDOUtil.createResourceURI(resourcePath);
-        viewerInput = resourceSet.getResource(resourceURI, true);
-      }
-
-      // resourceSet.eAdapters().add(problemIndicationAdapter);
-    }
-    catch (RuntimeException ex)
-    {
-      ex.printStackTrace();
-      throw ex;
-    }
-  }
-
-  /**
-   * Returns a diagnostic describing the errors and warnings listed in the resource and the specified exception (if
-   * any). <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Diagnostic analyzeResourceProblems(Resource resource, Exception exception)
-  {
-    if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
-    {
-      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui.editor", 0,
-          getString("_UI_CreateModelError_message", resource.getURI()),
-          new Object[] { exception == null ? (Object)resource : exception });
-      basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
-      return basicDiagnostic;
-    }
-    else if (exception != null)
-    {
-      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui.editor", 0, getString(
-          "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
-    }
-    else
-    {
-      return Diagnostic.OK_INSTANCE;
-    }
-  }
-
-  /**
-   * This is the method used by the framework to install your own controls. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   */
-  public void createPagesGen()
-  {
-    // Creates the model from the editor input
-    //
-    createModel();
-
-    // Only creates the other pages if there is something that can be edited
-    //
-    if (!getEditingDomain().getResourceSet().getResources().isEmpty())
-    {
-      // Create a page for the selection tree view.
-      //
-      Tree tree = new Tree(getContainer(), SWT.MULTI);
-      selectionViewer = new TreeViewer(tree);
-      setCurrentViewer(selectionViewer);
-
-      selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-      selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-      selectionViewer.setInput(editingDomain.getResourceSet());
-      selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-
-      new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
-      createContextMenuFor(selectionViewer);
-      int pageIndex = addPage(tree);
-      setPageText(pageIndex, getString("_UI_SelectionPage_label"));
-
-      getSite().getShell().getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          setActivePage(0);
-        }
-      });
-    }
-
-    // Ensures that this editor will only display the page's tab
-    // area if there are more than one page
-    //
-    getContainer().addControlListener(new ControlAdapter()
-    {
-      boolean guard = false;
-
-      @Override
-      public void controlResized(ControlEvent event)
-      {
-        if (!guard)
-        {
-          guard = true;
-          hideTabs();
-          guard = false;
-        }
-      }
-    });
-
-    getSite().getShell().getDisplay().asyncExec(new Runnable()
-    {
-      public void run()
-      {
-        updateProblemIndication();
-      }
-    });
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  public void createPages()
-  {
-    try
-    {
-      // Creates the model from the editor input
-      //
-      createModel();
-
-      // Create a page for the selection tree view.
-      //
-      Tree tree = new Tree(getContainer(), SWT.MULTI);
-      selectionViewer = new TreeViewer(tree);
-      setCurrentViewer(selectionViewer);
-
-      selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-      selectionViewer.setLabelProvider(new CDOLabelProvider(adapterFactory, view, selectionViewer));
-      selectionViewer.setInput(viewerInput);
-      // selectionViewer.setSelection(new StructuredSelection(viewerInput),
-      // true);
-
-      new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
-      createContextMenuFor(selectionViewer);
-      int pageIndex = addPage(tree);
-      setPageText(pageIndex, getString("_UI_SelectionPage_label"));
-
-      setActivePage(0);
-
-      // Ensures that this editor will only display the page's tab
-      // area if there are more than one page
-      //
-      getContainer().addControlListener(new ControlAdapter()
-      {
-        boolean guard = false;
-
-        @Override
-        public void controlResized(ControlEvent event)
-        {
-          if (!guard)
-          {
-            guard = true;
-            hideTabs();
-            guard = false;
-          }
-        }
-      });
-
-      updateProblemIndication();
-      eventHandler = new CDOEventHandler(view, selectionViewer)
-      {
-        @Override
-        protected void objectInvalidated(InternalCDOObject cdoObject)
-        {
-          if (cdoObject instanceof CDOLegacyImpl)
-          {
-            CDOStateMachine.INSTANCE.read(cdoObject);
-          }
-        }
-
-        @Override
-        protected void viewConflict(final CDOObject conflictingObject, boolean firstConflict)
-        {
-          refreshViewer(conflictingObject);
-        }
-
-        @Override
-        protected void viewClosed()
-        {
-          closeEditor();
-        }
-
-        @Override
-        protected void viewDirtyStateChanged()
-        {
-          if (viewerInput instanceof CDOResource)
-          {
-            CDOResource resource = (CDOResource)viewerInput;
-            if (!view.isObjectRegistered(resource.cdoID()))
-            {
-              closeEditor();
-              return;
-            }
-          }
-
-          fireDirtyPropertyChange();
-        }
-      };
-    }
-    catch (RuntimeException ex)
-    {
-      OM.LOG.error(ex);
-      throw ex;
-    }
-  }
-
-  /**
-   * If there is just one page in the multi-page editor part, this hides the single tab at the bottom. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void hideTabs()
-  {
-    if (getPageCount() <= 1)
-    {
-      setPageText(0, "");
-      if (getContainer() instanceof CTabFolder)
-      {
-        ((CTabFolder)getContainer()).setTabHeight(1);
-        Point point = getContainer().getSize();
-        getContainer().setSize(point.x, point.y + 6);
-      }
-    }
-  }
-
-  /**
-   * If there is more than one page in the multi-page editor part, this shows the tabs at the bottom. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void showTabs()
-  {
-    if (getPageCount() > 1)
-    {
-      setPageText(0, getString("_UI_SelectionPage_label"));
-      if (getContainer() instanceof CTabFolder)
-      {
-        ((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
-        Point point = getContainer().getSize();
-        getContainer().setSize(point.x, point.y - 6);
-      }
-    }
-  }
-
-  /**
-   * This is used to track the active viewer. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected void pageChange(int pageIndex)
-  {
-    super.pageChange(pageIndex);
-
-    if (contentOutlinePage != null)
-    {
-      handleContentOutlineSelection(contentOutlinePage.getSelection());
-    }
-  }
-
-  /**
-   * This is how the framework determines which interfaces we implement. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public Object getAdapter(Class key)
-  {
-    if (key.equals(IContentOutlinePage.class))
-    {
-      return showOutlineView() ? getContentOutlinePage() : null;
-    }
-    else if (key.equals(IPropertySheetPage.class))
-    {
-      return getPropertySheetPage();
-    }
-    else if (key.equals(IGotoMarker.class))
-    {
-      return this;
-    }
-    else
-    {
-      return super.getAdapter(key);
-    }
-  }
-
-  /**
-   * This accesses a cached version of the content outliner. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public IContentOutlinePage getContentOutlinePage()
-  {
-    if (contentOutlinePage == null)
-    {
-      // The content outline is just a tree.
-      //
-      class MyContentOutlinePage extends ContentOutlinePage
-      {
-        @Override
-        public void createControl(Composite parent)
-        {
-          super.createControl(parent);
-          contentOutlineViewer = getTreeViewer();
-          contentOutlineViewer.addSelectionChangedListener(this);
-
-          // Set up the tree viewer.
-          //
-          contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-          contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-          contentOutlineViewer.setInput(editingDomain.getResourceSet());
-
-          // Make sure our popups work.
-          //
-          createContextMenuFor(contentOutlineViewer);
-
-          if (!editingDomain.getResourceSet().getResources().isEmpty())
-          {
-            // Select the root object in the view.
-            //
-            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources()
-                .get(0)), true);
-          }
-        }
-
-        @Override
-        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
-            IStatusLineManager statusLineManager)
-        {
-          super.makeContributions(menuManager, toolBarManager, statusLineManager);
-          contentOutlineStatusLineManager = statusLineManager;
-        }
-
-        @Override
-        public void setActionBars(IActionBars actionBars)
-        {
-          super.setActionBars(actionBars);
-          getActionBarContributor().shareGlobalActions(this, actionBars);
-        }
-      }
-
-      contentOutlinePage = new MyContentOutlinePage();
-
-      // Listen to selection so that we can handle it is a special way.
-      //
-      contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener()
-      {
-        // This ensures that we handle selections correctly.
-        //
-        public void selectionChanged(SelectionChangedEvent event)
-        {
-          handleContentOutlineSelection(event.getSelection());
-        }
-      });
-    }
-
-    return contentOutlinePage;
-  }
-
-  /**
-   * This accesses a cached version of the property sheet. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public IPropertySheetPage getPropertySheetPage()
-  {
-    if (propertySheetPage == null)
-    {
-      propertySheetPage = new ExtendedPropertySheetPage(editingDomain)
-      {
-        @Override
-        public void setSelectionToViewer(List<?> selection)
-        {
-          CDOEditor.this.setSelectionToViewer(selection);
-          CDOEditor.this.setFocus();
-        }
-
-        @Override
-        public void setActionBars(IActionBars actionBars)
-        {
-          super.setActionBars(actionBars);
-          getActionBarContributor().shareGlobalActions(this, actionBars);
-        }
-      };
-      propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
-    }
-
-    return propertySheetPage;
-  }
-
-  /**
-   * This deals with how we want selection in the outliner to affect the other views. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  public void handleContentOutlineSelection(ISelection selection)
-  {
-    if (selectionViewer != null && !selection.isEmpty() && selection instanceof IStructuredSelection)
-    {
-      Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
-      if (selectedElements.hasNext())
-      {
-        // Get the first selected element.
-        //
-        Object selectedElement = selectedElements.next();
-
-        ArrayList<Object> selectionList = new ArrayList<Object>();
-        selectionList.add(selectedElement);
-        while (selectedElements.hasNext())
-        {
-          selectionList.add(selectedElements.next());
-        }
-
-        // Set the selection to the widget.
-        //
-        selectionViewer.setSelection(new StructuredSelection(selectionList));
-      }
-    }
-  }
-
-  /**
-   * This is for implementing {@link IEditorPart} and simply tests the command stack. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated NOT
-   */
-  @Override
-  public boolean isDirty()
-  {
-    return view.isDirty();
-  }
-
-  /**
-   * This is for implementing {@link IEditorPart} and simply saves the model file. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  public void doSaveGen(IProgressMonitor progressMonitor)
-  {
-    // Save only resources that have actually changed.
-    //
-    final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
-    saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-
-    // Do the work within an operation because this is a long running activity that modifies the workbench.
-    //
-    WorkspaceModifyOperation operation = new WorkspaceModifyOperation()
-    {
-      // This is the method that gets invoked when the operation runs.
-      //
-      @Override
-      public void execute(IProgressMonitor monitor)
-      {
-        // Save the resources to the file system.
-        //
-        boolean first = true;
-        for (Resource resource : editingDomain.getResourceSet().getResources())
-        {
-          if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-              && !editingDomain.isReadOnly(resource))
-          {
-            try
-            {
-              savedResources.add(resource);
-              resource.save(saveOptions);
-            }
-            catch (Exception exception)
-            {
-              resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-            }
-            first = false;
-          }
-        }
-      }
-    };
-
-    updateProblemIndication = false;
-    try
-    {
-      // This runs the options, and shows progress.
-      //
-      new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-
-      // Refresh the necessary state.
-      //
-      ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
-      firePropertyChange(IEditorPart.PROP_DIRTY);
-    }
-    catch (Exception exception)
-    {
-      // Something went wrong that shouldn't.
-      //
-      PluginDelegator.INSTANCE.log(exception);
-    }
-    updateProblemIndication = true;
-    updateProblemIndication();
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  public void doSave(IProgressMonitor progressMonitor)
-  {
-    // Save only resources that have actually changed.
-    //
-    final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
-    saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-
-    // Do the work within an operation because this is a long running activity
-    // that modifies the workbench.
-    //
-    WorkspaceModifyOperation operation = new WorkspaceModifyOperation()
-    {
-      // This is the method that gets invoked when the operation runs.
-      //
-      @Override
-      public void execute(IProgressMonitor monitor)
-      {
-        // Save the resources to the file system.
-        //
-        boolean first = true;
-        for (Resource resource : editingDomain.getResourceSet().getResources())
-        {
-          if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-              && !editingDomain.isReadOnly(resource))
-          {
-            try
-            {
-              savedResources.add(resource);
-              resource.save(saveOptions);
-            }
-            catch (final TransactionException exception)
-            {
-              final Shell shell = getSite().getShell();
-              shell.getDisplay().syncExec(new Runnable()
-              {
-                public void run()
-                {
-                  CDOTransaction transaction = (CDOTransaction)view;
-                  Dialog dialog = new RollbackTransactionDialog(getEditorSite().getPage(), "Transaction Error",
-                      exception.getMessage(), transaction);
-                  switch (dialog.open())
-                  {
-                  case RollbackTransactionDialog.REMOTE:
-                    transaction.rollback(true);
-                    break;
-                  case RollbackTransactionDialog.LOCAL:
-                    transaction.rollback(false);
-                    break;
-                  }
-                }
-              });
-            }
-            catch (Exception exception)
-            {
-              OM.LOG.error(exception);
-              resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-            }
-
-            first = false;
-          }
-        }
-      }
-    };
-
-    updateProblemIndication = false;
-    try
-    {
-      // This runs the options, and shows progress.
-      //
-      new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-
-      // Refresh the necessary state.
-      //
-      ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
-    }
-    catch (Exception exception)
-    {
-      // Something went wrong that shouldn't.
-      //
-      PluginDelegator.INSTANCE.log(exception);
-    }
-    updateProblemIndication = true;
-    updateProblemIndication();
-  }
-
-  /**
-   * This returns whether something has been persisted to the URI of the specified resource. The implementation uses the
-   * URI converter from the editor's resource set to try to open an input stream. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  protected boolean isPersisted(Resource resource)
-  {
-    boolean result = false;
-    try
-    {
-      InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
-      if (stream != null)
-      {
-        result = true;
-        stream.close();
-      }
-    }
-    catch (IOException e)
-    {
-      // Ignore
-    }
-    return result;
-  }
-
-  /**
-   * This always returns true because it is not currently supported. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public boolean isSaveAsAllowedGen()
-  {
-    return true;
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  public boolean isSaveAsAllowed()
-  {
-    return false;
-  }
-
-  /**
-   * This also changes the editor's input. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void doSaveAs()
-  {
-    SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
-    saveAsDialog.open();
-    IPath path = saveAsDialog.getResult();
-    if (path != null)
-    {
-      IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-      if (file != null)
-      {
-        doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
-      }
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void doSaveAs(URI uri, IEditorInput editorInput)
-  {
-    editingDomain.getResourceSet().getResources().get(0).setURI(uri);
-    setInputWithNotify(editorInput);
-    setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
-        .getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-    doSave(progressMonitor);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void gotoMarker(IMarker marker)
-  {
-    try
-    {
-      if (marker.getType().equals(EValidator.MARKER))
-      {
-        String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
-        if (uriAttribute != null)
-        {
-          URI uri = URI.createURI(uriAttribute);
-          EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
-          if (eObject != null)
-          {
-            setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
-          }
-        }
-      }
-    }
-    catch (CoreException exception)
-    {
-      PluginDelegator.INSTANCE.log(exception);
-    }
-  }
-
-  /**
-   * This is called during startup. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void initGen(IEditorSite site, IEditorInput editorInput)
-  {
-    setSite(site);
-    setInputWithNotify(editorInput);
-    setPartName(editorInput.getName());
-    site.setSelectionProvider(this);
-    site.getPage().addPartListener(partListener);
-    ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  public void init(IEditorSite site, IEditorInput editorInput)
-  {
-    setSite(site);
-    setPartName(editorInput.getName());
-    site.setSelectionProvider(this);
-    site.getPage().addPartListener(partListener);
-    setInputWithNotify(editorInput);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void setFocus()
-  {
-    getControl(getActivePage()).setFocus();
-  }
-
-  /**
-   * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   */
-  public void addSelectionChangedListener(ISelectionChangedListener listener)
-  {
-    selectionChangedListeners.add(listener);
-  }
-
-  /**
-   * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   */
-  public void removeSelectionChangedListener(ISelectionChangedListener listener)
-  {
-    selectionChangedListeners.remove(listener);
-  }
-
-  /**
-   * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public ISelection getSelection()
-  {
-    return editorSelection;
-  }
-
-  /**
-   * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
-   * Calling this result will notify the listeners. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setSelection(ISelection selection)
-  {
-    editorSelection = selection;
-
-    for (ISelectionChangedListener listener : selectionChangedListeners)
-    {
-      listener.selectionChanged(new SelectionChangedEvent(this, selection));
-    }
-    setStatusLineManager(selection);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setStatusLineManager(ISelection selection)
-  {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
-        : getActionBars().getStatusLineManager();
-
-    if (statusLineManager != null)
-    {
-      if (selection instanceof IStructuredSelection)
-      {
-        Collection<?> collection = ((IStructuredSelection)selection).toList();
-        switch (collection.size())
-        {
-        case 0:
-        {
-          statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
-          break;
-        }
-        case 1:
-        {
-          String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-          statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
-          break;
-        }
-        default:
-        {
-          statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
-          break;
-        }
-        }
-      }
-      else
-      {
-        statusLineManager.setMessage("");
-      }
-    }
-  }
-
-  /**
-   * This looks up a string in the plugin's plugin.properties file. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private static String getString(String key)
-  {
-    return PluginDelegator.INSTANCE.getString(key);
-  }
-
-  /**
-   * This looks up a string in plugin.properties, making a substitution. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private static String getString(String key, Object s1)
-  {
-    return PluginDelegator.INSTANCE.getString(key, new Object[] { s1 });
-  }
-
-  /**
-   * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions
-   * from the Edit menu. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void menuAboutToShowGen(IMenuManager menuManager)
-  {
-    ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
-  }
-
-  /**
-   * @ADDED
-   */
-  public void menuAboutToShow(IMenuManager menuManager)
-  {
-    ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
-    MenuManager submenuManager = new MenuManager("New Root");
-    if (populateNewRoot(submenuManager))
-    {
-      menuManager.insertBefore("edit", submenuManager);
-    }
-
-    if (OM.TEST_BULK_ADD.isEnabled())
-    {
-      IStructuredSelection sel = (IStructuredSelection)editorSelection;
-      if (sel.size() == 1)
-      {
-        Object element = sel.getFirstElement();
-        if (element instanceof EObject)
-        {
-          final EObject object = (EObject)element;
-          final List<EReference> features = new ArrayList<EReference>();
-          for (EReference containment : object.eClass().getEAllContainments())
-          {
-            if (containment.isMany())
-            {
-              features.add(containment);
-            }
-          }
-
-          if (!features.isEmpty())
-          {
-            final IWorkbenchPage page = getSite().getPage();
-            menuManager.insertBefore("edit", new LongRunningAction(page, "Bulk Add" + SafeAction.INTERACTIVE)
-            {
-              private EReference feature;
-
-              private int instances;
-
-              @Override
-              protected void preRun() throws Exception
-              {
-                BulkAddDialog dialog = new BulkAddDialog(page, features);
-                if (dialog.open() == BulkAddDialog.OK)
-                {
-                  feature = dialog.getFeature();
-                  instances = dialog.getInstances();
-                }
-                else
-                {
-                  cancel();
-                }
-              }
-
-              @SuppressWarnings("unchecked")
-              @Override
-              protected void doRun() throws Exception
-              {
-                List<EObject> children = new ArrayList<EObject>();
-                for (int i = 0; i < instances; i++)
-                {
-                  EObject child = EcoreUtil.create(feature.getEReferenceType());
-                  children.add(child);
-                }
-
-                List<EObject> list = (EList<EObject>)object.eGet(feature);
-                list.addAll(children);
-              }
-            });
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * @ADDED
-   */
-  protected boolean populateNewRoot(MenuManager menuManager)
-  {
-    boolean populated = false;
-    List<CDOPackage> cdoPackages = Arrays.asList(view.getSession().getPackageManager().getPackages());
-    Collections.sort(cdoPackages);
-
-    for (CDOPackage cdoPackage : cdoPackages)
-    {
-      List<CDOClass> cdoClasses = Arrays.asList(cdoPackage.getConcreteClasses());
-      Collections.sort(cdoClasses);
-      // TODO Sorting by class name may not have the desired effect if the labels are computed by an ItemProvider!
-
-      if (!cdoClasses.isEmpty())
-      {
-        MenuManager submenuManager = new MenuManager(cdoPackage.getPackageURI());
-        for (CDOClass cdoClass : cdoClasses)
-        {
-          if (!cdoClass.isResource())
-          {
-            // TODO Optimize/cache this?
-            CreateRootAction action = new CreateRootAction(cdoClass);
-            submenuManager.add(action);
-            populated = true;
-          }
-        }
-
-        menuManager.add(submenuManager);
-      }
-    }
-
-    return populated;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EditingDomainActionBarContributor getActionBarContributor()
-  {
-    return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public IActionBars getActionBars()
-  {
-    return getActionBarContributor().getActionBars();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public AdapterFactory getAdapterFactory()
-  {
-    return adapterFactory;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void disposeGen()
-  {
-    updateProblemIndication = false;
-
-    ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-
-    getSite().getPage().removePartListener(partListener);
-
-    adapterFactory.dispose();
-
-    if (getActionBarContributor().getActiveEditor() == this)
-    {
-      getActionBarContributor().setActiveEditor(null);
-    }
-
-    if (propertySheetPage != null)
-    {
-      propertySheetPage.dispose();
-    }
-
-    if (contentOutlinePage != null)
-    {
-      contentOutlinePage.dispose();
-    }
-
-    super.dispose();
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  public void dispose()
-  {
-    updateProblemIndication = false;
-    eventHandler.dispose();
-    getSite().getPage().removePartListener(partListener);
-    adapterFactory.dispose();
-
-    if (getActionBarContributor().getActiveEditor() == this)
-    {
-      getActionBarContributor().setActiveEditor(null);
-    }
-
-    if (propertySheetPage != null)
-    {
-      propertySheetPage.dispose();
-    }
-
-    if (contentOutlinePage != null)
-    {
-      contentOutlinePage.dispose();
-    }
-
-    super.dispose();
-  }
-
-  /**
-   * Returns whether the outline view should be presented to the user. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected boolean showOutlineView()
-  {
-    return false;
-  }
-
-  /**
-   * @ADDED
-   */
-  protected void fireDirtyPropertyChange()
-  {
-    try
-    {
-      getSite().getShell().getDisplay().syncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            firePropertyChange(IEditorPart.PROP_DIRTY);
-          }
-          catch (Exception ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (Exception ignore)
-    {
-    }
-  }
-
-  /**
-   * @ADDED
-   */
-  protected void closeEditor()
-  {
-    try
-    {
-      getSite().getShell().getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            getSite().getPage().closeEditor(CDOEditor.this, false);
-            CDOEditor.this.dispose();
-          }
-          catch (Exception ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (Exception ignore)
-    {
-    }
-  }
-
-  /**
-   * @ADDED
-   */
-  public void refreshViewer(final Object element)
-  {
-    try
-    {
-      selectionViewer.getControl().getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            if (element == null)
-            {
-              selectionViewer.refresh(true);
-            }
-            else
-            {
-              selectionViewer.refresh(element, true);
-            }
-          }
-          catch (Exception ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (Exception ignore)
-    {
-    }
-  }
-
-  /**
-   * @ADDED
-   */
-  public static void open(final IWorkbenchPage page, final CDOView view, final String resourcePath)
-  {
-    Display display = page.getWorkbenchWindow().getShell().getDisplay();
-    display.asyncExec(new Runnable()
-    {
-      public void run()
-      {
-        try
-        {
-          IEditorReference[] references = find(page, view, resourcePath);
-          if (references.length != 0)
-          {
-            IEditorPart editor = references[0].getEditor(true);
-            page.activate(editor);
-          }
-          else
-          {
-            IEditorInput input = new CDOEditorInput(view, resourcePath);
-            page.openEditor(input, EDITOR_ID);
-          }
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-        }
-      }
-    });
-  }
-
-  /**
-   * @ADDED
-   */
-  public static IEditorReference[] find(IWorkbenchPage page, CDOView view, String resourcePath)
-  {
-    List<IEditorReference> result = new ArrayList<IEditorReference>();
-    IEditorReference[] editorReferences = page.getEditorReferences();
-    for (IEditorReference editorReference : editorReferences)
-    {
-      try
-      {
-        if (ObjectUtil.equals(editorReference.getId(), EDITOR_ID))
-        {
-          IEditorInput editorInput = editorReference.getEditorInput();
-          if (editorInput instanceof CDOEditorInput)
-          {
-            CDOEditorInput cdoInput = (CDOEditorInput)editorInput;
-            if (cdoInput.getView() == view)
-            {
-              if (resourcePath == null || ObjectUtil.equals(cdoInput.getResourcePath(), resourcePath))
-              {
-                result.add(editorReference);
-              }
-            }
-          }
-        }
-      }
-      catch (PartInitException ex)
-      {
-        OM.LOG.error(ex);
-      }
-    }
-
-    return result.toArray(new IEditorReference[result.size()]);
-  }
-
-  /**
-   * @ADDED
-   */
-  public static void refresh(IWorkbenchPage page, CDOView view)
-  {
-    IEditorReference[] references = find(page, view, null);
-    for (IEditorReference reference : references)
-    {
-      CDOEditor editor = (CDOEditor)reference.getEditor(false);
-      if (editor != null)
-      {
-        editor.refreshViewer(null);
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   * @ADDED
-   */
-  private final class CreateRootAction extends LongRunningAction
-  {
-    private CDOClass cdoClass;
-
-    private CreateRootAction(CDOClass cdoClass)
-    {
-      super(getEditorSite().getPage(), cdoClass.getName(), SharedIcons.getDescriptor(SharedIcons.OBJ_ECLASS));
-      this.cdoClass = cdoClass;
-    }
-
-    @Override
-    protected void doRun() throws Exception
-    {
-      Resource resource = null;
-      IStructuredSelection ssel = (IStructuredSelection)editorSelection;
-      if (ssel.isEmpty())
-      {
-        if (viewerInput instanceof Resource)
-        {
-          resource = (Resource)viewerInput;
-        }
-      }
-      else if (ssel.size() == 1)
-      {
-        Object element = ssel.getFirstElement();
-        if (element instanceof Resource)
-        {
-          resource = (Resource)element;
-        }
-        else if (element instanceof EObject)
-        {
-          resource = ((EObject)element).eResource();
-        }
-      }
-
-      if (resource != null)
-      {
-        InternalCDOObject object = ((CDOTransactionImpl)view).newInstance(cdoClass);
-        resource.getContents().add(object.cdoInternalInstance());
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditorInput.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditorInput.java
deleted file mode 100644
index bc48e747f2..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditorInput.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.editor;
-
-import org.eclipse.emf.cdo.CDOAudit;
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-
-import org.eclipse.net4j.connector.IConnector;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class CDOEditorInput extends PlatformObject implements IEditorInput
-{
-  private CDOView view;
-
-  private String resourcePath;
-
-  public CDOEditorInput(CDOView view, String resourcePath)
-  {
-    this.view = view;
-    this.resourcePath = resourcePath;
-  }
-
-  public CDOView getView()
-  {
-    return view;
-  }
-
-  public String getResourcePath()
-  {
-    return resourcePath;
-  }
-
-  public boolean exists()
-  {
-    return true;
-  }
-
-  public ImageDescriptor getImageDescriptor()
-  {
-    switch (view.getViewType())
-    {
-    case TRANSACTION:
-      return SharedIcons.getDescriptor(SharedIcons.OBJ_EDITOR);
-    case READONLY:
-      return SharedIcons.getDescriptor(SharedIcons.OBJ_EDITOR_READONLY);
-    case AUDIT:
-      return SharedIcons.getDescriptor(SharedIcons.OBJ_EDITOR_HISTORICAL);
-    }
-
-    return null;
-  }
-
-  public String getName()
-  {
-    if (resourcePath != null)
-    {
-      return new Path(resourcePath).lastSegment();
-    }
-
-    return view.getSession().getRepositoryName();
-  }
-
-  public IPersistableElement getPersistable()
-  {
-    return null;
-  }
-
-  public String getToolTipText()
-  {
-    CDOSession session = view.getSession();
-    IConnector connector = session.getConnector();
-    String repositoryName = session.getRepositoryName();
-
-    StringBuilder builder = new StringBuilder();
-    builder.append(connector.getURL());
-    builder.append("/");
-    builder.append(repositoryName);
-    if (resourcePath != null)
-    {
-      builder.append(resourcePath);
-    }
-
-    builder.append(" [");
-    builder.append(session.getSessionID());
-    builder.append(":");
-    builder.append(view.getViewID());
-    builder.append("]");
-
-    if (view.getViewType() != CDOView.Type.TRANSACTION)
-    {
-      builder.append(" readonly");
-    }
-
-    if (view instanceof CDOAudit)
-    {
-      builder.append(MessageFormat.format(" {0,date} {0,time}", ((CDOAudit)view).getTimeStamp()));
-    }
-
-    return builder.toString();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java
deleted file mode 100644
index 985d076563..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.editor;
-
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * @author Eike Stepper
- * @generated
- */
-public final class PluginDelegator extends EMFPlugin
-{
-  /**
-   * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final PluginDelegator INSTANCE = new PluginDelegator();
-
-  /**
-   * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private static Implementation plugin;
-
-  /**
-   * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public PluginDelegator()
-  {
-    super(new ResourceLocator[] {});
-  }
-
-  /**
-   * @ADDED
-   */
-  @Override
-  public void log(Object logEntry)
-  {
-    if (logEntry instanceof Throwable)
-    {
-      OM.LOG.error((Throwable)logEntry);
-    }
-    else
-    {
-      OM.LOG.info(logEntry.toString());
-    }
-  }
-
-  /**
-   * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the singleton instance.
-   * @generated
-   */
-  @Override
-  public ResourceLocator getPluginResourceLocator()
-  {
-    return plugin;
-  }
-
-  /**
-   * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the singleton instance.
-   * @generated
-   */
-  public static Implementation getPlugin()
-  {
-    return plugin;
-  }
-
-  /**
-   * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static class Implementation extends EclipseUIPlugin
-  {
-    /**
-     * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public Implementation()
-    {
-      super();
-
-      // Remember the static instance.
-      //
-      plugin = this;
-    }
-  }
-
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
deleted file mode 100644
index 942ec766f1..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.preferences;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-
-import org.eclipse.net4j.buffer.BufferInputStream;
-import org.eclipse.net4j.util.ui.UIUtil;
-import org.eclipse.net4j.util.ui.prefs.OMPreferencePage;
-import org.eclipse.net4j.util.ui.widgets.TextAndDisable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Eike Stepper
- */
-public class CDOPreferencePage extends OMPreferencePage
-{
-  private Text repositoryName;
-
-  private Text userName;
-
-  private Text connectorDescription;
-
-  private TextAndDisable referenceChunkSize;
-
-  private TextAndDisable preloadChunkSize;
-
-  private Button invalidationNotifications;
-
-  private TextAndDisable commitTimeout;
-
-  public CDOPreferencePage()
-  {
-    super(org.eclipse.emf.internal.cdo.bundle.OM.PREFS);
-  }
-
-  @Override
-  protected Control createUI(Composite parent)
-  {
-    Composite composite = UIUtil.createGridComposite(parent, 1);
-    ((GridLayout)composite.getLayout()).verticalSpacing = 5;
-    composite.setLayoutData(UIUtil.createGridData());
-
-    Group sessionGroup = new Group(composite, SWT.NONE);
-    sessionGroup.setLayout(new GridLayout(2, false));
-    sessionGroup.setText("Session Defaults");
-    sessionGroup.setLayoutData(UIUtil.createGridData(true, false));
-
-    new Label(sessionGroup, SWT.NONE).setText("Repository name:");
-    repositoryName = new Text(sessionGroup, SWT.BORDER);
-    repositoryName.setLayoutData(UIUtil.createGridData(true, false));
-
-    new Label(sessionGroup, SWT.NONE).setText("User name:");
-    userName = new Text(sessionGroup, SWT.BORDER);
-    userName.setLayoutData(UIUtil.createGridData(true, false));
-
-    new Label(sessionGroup, SWT.NONE).setText("Connector description:");
-    connectorDescription = new Text(sessionGroup, SWT.BORDER);
-    connectorDescription.setLayoutData(UIUtil.createGridData(true, false));
-
-    new Label(sessionGroup, SWT.NONE).setText("Reference chunk size:");
-    referenceChunkSize = new TextAndDisable(sessionGroup, SWT.BORDER, String.valueOf(CDORevision.UNCHUNKED));
-    referenceChunkSize.setLayoutData(UIUtil.createGridData(true, false));
-
-    Group viewGroup = new Group(composite, SWT.NONE);
-    viewGroup.setLayout(new GridLayout(2, false));
-    viewGroup.setText("View Defaults");
-    viewGroup.setLayoutData(UIUtil.createGridData(true, false));
-
-    new Label(viewGroup, SWT.NONE).setText("Preload chunk size:");
-    preloadChunkSize = new TextAndDisable(viewGroup, SWT.BORDER, String.valueOf(CDOView.NO_PRELOAD));
-    preloadChunkSize.setLayoutData(UIUtil.createGridData(true, false));
-
-    new Label(viewGroup, SWT.NONE).setText("EMF invalidation notifications:");
-    invalidationNotifications = new Button(viewGroup, SWT.CHECK);
-
-    Group transactionGroup = new Group(composite, SWT.NONE);
-    transactionGroup.setLayout(new GridLayout(2, false));
-    transactionGroup.setText("Transaction Defaults");
-    transactionGroup.setLayoutData(UIUtil.createGridData(true, false));
-
-    new Label(transactionGroup, SWT.NONE).setText("Commit timeout (millis):");
-    commitTimeout = new TextAndDisable(transactionGroup, SWT.BORDER, String.valueOf(BufferInputStream.NO_TIMEOUT))
-    {
-      @Override
-      protected GridData createTextLayoutData()
-      {
-        GridData gd = super.createTextLayoutData();
-        gd.widthHint = 64;
-        return gd;
-      }
-    };
-    commitTimeout.setLayoutData(UIUtil.createGridData(true, false));
-
-    initValues();
-    return composite;
-  }
-
-  protected void initValues()
-  {
-    repositoryName.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REPOSITORY_NAME.getValue());
-    userName.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_USER_NAME.getValue());
-    connectorDescription.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_CONNECTOR_DESCRIPTION.getValue());
-    referenceChunkSize.setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REFERENCE_CHUNK_SIZE
-        .getValue()));
-    preloadChunkSize.setValue(String
-        .valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE.getValue()));
-    invalidationNotifications
-        .setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATIONS.getValue());
-    commitTimeout.setValue(String
-        .valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_DEFAULT_COMMIT_TIMEOUT.getValue()));
-  }
-
-  @Override
-  public boolean performOk()
-  {
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_REPOSITORY_NAME.setValue(repositoryName.getText());
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_USER_NAME.setValue(userName.getText());
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_CONNECTOR_DESCRIPTION.setValue(connectorDescription.getText());
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_REFERENCE_CHUNK_SIZE.setValue(Integer.parseInt(referenceChunkSize
-        .getValue()));
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE.setValue(Integer
-        .parseInt(preloadChunkSize.getValue()));
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATIONS.setValue(invalidationNotifications
-        .getSelection());
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_DEFAULT_COMMIT_TIMEOUT.setValue(Long
-        .parseLong(commitTimeout.getValue()));
-    return super.performOk();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java
deleted file mode 100644
index ea55fbfe88..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.preferences;
-
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-import org.eclipse.emf.cdo.ui.CDOLabelProvider;
-
-import org.eclipse.net4j.util.ui.UIUtil;
-import org.eclipse.net4j.util.ui.prefs.OMPreferencePage;
-import org.eclipse.net4j.util.ui.widgets.TextAndDisable;
-
-import org.eclipse.jface.fieldassist.IContentProposalProvider;
-import org.eclipse.jface.fieldassist.IControlContentAdapter;
-import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;
-import org.eclipse.jface.fieldassist.TextContentAdapter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
-
-/**
- * @author Eike Stepper
- */
-public class CDOUIPreferencePage extends OMPreferencePage
-{
-  private TextAndDisable decoration;
-
-  public CDOUIPreferencePage()
-  {
-    super(OM.PREFS);
-  }
-
-  @Override
-  protected Control createUI(Composite parent)
-  {
-    Composite composite = UIUtil.createGridComposite(parent, 2);
-    composite.setLayoutData(UIUtil.createGridData());
-
-    new Label(composite, SWT.NONE).setText("Label decoration:");
-    decoration = new TextAndDisable(composite, SWT.BORDER, CDOLabelProvider.NO_DECORATION)
-    {
-      @Override
-      protected GridData createTextLayoutData()
-      {
-        return UIUtil.createGridData(true, false);
-      }
-    };
-    decoration.setLayoutData(UIUtil.createGridData(true, false));
-
-    Text text = decoration.getText();
-    IControlContentAdapter contentAdapter = new TextContentAdapter();
-    IContentProposalProvider provider = new SimpleContentProposalProvider(CDOLabelProvider.DECORATION_PROPOSALS);
-    new ContentAssistCommandAdapter(text, contentAdapter, provider, null, new char[] { '$' }, true);
-    UIUtil.addDecorationMargin(text);
-
-    initValues();
-    return composite;
-  }
-
-  protected void initValues()
-  {
-    decoration.setValue(OM.PREF_LABEL_DECORATION.getValue());
-  }
-
-  @Override
-  public boolean performOk()
-  {
-    OM.PREF_LABEL_DECORATION.setValue(decoration.getValue());
-    return super.performOk();
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
deleted file mode 100644
index 7e150a7ee8..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.views;
-
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.actions.OpenSessionAction;
-import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
-import org.eclipse.emf.cdo.ui.CDOItemProvider;
-
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.views.ContainerView;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbenchPage;
-
-public class CDOSessionsView extends ContainerView
-{
-  private OpenSessionAction openSessionAction;
-
-  public CDOSessionsView()
-  {
-  }
-
-  @Override
-  protected Control createUI(Composite parent)
-  {
-    openSessionAction = new OpenSessionAction(getViewSite().getPage());
-    return super.createUI(parent);
-  }
-
-  @Override
-  protected IManagedContainer getContainer()
-  {
-    return IPluginContainer.INSTANCE;
-  }
-
-  @Override
-  protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
-  {
-    return new CDOItemProvider(getSite().getPage(), new IElementFilter()
-    {
-      public boolean filter(Object element)
-      {
-        return element instanceof CDOSession;
-      }
-    });
-  }
-
-  @Override
-  protected void fillLocalToolBar(IToolBarManager manager)
-  {
-    manager.add(openSessionAction);
-    super.fillLocalToolBar(manager);
-  }
-
-  @Override
-  protected void doubleClicked(Object object)
-  {
-    if (object instanceof CDOViewHistory.Entry)
-    {
-      CDOViewHistory.Entry entry = (CDOViewHistory.Entry)object;
-      IWorkbenchPage page = getViewSite().getPage();
-      CDOView view = entry.getView();
-      String resourcePath = entry.getResourcePath();
-      CDOEditor.open(page, view, resourcePath);
-    }
-    else
-    {
-      super.doubleClicked(object);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java
deleted file mode 100644
index e129a29ecf..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.internal.ui.views;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.CDOViewResourcesEvent;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.ui.CDOViewHistoryEvent;
-
-import org.eclipse.net4j.internal.util.event.Event;
-import org.eclipse.net4j.internal.util.event.Notifier;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public final class CDOViewHistory extends Notifier
-{
-  private CDOView view;
-
-  private Set<Entry> entries = new HashSet<Entry>();
-
-  private IListener viewListener = new IListener()
-  {
-    public void notifyEvent(IEvent event)
-    {
-      if (event instanceof CDOViewResourcesEvent)
-      {
-        CDOViewResourcesEvent e = (CDOViewResourcesEvent)event;
-        if (e.getView() == view && e.getKind() == CDOViewResourcesEvent.Kind.ADDED)
-        {
-          addResource(e.getResourcePath());
-        }
-      }
-    }
-  };
-
-  public CDOViewHistory(CDOView view)
-  {
-    this.view = view;
-    view.addListener(viewListener);
-  }
-
-  public void dispose()
-  {
-    view.removeListener(viewListener);
-    entries.clear();
-  }
-
-  public CDOView getView()
-  {
-    return view;
-  }
-
-  public Entry[] getEntries()
-  {
-    synchronized (entries)
-    {
-      return entries.toArray(new Entry[entries.size()]);
-    }
-  }
-
-  public boolean hasEntries()
-  {
-    synchronized (entries)
-    {
-      return !entries.isEmpty();
-    }
-  }
-
-  public void reset()
-  {
-    Set<Entry> openResources = new HashSet<Entry>();
-    for (Resource resource : view.getResourceSet().getResources())
-    {
-      if (resource instanceof CDOResource)
-      {
-        CDOResource cdoResource = (CDOResource)resource;
-        openResources.add(new Entry(cdoResource.getPath()));
-      }
-    }
-
-    boolean changed;
-    synchronized (entries)
-    {
-      changed = entries.retainAll(openResources);
-    }
-
-    if (changed)
-    {
-      fireEvent(new ViewHistoryEvent(null));
-    }
-  }
-
-  protected void addResource(String resourcePath)
-  {
-    Entry entry = new Entry(resourcePath);
-    boolean changed;
-    synchronized (entries)
-    {
-      changed = entries.add(entry);
-    }
-
-    if (changed)
-    {
-      fireEvent(new ViewHistoryEvent(entry));
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class ViewHistoryEvent extends Event implements CDOViewHistoryEvent
-  {
-    private static final long serialVersionUID = 1L;
-
-    Entry addedEntry;
-
-    public ViewHistoryEvent(Entry addedEntry)
-    {
-      super(CDOViewHistory.this);
-      this.addedEntry = addedEntry;
-    }
-
-    public CDOViewHistory getViewHistory()
-    {
-      return CDOViewHistory.this;
-    }
-
-    public Entry getAddedEntry()
-    {
-      return addedEntry;
-    }
-
-    @Override
-    public String toString()
-    {
-      return MessageFormat.format("CDOViewHistoryEvent[source={0}, addedEntry={1}]", getSource(), getAddedEntry());
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public final class Entry implements Comparable<Entry>
-  {
-    private String resourcePath;
-
-    public Entry(String resourcePath)
-    {
-      if (resourcePath == null)
-      {
-        throw new IllegalArgumentException("resourcePath == null");
-      }
-
-      this.resourcePath = resourcePath;
-    }
-
-    public CDOView getView()
-    {
-      return view;
-    }
-
-    public String getResourcePath()
-    {
-      return resourcePath;
-    }
-
-    public int compareTo(Entry entry)
-    {
-      return resourcePath.compareTo(entry.resourcePath);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-      if (obj == this)
-      {
-        return true;
-      }
-
-      if (obj instanceof Entry)
-      {
-        Entry that = (Entry)obj;
-        return view == that.getView() && resourcePath.equals(that.resourcePath);
-      }
-
-      return false;
-    }
-
-    @Override
-    public int hashCode()
-    {
-      return resourcePath.hashCode();
-    }
-
-    @Override
-    public String toString()
-    {
-      return resourcePath;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
deleted file mode 100644
index 6263734801..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.ui;
-
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.CDOSessionInvalidationEvent;
-import org.eclipse.emf.cdo.CDOTransactionConflictEvent;
-import org.eclipse.emf.cdo.CDOTransactionFinishedEvent;
-import org.eclipse.emf.cdo.CDOTransactionStartedEvent;
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.ItemsProcessor;
-import org.eclipse.emf.cdo.protocol.id.CDOID;
-
-import org.eclipse.emf.internal.cdo.InternalCDOObject;
-
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-
-import org.eclipse.jface.viewers.TreeViewer;
-
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class CDOEventHandler
-{
-  private CDOView view;
-
-  private TreeViewer treeViewer;
-
-  private IListener sessionListener = new IListener()
-  {
-    public void notifyEvent(IEvent event)
-    {
-      if (event instanceof CDOSessionInvalidationEvent)
-      {
-        CDOSessionInvalidationEvent e = (CDOSessionInvalidationEvent)event;
-        if (e.getView() != view)
-        {
-          sessionInvalidated(e.getDirtyOIDs());
-        }
-      }
-      else if (event instanceof IContainerEvent)
-      {
-        IContainerEvent<?> e = (IContainerEvent<?>)event;
-        if (e.getDeltaElement() == view && e.getDeltaKind() == IContainerDelta.Kind.REMOVED)
-        {
-          viewClosed();
-        }
-      }
-      else if (event instanceof ILifecycleEvent)
-      {
-        ILifecycleEvent e = (ILifecycleEvent)event;
-        if (e.getKind() == ILifecycleEvent.Kind.DEACTIVATED)
-        {
-          viewClosed();
-        }
-      }
-    }
-  };
-
-  private IListener viewListener = new IListener()
-  {
-    public void notifyEvent(IEvent event)
-    {
-      if (event instanceof CDOTransactionFinishedEvent)
-      {
-        // CDOTransactionFinishedEvent e = (CDOTransactionFinishedEvent)event;
-        // if (e.getType() == CDOTransactionFinishedEvent.Type.COMMITTED)
-        // {
-        // Map<CDOID, CDOID> idMappings = e.getIDMappings();
-        // HashSet<CDOID> newOIDs = new HashSet<CDOID>(idMappings.values());
-        // new ItemsProcessor(view)
-        // {
-        // @Override
-        // protected void processCDOObject(TreeViewer viewer, InternalCDOObject cdoObject)
-        // {
-        // viewer.update(cdoObject.cdoInternalInstance(), null);
-        // }
-        // }.processCDOObjects(treeViewer, newOIDs);
-        // }
-        // else
-        {
-          try
-          {
-            treeViewer.getControl().getDisplay().syncExec(new Runnable()
-            {
-              public void run()
-              {
-                try
-                {
-                  treeViewer.refresh(true);
-                }
-                catch (Exception ignore)
-                {
-                }
-              }
-            });
-          }
-          catch (Exception ignore)
-          {
-          }
-        }
-
-        viewDirtyStateChanged();
-      }
-      else if (event instanceof CDOTransactionStartedEvent)
-      {
-        viewDirtyStateChanged();
-      }
-      else if (event instanceof CDOTransactionConflictEvent)
-      {
-        CDOTransactionConflictEvent e = (CDOTransactionConflictEvent)event;
-        viewConflict(e.getConflictingObject(), e.isFirstConflict());
-      }
-    }
-  };
-
-  public CDOEventHandler(CDOView view, TreeViewer treeViewer)
-  {
-    this.view = view;
-    this.treeViewer = treeViewer;
-    view.getSession().addListener(sessionListener);
-    view.addListener(viewListener);
-  }
-
-  public void dispose()
-  {
-    view.removeListener(viewListener);
-    view.getSession().removeListener(sessionListener);
-    treeViewer = null;
-    view = null;
-  }
-
-  public CDOView getView()
-  {
-    return view;
-  }
-
-  public TreeViewer getTreeViewer()
-  {
-    return treeViewer;
-  }
-
-  public void setViewer(TreeViewer viewer)
-  {
-    treeViewer = viewer;
-  }
-
-  protected void sessionInvalidated(Set<CDOID> dirtyOIDs)
-  {
-    new ItemsProcessor(view)
-    {
-      @Override
-      protected void processCDOObject(TreeViewer viewer, InternalCDOObject cdoObject)
-      {
-        objectInvalidated(cdoObject);
-        viewer.refresh(cdoObject.cdoInternalInstance(), true);
-      }
-    }.processCDOObjects(treeViewer, dirtyOIDs);
-  }
-
-  protected void objectInvalidated(InternalCDOObject cdoObject)
-  {
-  }
-
-  protected void viewDirtyStateChanged()
-  {
-  }
-
-  protected void viewConflict(CDOObject conflictingObject, boolean firstConflict)
-  {
-  }
-
-  protected void viewClosed()
-  {
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
deleted file mode 100644
index 708f37001f..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.ui;
-
-import org.eclipse.emf.cdo.CDOAudit;
-import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.CDOTransaction;
-import org.eclipse.emf.cdo.CDOTransactionFinishedEvent;
-import org.eclipse.emf.cdo.CDOTransactionStartedEvent;
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.CDOViewEvent;
-import org.eclipse.emf.cdo.internal.ui.SharedIcons;
-import org.eclipse.emf.cdo.internal.ui.actions.CloseSessionAction;
-import org.eclipse.emf.cdo.internal.ui.actions.CloseViewAction;
-import org.eclipse.emf.cdo.internal.ui.actions.CommitTransactionAction;
-import org.eclipse.emf.cdo.internal.ui.actions.CreateResourceAction;
-import org.eclipse.emf.cdo.internal.ui.actions.ImportResourceAction;
-import org.eclipse.emf.cdo.internal.ui.actions.LoadResourceAction;
-import org.eclipse.emf.cdo.internal.ui.actions.ManagePackagesAction;
-import org.eclipse.emf.cdo.internal.ui.actions.OpenAuditAction;
-import org.eclipse.emf.cdo.internal.ui.actions.OpenTransactionAction;
-import org.eclipse.emf.cdo.internal.ui.actions.OpenViewAction;
-import org.eclipse.emf.cdo.internal.ui.actions.OpenViewEditorAction;
-import org.eclipse.emf.cdo.internal.ui.actions.RegisterFilesystemPackagesAction;
-import org.eclipse.emf.cdo.internal.ui.actions.RegisterSinglePackageAction;
-import org.eclipse.emf.cdo.internal.ui.actions.RegisterWorkspacePackagesAction;
-import org.eclipse.emf.cdo.internal.ui.actions.ReloadViewAction;
-import org.eclipse.emf.cdo.internal.ui.actions.RollbackTransactionAction;
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory;
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory.Entry;
-import org.eclipse.emf.cdo.util.CDOPackageType;
-import org.eclipse.emf.cdo.util.CDOPackageTypeRegistry;
-
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IWorkbenchPage;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
-{
-  private IWorkbenchPage page;
-
-  private Map<CDOView, CDOViewHistory> viewHistories = new HashMap<CDOView, CDOViewHistory>();
-
-  private IListener viewListener = new IListener()
-  {
-    public void notifyEvent(IEvent event)
-    {
-      if (event instanceof CDOTransactionStartedEvent || event instanceof CDOTransactionFinishedEvent)
-      {
-        try
-        {
-          final CDOView view = ((CDOViewEvent)event).getView();
-          getViewer().getControl().getDisplay().syncExec(new Runnable()
-          {
-            public void run()
-            {
-              try
-              {
-                fireLabelProviderChanged(view);
-                CDOViewHistory history = viewHistories.get(view);
-                if (history != null)
-                {
-                  Entry[] entries = history.getEntries();
-                  if (entries != null && entries.length != 0)
-                  {
-                    fireLabelProviderChanged(entries);
-                  }
-                }
-              }
-              catch (Exception ignore)
-              {
-              }
-            }
-          });
-        }
-        catch (Exception ignore)
-        {
-        }
-      }
-    }
-  };
-
-  private IListener historyListener = new IListener()
-  {
-    public void notifyEvent(IEvent event)
-    {
-      if (event instanceof CDOViewHistoryEvent)
-      {
-        CDOViewHistoryEvent e = (CDOViewHistoryEvent)event;
-        CDOView view = e.getViewHistory().getView();
-        refreshElement(view, false);
-
-        Entry addedEntry = e.getAddedEntry();
-        if (addedEntry != null)
-        {
-          revealElement(addedEntry);
-        }
-      }
-    }
-  };
-
-  public CDOItemProvider(IWorkbenchPage page, IElementFilter rootElementFilter)
-  {
-    super(rootElementFilter);
-    this.page = page;
-  }
-
-  public CDOItemProvider(IWorkbenchPage page)
-  {
-    this(page, null);
-  }
-
-  @Override
-  public Object[] getChildren(Object element)
-  {
-    if (element instanceof CDOView)
-    {
-      CDOView view = (CDOView)element;
-      CDOViewHistory history = viewHistories.get(view);
-      if (history != null)
-      {
-        return history.getEntries();
-      }
-
-      return NO_ELEMENTS;
-    }
-
-    return super.getChildren(element);
-  }
-
-  @Override
-  public boolean hasChildren(Object element)
-  {
-    if (element instanceof CDOView)
-    {
-      CDOView view = (CDOView)element;
-      CDOViewHistory history = viewHistories.get(view);
-      if (history != null)
-      {
-        return history.hasEntries();
-      }
-
-      return false;
-    }
-
-    return super.hasChildren(element);
-  }
-
-  @Override
-  public Object getParent(Object element)
-  {
-    if (element instanceof CDOViewHistory.Entry)
-    {
-      return ((CDOViewHistory.Entry)element).getView();
-    }
-
-    return super.getParent(element);
-  }
-
-  @Override
-  public String getText(Object obj)
-  {
-    if (obj instanceof CDOSession)
-    {
-      return getSessionLabel((CDOSession)obj);
-    }
-
-    if (obj instanceof CDOView)
-    {
-      return getViewLabel((CDOView)obj);
-    }
-
-    if (obj instanceof CDOViewHistory.Entry)
-    {
-      return getHistroyEntryLabel((CDOViewHistory.Entry)obj);
-    }
-
-    return super.getText(obj);
-  }
-
-  @Override
-  public Image getImage(Object obj)
-  {
-    if (obj instanceof CDOSession)
-    {
-      return SharedIcons.getImage(SharedIcons.OBJ_SESSION);
-    }
-
-    if (obj instanceof CDOView)
-    {
-      CDOView view = (CDOView)obj;
-      switch (view.getViewType())
-      {
-      case TRANSACTION:
-        return SharedIcons.getImage(SharedIcons.OBJ_EDITOR);
-      case READONLY:
-        return SharedIcons.getImage(SharedIcons.OBJ_EDITOR_READONLY);
-      case AUDIT:
-        return SharedIcons.getImage(SharedIcons.OBJ_EDITOR_HISTORICAL);
-      }
-    }
-
-    return super.getImage(obj);
-  }
-
-  public static String getSessionLabel(CDOSession session)
-  {
-    IConnector connector = session.getConnector();
-    String repositoryName = session.getRepositoryName();
-    return "Session " + connector.getURL() + "/" + repositoryName + " [" + session.getSessionID() + "]";
-  }
-
-  public static String getViewLabel(CDOView view)
-  {
-    if (view instanceof CDOTransaction)
-    {
-      CDOTransaction transaction = (CDOTransaction)view;
-      return MessageFormat.format("{0}Transaction [{1}]", transaction.isDirty() ? "*" : "", transaction.getViewID());
-    }
-
-    if (view instanceof CDOAudit)
-    {
-      CDOAudit audit = (CDOAudit)view;
-      return MessageFormat.format("Audit [{0,date} {0,time}]", audit.getTimeStamp());
-    }
-
-    return MessageFormat.format("View [{0}]", view.getViewID());
-  }
-
-  public static String getHistroyEntryLabel(CDOViewHistory.Entry entry)
-  {
-    return (entry.getView().isDirty() ? "*" : "") + entry.getResourcePath();
-  }
-
-  @Override
-  protected void fillContextMenu(IMenuManager manager, ITreeSelection selection)
-  {
-    super.fillContextMenu(manager, selection);
-    if (selection.size() == 1)
-    {
-      Object object = selection.getFirstElement();
-      if (object instanceof CDOSession)
-      {
-        fillSession(manager, (CDOSession)object);
-      }
-      else if (object instanceof CDOView)
-      {
-        fillView(manager, (CDOView)object);
-      }
-      else if (object instanceof CDOViewHistory.Entry)
-      {
-        fillHistoryEntry(manager, (CDOViewHistory.Entry)object);
-      }
-    }
-  }
-
-  protected void fillSession(IMenuManager manager, CDOSession session)
-  {
-    manager.add(new OpenTransactionAction(page, session));
-    manager.add(new OpenViewAction(page, session));
-    manager.add(new OpenAuditAction(page, session));
-    manager.add(new Separator());
-    manager.add(new ManagePackagesAction(page, session));
-
-    MenuManager generatedManager = new MenuManager("Register Generated Package");
-    if (fillGenerated(generatedManager, session))
-    {
-      manager.add(generatedManager);
-    }
-
-    IAction a1 = new RegisterWorkspacePackagesAction(page, session);
-    a1.setText(a1.getText() + SafeAction.INTERACTIVE);
-    manager.add(a1);
-
-    RegisterFilesystemPackagesAction a2 = new RegisterFilesystemPackagesAction(page, session);
-    a2.setText(a2.getText() + SafeAction.INTERACTIVE);
-    manager.add(a2);
-
-    manager.add(new Separator());
-    manager.add(new CloseSessionAction(page, session));
-  }
-
-  protected boolean fillGenerated(MenuManager manager, CDOSession session)
-  {
-    Set<Map.Entry<String, CDOPackageType>> entrySet = CDOPackageTypeRegistry.INSTANCE.entrySet();
-    List<Map.Entry<String, CDOPackageType>> entryList = new ArrayList<Map.Entry<String, CDOPackageType>>(entrySet);
-    Collections.sort(entryList, new Comparator<Map.Entry<String, CDOPackageType>>()
-    {
-      public int compare(Map.Entry<String, CDOPackageType> e1, Map.Entry<String, CDOPackageType> e2)
-      {
-        return e1.getKey().compareTo(e2.getKey());
-      }
-    });
-
-    Set<String> registeredURIs = new HashSet<String>(session.getPackageRegistry().keySet());
-    boolean added = false;
-    for (Map.Entry<String, CDOPackageType> entry : entryList)
-    {
-      String packageURI = entry.getKey();
-      if (!registeredURIs.contains(packageURI))
-      {
-        manager.add(new RegisterSinglePackageAction(page, session, packageURI, entry.getValue()));
-        added = true;
-      }
-    }
-
-    return added;
-  }
-
-  protected void fillView(IMenuManager manager, CDOView view)
-  {
-    manager.add(new OpenViewEditorAction(page, view));
-    manager.add(new LoadResourceAction(page, view));
-    manager.add(new Separator());
-    if (view.getViewType() == CDOView.Type.TRANSACTION)
-    {
-      manager.add(new CreateResourceAction(page, view));
-      manager.add(new ImportResourceAction(page, view));
-      manager.add(new CommitTransactionAction(page, view));
-      manager.add(new RollbackTransactionAction(page, view));
-    }
-
-    manager.add(new Separator());
-    manager.add(new ReloadViewAction(page, view));
-    manager.add(new Separator());
-    manager.add(new CloseViewAction(page, view));
-  }
-
-  protected void fillHistoryEntry(IMenuManager manager, Entry entry)
-  {
-  }
-
-  @Override
-  protected void elementAdded(Object element, Object parent)
-  {
-    super.elementAdded(element, parent);
-    if (element instanceof CDOView)
-    {
-      CDOView view = (CDOView)element;
-      view.addListener(viewListener);
-
-      CDOViewHistory history = new CDOViewHistory(view);
-      history.addListener(historyListener);
-      viewHistories.put(view, history);
-    }
-  }
-
-  @Override
-  protected void elementRemoved(Object element, Object parent)
-  {
-    super.elementRemoved(element, parent);
-    if (element instanceof CDOView)
-    {
-      CDOView view = (CDOView)element;
-      view.removeListener(viewListener);
-
-      CDOViewHistory history = viewHistories.remove(view);
-      history.removeListener(historyListener);
-      history.dispose();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java
deleted file mode 100644
index 78d40e557e..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.ui;
-
-import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.ui.bundle.OM;
-import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-
-import org.eclipse.emf.internal.cdo.InternalCDOObject;
-import org.eclipse.emf.internal.cdo.util.FSMUtil;
-
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class CDOLabelProvider extends AdapterFactoryLabelProvider implements IColorProvider, IFontProvider
-{
-  public static final String[] DECORATION_PROPOSALS = { "${element}", "${id}", "${state}", "${created}", "${revised}" };
-
-  public static final String DEFAULT_DECORATION = DECORATION_PROPOSALS[0] + " [" + DECORATION_PROPOSALS[1] + "]";
-
-  public static final String NO_DECORATION = DECORATION_PROPOSALS[0];
-
-  private static final String[] DECORATION_ARGS = { "{0}", "{1}", "{2}", "{3,date} {3,time}", "{4,date} {4,time}" };
-
-  private static final Color GRAY = UIUtil.getDisplay().getSystemColor(SWT.COLOR_GRAY);
-
-  private static final Color RED = UIUtil.getDisplay().getSystemColor(SWT.COLOR_RED);
-
-  private Font bold;
-
-  private CDOView view;
-
-  private TreeViewer viewer;
-
-  private String pattern;
-
-  public CDOLabelProvider(AdapterFactory adapterFactory, CDOView view, TreeViewer viewer)
-  {
-    super(adapterFactory);
-    this.view = view;
-    this.viewer = viewer;
-    bold = UIUtil.getBoldFont(viewer.getControl());
-
-    pattern = OM.PREF_LABEL_DECORATION.getValue();
-    if (ObjectUtil.equals(pattern, NO_DECORATION))
-    {
-      pattern = null;
-    }
-    else
-    {
-      pattern = StringUtil.replace(pattern, DECORATION_PROPOSALS, DECORATION_ARGS);
-    }
-  }
-
-  public CDOView getView()
-  {
-    return view;
-  }
-
-  public TreeViewer getViewer()
-  {
-    return viewer;
-  }
-
-  @Override
-  public void dispose()
-  {
-    bold.dispose();
-    super.dispose();
-  }
-
-  @Override
-  public void notifyChanged(final Notification notification)
-  {
-    super.notifyChanged(notification);
-
-    try
-    {
-      viewer.getControl().getDisplay().syncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            viewer.refresh(notification.getNotifier(), true);
-          }
-          catch (Exception ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (Exception ignore)
-    {
-    }
-  }
-
-  @Override
-  public String getText(Object object)
-  {
-    return decorateText(super.getText(object), object);
-  }
-
-  @Override
-  public String getColumnText(Object object, int columnIndex)
-  {
-    return decorateText(super.getColumnText(object, columnIndex), object);
-  }
-
-  public Color getBackground(Object object)
-  {
-    return null;
-  }
-
-  public Color getForeground(Object object)
-  {
-    try
-    {
-      InternalCDOObject cdoObject = FSMUtil.adapt(object, view);
-      switch (cdoObject.cdoState())
-      {
-      case PROXY:
-        return GRAY;
-
-      case CONFLICT:
-        return RED;
-      }
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-
-    return null;
-  }
-
-  public Font getFont(Object object)
-  {
-    try
-    {
-      InternalCDOObject cdoObject = FSMUtil.adapt(object, view);
-      switch (cdoObject.cdoState())
-      {
-      case NEW:
-      case DIRTY:
-      case CONFLICT:
-        return bold;
-      }
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-
-    return null;
-  }
-
-  protected String decorateText(String text, Object object)
-  {
-    try
-    {
-      if (pattern != null)
-      {
-        InternalCDOObject obj = FSMUtil.adapt(object, view);
-        CDORevision rev = obj.cdoRevision();
-        long created = rev == null ? CDORevision.UNSPECIFIED_DATE : rev.getCreated();
-        long revised = rev == null ? CDORevision.UNSPECIFIED_DATE : rev.getRevised();
-        text = MessageFormat.format(pattern, text, obj.cdoID(), obj.cdoState(), created, revised);
-      }
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-
-    return text;
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEvent.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEvent.java
deleted file mode 100644
index b5a11ef383..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOViewHistoryEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.emf.cdo.ui;
-
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory;
-import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory.Entry;
-
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Eike Stepper
- */
-public interface CDOViewHistoryEvent extends IEvent
-{
-  public CDOViewHistory getViewHistory();
-
-  public Entry getAddedEntry();
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/.classpath b/plugins/org.eclipse.net4j.buddies.server/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/.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.buddies.server/.cvsignore b/plugins/org.eclipse.net4j.buddies.server/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.net4j.buddies.server/.options b/plugins/org.eclipse.net4j.buddies.server/.options
deleted file mode 100644
index a86755cbde..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.buddies.server/debug = true
diff --git a/plugins/org.eclipse.net4j.buddies.server/.project b/plugins/org.eclipse.net4j.buddies.server/.project
deleted file mode 100644
index ea1ae5a97c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.buddies.server</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ce02136e96..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,272 +0,0 @@
-#Sat Feb 23 10:52:29 CET 2008
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index cd45f93b71..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:52:29 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.buddies.server/BuddiesServer.launch b/plugins/org.eclipse.net4j.buddies.server/BuddiesServer.launch
deleted file mode 100644
index c0bbdf5d46..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/BuddiesServer.launch
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.emf.cdo.server.app"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.net4j,org.eclipse.net4j.buddies.server,org.eclipse.net4j.db,org.eclipse.net4j.db.derby,org.eclipse.net4j.tcp"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/BuddiesServer"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../buddies.server"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}&#13;&#10;-debug&#13;&#10;-console&#13;&#10;--launcher.XXMaxPermSize&#13;&#10;128M"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Ddebug=true&#13;&#10;-Dnet4j.config=${resource_loc:/org.eclipse.net4j.buddies.server/config}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,javax.servlet,org.apache.commons.logging,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.expressions,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.servlet,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.platform,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.cheatsheets,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.ui,org.mortbay.jetty"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.protocol,org.eclipse.ant.optional.junit,org.eclipse.net4j.db.hsqldb,org.eclipse.net4j.chat,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.net4j.buddies.protocol,org.eclipse.net4j.db.mysql,org.eclipse.net4j.fileshare,org.eclipse.net4j.buddies.server,org.eclipse.net4j.db.derby,org.eclipse.net4j.db,org.eclipse.net4j,org.eclipse.net4j.tcp"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useNamedJRE" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
deleted file mode 100644
index 80286815b5..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.buddies.server;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.buddies.internal.server.bundle.OM$Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j.buddies.protocol;visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.internal.server;version="0.8.0",
- org.eclipse.net4j.buddies.internal.server.protocol;version="0.8.0",
- org.eclipse.net4j.buddies.server;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.server/about.html b/plugins/org.eclipse.net4j.buddies.server/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/about.html
+++ /dev/null
@@ -1,28 +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.buddies.server/about.ini b/plugins/org.eclipse.net4j.buddies.server/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/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.buddies.server/about.mappings b/plugins/org.eclipse.net4j.buddies.server/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/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.buddies.server/about.properties b/plugins/org.eclipse.net4j.buddies.server/about.properties
deleted file mode 100644
index 098bcffbc6..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 Buddies Server (Incubation)
-featureText = Net4j Buddies Server\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/Net4j
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.buddies.server/build.properties b/plugins/org.eclipse.net4j.buddies.server/build.properties
deleted file mode 100644
index 9309926198..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.xml,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.net4j.buddies.server/config/cdo-server.xml b/plugins/org.eclipse.net4j.buddies.server/config/cdo-server.xml
deleted file mode 100644
index 06282d70e7..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/config/cdo-server.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cdoServer>
-
-	<acceptor type="tcp" listenAddr="0.0.0.0" port="2036">
-		<!-- 
-		<negotiator type="challenge" description="/temp/users.db"/> 
-		-->
-	</acceptor>
-
-</cdoServer>
diff --git a/plugins/org.eclipse.net4j.buddies.server/copyright.txt b/plugins/org.eclipse.net4j.buddies.server/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies.server/epl-v10.html b/plugins/org.eclipse.net4j.buddies.server/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies.server/license.html b/plugins/org.eclipse.net4j.buddies.server/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies.server/modeling32.png b/plugins/org.eclipse.net4j.buddies.server/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.server/plugin.properties b/plugins/org.eclipse.net4j.buddies.server/plugin.properties
deleted file mode 100644
index 443c463351..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Buddies Server (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.buddies.server/plugin.xml b/plugins/org.eclipse.net4j.buddies.server/plugin.xml
deleted file mode 100644
index ee196a9dee..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.net4j.util.factories">
-      <factory
-            class="org.eclipse.net4j.buddies.internal.server.protocol.ServerProtocolFactory"
-            productGroup="org.eclipse.net4j.serverProtocols"
-            type="buddies"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java
deleted file mode 100644
index 5eaf3ca508..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server;
-
-import org.eclipse.net4j.buddies.internal.protocol.Account;
-import org.eclipse.net4j.buddies.internal.protocol.Buddy;
-import org.eclipse.net4j.buddies.internal.protocol.BuddyStateNotification;
-import org.eclipse.net4j.buddies.internal.protocol.Collaboration;
-import org.eclipse.net4j.buddies.internal.protocol.CollaborationContainer;
-import org.eclipse.net4j.buddies.internal.protocol.Membership;
-import org.eclipse.net4j.buddies.internal.protocol.ServerFacilityFactory;
-import org.eclipse.net4j.buddies.internal.server.bundle.OM;
-import org.eclipse.net4j.buddies.internal.server.protocol.BuddyRemovedNotification;
-import org.eclipse.net4j.buddies.internal.server.protocol.CollaborationInitiatedNotification;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IBuddyStateEvent;
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.buddies.server.IBuddyAdmin;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.protocol.IProtocol;
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * @author Eike Stepper
- */
-public class BuddyAdmin extends CollaborationContainer implements IBuddyAdmin, IListener
-{
-  public static final BuddyAdmin INSTANCE = new BuddyAdmin();
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, BuddyAdmin.class);
-
-  private ConcurrentMap<String, IAccount> accounts = new ConcurrentHashMap<String, IAccount>();
-
-  private ConcurrentMap<String, ISession> sessions = new ConcurrentHashMap<String, ISession>();
-
-  private long lastCollaborationID;
-
-  public BuddyAdmin()
-  {
-    activate();
-  }
-
-  public Map<String, IAccount> getAccounts()
-  {
-    return accounts;
-  }
-
-  public ISession getSession(IBuddy buddy)
-  {
-    return getSession(buddy.getUserID());
-  }
-
-  public ISession getSession(String userID)
-  {
-    return sessions.get(userID);
-  }
-
-  public ISession[] getSessions()
-  {
-    return sessions.values().toArray(new ISession[sessions.size()]);
-  }
-
-  public IBuddy[] getBuddies()
-  {
-    List<IBuddy> buddies = new ArrayList<IBuddy>();
-    for (ISession session : sessions.values())
-    {
-      buddies.add(session.getSelf());
-    }
-
-    return buddies.toArray(new IBuddy[buddies.size()]);
-  }
-
-  public IBuddy getBuddy(String userID)
-  {
-    ISession session = getSession(userID);
-    if (session == null)
-    {
-      return null;
-    }
-
-    return session.getSelf();
-  }
-
-  public synchronized ISession openSession(IChannel channel, String userID, String password, String[] facilityTypes)
-  {
-    if (sessions.containsKey(userID))
-    {
-      return null;
-    }
-
-    IAccount account = accounts.get(userID);
-    if (account != null)
-    {
-      if (!account.authenticate(password))
-      {
-        return null;
-      }
-    }
-    else
-    {
-      account = new Account(userID, password);
-      accounts.put(userID, account);
-    }
-
-    ServerBuddy buddy = new ServerBuddy(account, facilityTypes);
-    buddy.activate();
-    buddy.addListener(this);
-
-    ServerSession session = new ServerSession(channel, buddy);
-    ((IProtocol)channel.getReceiveHandler()).setInfraStructure(session);
-    session.addListener(this);
-    buddy.setSession(session);
-    LifecycleUtil.activate(session);
-
-    if (TRACER.isEnabled()) TRACER.trace("Opened session: " + userID);
-    sessions.put(userID, session);
-    return session;
-  }
-
-  public ICollaboration initiateCollaboration(IBuddy initiator, String... userIDs)
-  {
-    long collaborationID;
-    synchronized (this)
-    {
-      collaborationID = ++lastCollaborationID;
-    }
-
-    Collaboration collaboration = new Collaboration(collaborationID);
-    collaboration.activate();
-    Membership.create(initiator, collaboration);
-
-    Set<IBuddy> buddies = new HashSet<IBuddy>();
-    buddies.add(initiator);
-    for (String userID : userIDs)
-    {
-      Buddy buddy = (Buddy)getBuddy(userID);
-      if (buddy != null)
-      {
-        buddies.add(buddy);
-        Membership.create(buddy, collaboration);
-      }
-    }
-
-    addCollaboration(collaboration);
-
-    Set<IBuddy> invitations = new HashSet<IBuddy>(buddies);
-    for (IBuddy buddy : buddies)
-    {
-      if (buddy != initiator)
-      {
-        try
-        {
-          invitations.remove(buddy);
-          IChannel channel = buddy.getSession().getChannel();
-          new CollaborationInitiatedNotification(channel, collaborationID, invitations, null).send();
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-        }
-        finally
-        {
-          invitations.add(buddy);
-        }
-      }
-    }
-
-    return collaboration;
-  }
-
-  @Override
-  public void notifyEvent(IEvent event)
-  {
-    if (event.getSource() instanceof ServerSession)
-    {
-      if (event instanceof ILifecycleEvent)
-      {
-        if (((ILifecycleEvent)event).getKind() == ILifecycleEvent.Kind.DEACTIVATED)
-        {
-          String userID = ((ServerSession)event.getSource()).getSelf().getUserID();
-          synchronized (this)
-          {
-            ServerSession removed = (ServerSession)sessions.remove(userID);
-            if (removed != null)
-            {
-              removed.removeListener(this);
-              removed.getSelf().removeListener(this);
-              for (ISession session : sessions.values())
-              {
-                try
-                {
-                  new BuddyRemovedNotification(session.getChannel(), userID).send();
-                }
-                catch (Exception ex)
-                {
-                  OM.LOG.error(ex);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    else if (event.getSource() instanceof ServerBuddy)
-    {
-      if (event instanceof IBuddyStateEvent)
-      {
-        IBuddyStateEvent e = (IBuddyStateEvent)event;
-        synchronized (this)
-        {
-          for (ISession session : sessions.values())
-          {
-            try
-            {
-              if (!ObjectUtil.equals(session.getSelf(), e.getBuddy()))
-              {
-                new BuddyStateNotification(session.getChannel(), e.getBuddy().getUserID(), e.getNewState()).send();
-              }
-            }
-            catch (Exception ex)
-            {
-              OM.LOG.error(ex);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  public static Set<String> getFacilityTypes()
-  {
-    return IPluginContainer.INSTANCE.getFactoryTypes(ServerFacilityFactory.PRODUCT_GROUP);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
deleted file mode 100644
index c558dc9b67..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server;
-
-import org.eclipse.net4j.buddies.internal.protocol.Buddy;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IMembership;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-
-/**
- * @author Eike Stepper
- */
-public class ServerBuddy extends Buddy
-{
-  private IAccount account;
-
-  public ServerBuddy(IAccount account, String[] facilityTypes)
-  {
-    super(null, new HashSet<String>(Arrays.asList(facilityTypes)));
-    this.account = account;
-  }
-
-  public String getUserID()
-  {
-    return account.getUserID();
-  }
-
-  public IAccount getAccount()
-  {
-    return account;
-  }
-
-  public IMembership[] initiate(Collection<IBuddy> buddies)
-  {
-    // TODO Implement method ServerBuddy.initiate()
-    throw new UnsupportedOperationException("Not yet implemented");
-  }
-
-  public IMembership join(long collaborationID)
-  {
-    // TODO Implement method ServerBuddy.join()
-    throw new UnsupportedOperationException("Not yet implemented");
-  }
-
-  public IMembership join(Object invitationToken)
-  {
-    // TODO Implement method ServerBuddy.join()
-    throw new UnsupportedOperationException("Not yet implemented");
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java
deleted file mode 100644
index e78e06a8a9..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server;
-
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.PlatformObject;
-
-/**
- * @author Eike Stepper
- */
-public class ServerSession extends Lifecycle implements ISession, IListener
-{
-  private IChannel channel;
-
-  private IBuddy self;
-
-  public ServerSession(IChannel channel, IBuddy self)
-  {
-    this.channel = channel;
-    this.self = self;
-  }
-
-  public IChannel getChannel()
-  {
-    return channel;
-  }
-
-  public IBuddy getSelf()
-  {
-    return self;
-  }
-
-  public void close()
-  {
-    channel.close();
-    deactivate();
-  }
-
-  /**
-   * @see PlatformObject#getAdapter(Class)
-   */
-  @SuppressWarnings("unchecked")
-  public Object getAdapter(Class adapter)
-  {
-    return Platform.getAdapterManager().getAdapter(this, adapter);
-  }
-
-  public void notifyEvent(IEvent event)
-  {
-    if (event.getSource() == channel)
-    {
-      if (event instanceof ILifecycleEvent)
-      {
-        if (((ILifecycleEvent)event).getKind() == ILifecycleEvent.Kind.DEACTIVATED)
-        {
-          deactivate();
-        }
-      }
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    channel.addListener(this);
-    self.getAccount().touch();
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    self.getAccount().touch();
-    channel.removeListener(this);
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
deleted file mode 100644
index 958c2c1ac9..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.bundle;
-
-import org.eclipse.net4j.buddies.internal.server.BuddyAdmin;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.buddies.server"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_REPOSITORY = DEBUG.tracer("repository"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_SESSION = DEBUG.tracer("session"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_REVISION = DEBUG.tracer("revision"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_RESOURCE = DEBUG.tracer("resource"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_STORE = DEBUG.tracer("store"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_TYPES = DEBUG.tracer("types"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  static void stop() throws Exception
-  {
-    BuddyAdmin.INSTANCE.deactivate();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java
deleted file mode 100644
index a31196ed83..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class BuddyAddedNotification extends Request
-{
-  private String buddy;
-
-  public BuddyAddedNotification(IChannel channel, String buddy)
-  {
-    super(channel);
-    this.buddy = buddy;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_BUDDY_ADDED;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(buddy);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java
deleted file mode 100644
index 7a0ec52048..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class BuddyRemovedNotification extends Request
-{
-  private String buddy;
-
-  public BuddyRemovedNotification(IChannel channel, String buddy)
-  {
-    super(channel);
-    this.buddy = buddy;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_BUDDY_REMOVED;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(buddy);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
deleted file mode 100644
index b0ac8fb83f..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-import java.util.Collection;
-
-/**
- * @author Eike Stepper
- */
-public class CollaborationInitiatedNotification extends Request
-{
-  private long collaborationID;
-
-  private Collection<IBuddy> buddies;
-
-  private String[] facilityTypes;
-
-  public CollaborationInitiatedNotification(IChannel channel, long collaborationID, Collection<IBuddy> buddies,
-      String[] facilityTypes)
-  {
-    super(channel);
-    this.collaborationID = collaborationID;
-    this.buddies = buddies;
-    this.facilityTypes = facilityTypes;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_COLLABORATION_INITIATED;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeLong(collaborationID);
-    ProtocolUtil.writeBuddies(out, buddies);
-    ProtocolUtil.writeFacilityTypes(out, facilityTypes);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java
deleted file mode 100644
index deab325c73..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class FacilityInstalledNotification extends Request
-{
-  private long collaborationID;
-
-  private String facilityType;
-
-  public FacilityInstalledNotification(IChannel channel, long collaborationID, String facilityType)
-  {
-    super(channel);
-    this.collaborationID = collaborationID;
-    this.facilityType = facilityType;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_FACILITY_INSTALLED;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeLong(collaborationID);
-    out.writeString(facilityType);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java
deleted file mode 100644
index b28325bfdc..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.buddies.server.IBuddyAdmin;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class InitiateCollaborationIndication extends IndicationWithResponse
-{
-  private ICollaboration collaboration;
-
-  public InitiateCollaborationIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_INITIATE_COLLABORATION;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    String[] userIDs = ProtocolUtil.readUserIDs(in);
-    ISession session = (ISession)getProtocol().getInfraStructure();
-    IBuddy initiator = session.getSelf();
-    collaboration = IBuddyAdmin.INSTANCE.initiateCollaboration(initiator, userIDs);
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeLong(collaboration.getID());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java
deleted file mode 100644
index 61b37480a7..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.Collaboration;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.internal.protocol.ServerFacilityFactory;
-import org.eclipse.net4j.buddies.internal.server.BuddyAdmin;
-import org.eclipse.net4j.buddies.internal.server.bundle.OM;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IFacility;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class InstallFacilityIndication extends IndicationWithResponse
-{
-  private static final String FACILITY_GROUP = ServerFacilityFactory.PRODUCT_GROUP;
-
-  private boolean success;
-
-  public InstallFacilityIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_INSTALL_FACILITY;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    long collaborationID = in.readLong();
-    String facilityType = in.readString();
-
-    try
-    {
-      String description = String.valueOf(collaborationID);
-      IFacility facility = (IFacility)IPluginContainer.INSTANCE.getElement(FACILITY_GROUP, facilityType, description);
-
-      Collaboration collaboration = (Collaboration)BuddyAdmin.INSTANCE.getCollaboration(collaborationID);
-      if (collaboration != null)
-      {
-        facility.setCollaboration(collaboration);
-        collaboration.addFacility(facility, true);
-
-        ISession session = (ISession)getProtocol().getInfraStructure();
-        IBuddy initiator = session.getSelf();
-
-        for (IBuddy buddy : collaboration.getBuddies())
-        {
-          if (buddy != initiator)
-          {
-            try
-            {
-              IChannel channel = buddy.getSession().getChannel();
-              new FacilityInstalledNotification(channel, collaborationID, facilityType).send();
-            }
-            catch (Exception ex)
-            {
-              OM.LOG.error(ex);
-            }
-          }
-        }
-
-        success = true;
-      }
-    }
-    catch (RuntimeException ex)
-    {
-      OM.LOG.error(ex);
-    }
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeBoolean(success);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java
deleted file mode 100644
index aa68225e04..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.Collaboration;
-import org.eclipse.net4j.buddies.internal.protocol.Membership;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.internal.server.BuddyAdmin;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class InviteBuddiesIndication extends Indication
-{
-  public InviteBuddiesIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_INVITE_BUDDIES;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    long collaborationID = in.readLong();
-    String[] userIDs = ProtocolUtil.readUserIDs(in);
-
-    Collaboration collaboration = (Collaboration)BuddyAdmin.INSTANCE.getCollaboration(collaborationID);
-    if (collaboration != null)
-    {
-      Set<IBuddy> added = new HashSet<IBuddy>();
-      for (String userID : userIDs)
-      {
-        IBuddy buddy = BuddyAdmin.INSTANCE.getBuddy(userID);
-        if (buddy != null && collaboration.getMembership(buddy) == null)
-        {
-          Membership.create(buddy, collaboration);
-          added.add(buddy);
-        }
-      }
-
-      List<IBuddy> buddies = Arrays.asList(collaboration.getBuddies());
-      for (IBuddy buddy : buddies)
-      {
-        IChannel channel = buddy.getSession().getChannel();
-        String[] facilityTypes = null;
-        Set<IBuddy> set = new HashSet<IBuddy>();
-        if (added.contains(buddy))
-        {
-          set.addAll(buddies);
-          set.remove(buddy);
-          facilityTypes = collaboration.getFacilityTypes();
-        }
-        else
-        {
-          set.addAll(added);
-        }
-
-        if (!set.isEmpty())
-        {
-          try
-          {
-            new CollaborationInitiatedNotification(channel, collaborationID, set, facilityTypes).send();
-          }
-          catch (Exception ex)
-          {
-            throw WrappedException.wrap(ex);
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java
deleted file mode 100644
index b67a390c69..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.buddies.server.IBuddyAdmin;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class LoadAccountIndication extends IndicationWithResponse
-{
-  private IAccount account;
-
-  public LoadAccountIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_LOAD_ACCOUNT;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    String userID = in.readString();
-    account = IBuddyAdmin.INSTANCE.getAccounts().get(userID);
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    ProtocolUtil.writeAccount(out, account);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java
deleted file mode 100644
index 75212ed67a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.internal.server.bundle.OM;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.buddies.server.IBuddyAdmin;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class OpenSessionIndication extends IndicationWithResponse
-{
-  private IAccount account;
-
-  private IBuddy[] buddies;
-
-  public OpenSessionIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_OPEN_SESSION;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    String userID = in.readString();
-    String password = in.readString();
-    int size = in.readInt();
-    String[] facilityTypes = new String[size];
-    for (int i = 0; i < size; i++)
-    {
-      facilityTypes[i] = in.readString();
-    }
-
-    synchronized (IBuddyAdmin.INSTANCE)
-    {
-      buddies = IBuddyAdmin.INSTANCE.getBuddies();
-      ISession session = IBuddyAdmin.INSTANCE.openSession(getProtocol().getChannel(), userID, password, facilityTypes);
-      if (session != null)
-      {
-        account = session.getSelf().getAccount();
-      }
-      else
-      {
-        OM.LOG.info("User denied: " + userID);
-      }
-    }
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    ProtocolUtil.writeAccount(out, account);
-    if (account != null)
-    {
-      List<IChannel> channels = new ArrayList<IChannel>();
-      out.writeInt(buddies.length);
-      for (IBuddy buddy : buddies)
-      {
-        out.writeString(buddy.getUserID());
-        ISession buddySession = IBuddyAdmin.INSTANCE.getSession(buddy);
-        if (buddySession != null)
-        {
-          channels.add(buddySession.getChannel());
-        }
-      }
-
-      for (IChannel channel : channels)
-      {
-        try
-        {
-          new BuddyAddedNotification(channel, account.getUserID()).send();
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java
deleted file mode 100644
index a9b18c5d93..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.BuddyStateIndication;
-import org.eclipse.net4j.buddies.internal.server.ServerBuddy;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.buddies.protocol.IBuddy.State;
-import org.eclipse.net4j.buddies.server.IBuddyAdmin;
-
-/**
- * @author Eike Stepper
- */
-public class ServerBuddyStateIndication extends BuddyStateIndication
-{
-  public ServerBuddyStateIndication()
-  {
-  }
-
-  @Override
-  protected void stateChanged(String userID, State state)
-  {
-    synchronized (IBuddyAdmin.INSTANCE)
-    {
-      ISession session = IBuddyAdmin.INSTANCE.getSession(userID);
-      if (session != null)
-      {
-        ServerBuddy buddy = (ServerBuddy)session.getSelf();
-        buddy.setState(state);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java
deleted file mode 100644
index fd97b2d99e..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.Buddy;
-import org.eclipse.net4j.buddies.internal.protocol.Collaboration;
-import org.eclipse.net4j.buddies.internal.protocol.CollaborationLeftIndication;
-import org.eclipse.net4j.buddies.internal.protocol.CollaborationLeftNotification;
-import org.eclipse.net4j.buddies.internal.server.BuddyAdmin;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IMembership;
-import org.eclipse.net4j.buddies.server.IBuddyAdmin;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.util.WrappedException;
-
-/**
- * @author Eike Stepper
- */
-public class ServerCollaborationLeftIndication extends CollaborationLeftIndication
-{
-  public ServerCollaborationLeftIndication()
-  {
-    super(IBuddyAdmin.INSTANCE, IBuddyAdmin.INSTANCE);
-  }
-
-  @Override
-  protected void collaborationLeft(Buddy buddy, Collaboration collaboration)
-  {
-    for (IMembership membership : collaboration.getMemberships())
-    {
-      IBuddy member = membership.getBuddy();
-      if (member != buddy)
-      {
-        try
-        {
-          IChannel channel = member.getSession().getChannel();
-          new CollaborationLeftNotification(channel, collaboration.getID(), buddy.getUserID()).send();
-        }
-        catch (Exception ex)
-        {
-          throw WrappedException.wrap(ex);
-        }
-      }
-    }
-
-    super.collaborationLeft(buddy, collaboration);
-    if (collaboration.getBuddies().length == 0 && !collaboration.isPublic())
-    {
-      BuddyAdmin.INSTANCE.removeCollaboration(collaboration.getID());
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java
deleted file mode 100644
index a84d5afe0f..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.MessageIndication;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.server.IBuddyAdmin;
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
-
-/**
- * @author Eike Stepper
- */
-public class ServerProtocol extends SignalProtocol
-{
-  public ServerProtocol()
-  {
-  }
-
-  public String getType()
-  {
-    return ProtocolConstants.PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor doCreateSignalReactor(short signalID)
-  {
-    switch (signalID)
-    {
-    case ProtocolConstants.SIGNAL_OPEN_SESSION:
-      return new OpenSessionIndication();
-
-    case ProtocolConstants.SIGNAL_BUDDY_STATE:
-      return new ServerBuddyStateIndication();
-
-    case ProtocolConstants.SIGNAL_INSTALL_FACILITY:
-      return new InstallFacilityIndication();
-
-    case ProtocolConstants.SIGNAL_INITIATE_COLLABORATION:
-      return new InitiateCollaborationIndication();
-
-    case ProtocolConstants.SIGNAL_INVITE_BUDDIES:
-      return new InviteBuddiesIndication();
-
-    case ProtocolConstants.SIGNAL_COLLABORATION_LEFT:
-      return new ServerCollaborationLeftIndication();
-
-    case ProtocolConstants.SIGNAL_MESSAGE:
-      return new MessageIndication(IBuddyAdmin.INSTANCE);
-    }
-
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocolFactory.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocolFactory.java
deleted file mode 100644
index d769781551..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocolFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.server.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public class ServerProtocolFactory extends org.eclipse.internal.net4j.protocol.ServerProtocolFactory
-{
-  public static final String TYPE = ProtocolConstants.PROTOCOL_NAME;
-
-  public ServerProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public ServerProtocol create(String description)
-  {
-    return new ServerProtocol();
-  }
-
-  public static ServerProtocol get(IManagedContainer container, String description)
-  {
-    return (ServerProtocol)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java
deleted file mode 100644
index a078a459eb..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.server;
-
-import org.eclipse.net4j.buddies.internal.server.BuddyAdmin;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IBuddyProvider;
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.ICollaborationContainer;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.buddies.protocol.ISessionProvider;
-import org.eclipse.net4j.channel.IChannel;
-
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public interface IBuddyAdmin extends ICollaborationContainer, IBuddyProvider, ISessionProvider
-{
-  public static final IBuddyAdmin INSTANCE = BuddyAdmin.INSTANCE;
-
-  public Map<String, IAccount> getAccounts();
-
-  public ISession openSession(IChannel channel, String userID, String password, String[] facilityTypes);
-
-  public ICollaboration initiateCollaboration(IBuddy initiator, String... userIDs);
-}
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java
deleted file mode 100644
index 6a0cafc268..0000000000
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.server;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-
-/**
- * @author Eike Stepper
- */
-public interface ServerConstants
-{
-  public static final String TYPE = ProtocolConstants.PROTOCOL_NAME + "server";
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/.classpath b/plugins/org.eclipse.net4j.buddies.ui/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/.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.buddies.ui/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.net4j.buddies.ui/.options b/plugins/org.eclipse.net4j.buddies.ui/.options
deleted file mode 100644
index 0210f13b23..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.buddies.ui/debug = true
diff --git a/plugins/org.eclipse.net4j.buddies.ui/.project b/plugins/org.eclipse.net4j.buddies.ui/.project
deleted file mode 100644
index 9813e0056e..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.buddies.ui</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 441650beff..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:52:19 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 3ffaabee3f..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:52:19 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.buddies.ui/BuddiesClient1.launch b/plugins/org.eclipse.net4j.buddies.ui/BuddiesClient1.launch
deleted file mode 100644
index f090bcba88..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/BuddiesClient1.launch
+++ /dev/null
@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.net4j,org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.protocol,org.eclipse.net4j.buddies.ui,org.eclipse.net4j.tcp,org.eclipse.net4j.ui,org.eclipse.net4j.util,org.eclipse.net4j.util.ui"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/BuddiesClient1"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../buddies.client1"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash&#13;&#10;-console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.aspectj.tracing.debug=false&#13;&#10;-Xms40m&#13;&#10;-Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.net4j.buddies.protocol"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,org.apache.ant,org.apache.commons.el,org.apache.commons.logging,org.apache.jasper,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.source,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4,org.mortbay.jetty"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.buddies.ui,org.eclipse.net4j.fileshare.ui,org.eclipse.ant.optional.junit,org.eclipse.net4j.chat,org.eclipse.net4j.util,org.eclipse.net4j.buddies.protocol,org.eclipse.net4j.buddies,org.eclipse.net4j.fileshare,org.eclipse.net4j.util.ui,org.eclipse.net4j.chat.ui,org.eclipse.net4j,org.eclipse.net4j.tcp,org.eclipse.net4j.ui"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="true"/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugtoolbar" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/error" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/warning" value="true"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/contentOutline" value="false"/>
-<mapEntry key="org.eclipse.wtp.common/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/detection" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/propertySheet" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.wtp.common/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.session" value="true"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.core/format" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/evaluation" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/trace" value="true"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.wst.sse.core/structureddocument" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/ws_dt_cmd_engine" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/gotoNextAnnotation" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/delegate/calls" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.types" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/ws_ant" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/overalltime" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/state" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/actionSorting" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorerDecoration/trace" value="true"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugpopup" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/info" value="true"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.net4j/perf" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.jet/debug/projectBundleLoading" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.signal" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/modelmanager" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/log" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugmenu" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/modelstatelistener" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/lifecycle" value="false"/>
-<mapEntry key="org.eclipse.datatools.connectivity.sqm.core/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/job" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentmanager" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/traceTagExecution" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/emitter" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.transaction" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/preferences" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/propertyChangeUpdateActionContributionItem" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/readtime" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.jet/debug/pluginBundleLoading" value="false"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug/tracefilter" value=""/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.model" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.util" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/additionalBundleLoading" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerjob" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling/showProblems" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.net4j.jvm/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentcache" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/transferbuilder/time" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.session" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.jet/debug/savedState" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/registry" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.object" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerValidators" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/bundleLoading" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
-<mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.jet/debug" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.xml.ui/projectionperf" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/operations" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/contributetime" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug" value="true"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/command" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/plugin/log" value="true"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder/time" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/time" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.jet/debug/ext/xpathFunctions" value="false"/>
-<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.adapter" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug.model" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/activation" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.view" value="true"/>
-<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.net4j.util.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.datatools.connectivity/connectionprofileextension" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.channel" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/data" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.datatools.connectivity/debug" value="true"/>
-<mapEntry key="org.eclipse.jet/debug/modelLoaderExtensions" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/elementstatelistener" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.revision" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/editor/log" value="true"/>
-<mapEntry key="org.eclipse.jet/debug/xpath/compilations" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/pluginProjectMonitor" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/locks" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/debug" value="true"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
-</mapAttribute>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useNamedJRE" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.buddies.ui/BuddiesClient2.launch b/plugins/org.eclipse.net4j.buddies.ui/BuddiesClient2.launch
deleted file mode 100644
index f20cbba0bb..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/BuddiesClient2.launch
+++ /dev/null
@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.net4j,org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.protocol,org.eclipse.net4j.buddies.ui,org.eclipse.net4j.tcp,org.eclipse.net4j.ui,org.eclipse.net4j.util,org.eclipse.net4j.util.ui"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/BuddiesClient2"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../buddies.client2"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash&#13;&#10;-console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.aspectj.tracing.debug=false&#13;&#10;-Xms40m&#13;&#10;-Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.net4j.buddies.protocol"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,org.apache.ant,org.apache.commons.el,org.apache.commons.logging,org.apache.jasper,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.source,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4,org.mortbay.jetty"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.buddies.ui,org.eclipse.net4j.fileshare.ui,org.eclipse.ant.optional.junit,org.eclipse.net4j.chat,org.eclipse.net4j.util,org.eclipse.net4j.buddies.protocol,org.eclipse.net4j.buddies,org.eclipse.net4j.fileshare,org.eclipse.net4j.util.ui,org.eclipse.net4j.chat.ui,org.eclipse.net4j,org.eclipse.net4j.tcp,org.eclipse.net4j.ui"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="true"/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugtoolbar" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/error" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/warning" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/contentOutline" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/>
-<mapEntry key="org.eclipse.wtp.common/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/detection" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/propertySheet" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.wtp.common/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.session" value="true"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/format" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/evaluation" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/trace" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structureddocument" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/ws_dt_cmd_engine" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/gotoNextAnnotation" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/delegate/calls" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.types" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/ws_ant" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/overalltime" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/state" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/actionSorting" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorerDecoration/trace" value="true"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugpopup" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/info" value="true"/>
-<mapEntry key="org.eclipse.net4j/perf" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.jet/debug/projectBundleLoading" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.signal" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/modelmanager" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/log" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugmenu" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/modelstatelistener" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.datatools.connectivity.sqm.core/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/lifecycle" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/job" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentmanager" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/traceTagExecution" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/emitter" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.transaction" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/preferences" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
-<mapEntry key="com.ibm.datatools.core.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/propertyChangeUpdateActionContributionItem" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/readtime" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.jet/debug/pluginBundleLoading" value="false"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug/tracefilter" value=""/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.model" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.util" value="true"/>
-<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/additionalBundleLoading" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerjob" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling/showProblems" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.net4j.jvm/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentcache" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/transferbuilder/time" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.session" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.jet/debug/savedState" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/registry" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.object" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerValidators" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/bundleLoading" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
-<mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jet/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.xml.ui/projectionperf" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/operations" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/contributetime" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug" value="true"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/command" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/plugin/log" value="true"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder/time" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/time" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/>
-<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/ext/xpathFunctions" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.adapter" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug.model" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/activation" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.view" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.datatools.connectivity/connectionprofileextension" value="false"/>
-<mapEntry key="org.eclipse.net4j.util.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.channel" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/data" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.datatools.connectivity/debug" value="true"/>
-<mapEntry key="org.eclipse.jet/debug/modelLoaderExtensions" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/elementstatelistener" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.revision" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/editor/log" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/xpath/compilations" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/pluginProjectMonitor" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/locks" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/debug" value="true"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
-</mapAttribute>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useNamedJRE" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.buddies.ui/BuddiesClient3.launch b/plugins/org.eclipse.net4j.buddies.ui/BuddiesClient3.launch
deleted file mode 100644
index 55b227f05f..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/BuddiesClient3.launch
+++ /dev/null
@@ -1,474 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.net4j,org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.protocol,org.eclipse.net4j.buddies.ui,org.eclipse.net4j.tcp,org.eclipse.net4j.ui,org.eclipse.net4j.util,org.eclipse.net4j.util.ui"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/BuddiesClient3"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../buddies.client3"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash&#13;&#10;-console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.aspectj.tracing.debug=false&#13;&#10;-Xms40m&#13;&#10;-Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.net4j.buddies.protocol"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,org.apache.ant,org.apache.commons.el,org.apache.commons.logging,org.apache.jasper,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.source,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4,org.mortbay.jetty"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.buddies.ui,org.eclipse.net4j.fileshare.ui,org.eclipse.ant.optional.junit,org.eclipse.net4j.chat,org.eclipse.net4j.util,org.eclipse.net4j.buddies.protocol,org.eclipse.net4j.buddies,org.eclipse.net4j.fileshare,org.eclipse.net4j.util.ui,org.eclipse.net4j.chat.ui,org.eclipse.net4j,org.eclipse.net4j.tcp,org.eclipse.net4j.ui"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="true"/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugtoolbar" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/error" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/warning" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/contentOutline" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/>
-<mapEntry key="org.eclipse.wtp.common/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/detection" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/propertySheet" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.wtp.common/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.session" value="true"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/format" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/evaluation" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/trace" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structureddocument" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/ws_dt_cmd_engine" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/gotoNextAnnotation" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/delegate/calls" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.types" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/ws_ant" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/overalltime" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/state" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/actionSorting" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorerDecoration/trace" value="true"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugpopup" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/info" value="true"/>
-<mapEntry key="org.eclipse.net4j/perf" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.jet/debug/projectBundleLoading" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.signal" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/modelmanager" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/log" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugmenu" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/modelstatelistener" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.datatools.connectivity.sqm.core/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/lifecycle" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/job" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentmanager" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/traceTagExecution" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/emitter" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.transaction" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/preferences" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
-<mapEntry key="com.ibm.datatools.core.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/propertyChangeUpdateActionContributionItem" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/readtime" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.jet/debug/pluginBundleLoading" value="false"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug/tracefilter" value=""/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.model" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.util" value="true"/>
-<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/additionalBundleLoading" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerjob" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling/showProblems" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.net4j.jvm/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentcache" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/transferbuilder/time" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.session" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.jet/debug/savedState" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/registry" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.object" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerValidators" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/bundleLoading" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
-<mapEntry key="org.eclipse.net4j.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.wst.xml.core/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jet/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.xml.ui/projectionperf" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/operations" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/contributetime" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug" value="true"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/command" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/plugin/log" value="true"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder/time" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks/time" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/>
-<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/ext/xpathFunctions" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.adapter" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug.model" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/activation" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.view" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.datatools.connectivity/connectionprofileextension" value="false"/>
-<mapEntry key="org.eclipse.net4j.util.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.resource" value="true"/>
-<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.protocol/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.channel" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies/debug.revision" value="true"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/data" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.examples/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.datatools.connectivity/debug" value="true"/>
-<mapEntry key="org.eclipse.jet/debug/modelLoaderExtensions" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/elementstatelistener" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.revision" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/editor/log" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/xpath/compilations" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.jet/debug/pluginProjectMonitor" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/locks" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/debug" value="true"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.net4j.buddies.server/debug.repository" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
-</mapAttribute>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useNamedJRE" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index f0dc1a2b81..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.buddies.ui;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.net4j.buddies.internal.ui.bundle.OM$Activator
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.net4j;visibility:=reexport,
- org.eclipse.net4j.util.ui;visibility:=reexport,
- org.eclipse.net4j.buddies;visibility:=reexport,
- org.eclipse.net4j.chat;resolution:=optional
-Export-Package: org.eclipse.net4j.buddies.internal.ui;version="0.8.0",
- org.eclipse.net4j.buddies.internal.ui.actions;version="0.8.0",
- org.eclipse.net4j.buddies.internal.ui.dnd;version="0.8.0",
- org.eclipse.net4j.buddies.internal.ui.preferences;version="0.8.0",
- org.eclipse.net4j.buddies.internal.ui.views;version="0.8.0",
- org.eclipse.net4j.buddies.ui;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.ui/about.html b/plugins/org.eclipse.net4j.buddies.ui/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/about.html
+++ /dev/null
@@ -1,28 +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.buddies.ui/build.properties b/plugins/org.eclipse.net4j.buddies.ui/build.properties
deleted file mode 100644
index 5a3ec9e5c2..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               .options,\
-               epl-v10.html,\
-               copyright.txt,\
-               about.html,\
-               schema/
diff --git a/plugins/org.eclipse.net4j.buddies.ui/copyright.txt b/plugins/org.eclipse.net4j.buddies.ui/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies.ui/epl-v10.html b/plugins/org.eclipse.net4j.buddies.ui/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeManyToOneMapping.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeManyToOneMapping.gif
deleted file mode 100644
index 67439553a1..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeManyToOneMapping.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToManyMapping.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToManyMapping.gif
deleted file mode 100644
index c19520b095..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToManyMapping.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToOneMapping.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToOneMapping.gif
deleted file mode 100644
index 470336009a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/TypeOneToOneMapping.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/terminate_co.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/terminate_co.gif
deleted file mode 100644
index 4f3dcba276..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/dtool16/terminate_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add.gif
deleted file mode 100644
index 252d7ebcb8..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_chat.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_chat.gif
deleted file mode 100644
index 0840bc6094..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_chat.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_contact.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_contact.gif
deleted file mode 100644
index d3323e64fc..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_contact.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_group.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_group.gif
deleted file mode 100644
index 7492f8ac10..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/add_group.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/communications.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/communications.gif
deleted file mode 100644
index 21a902fd1a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/communications.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/delete.gif
deleted file mode 100644
index b6922ac11c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/delete.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/identity.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/identity.gif
deleted file mode 100644
index cf78a9d75b..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/identity.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/messages.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/messages.gif
deleted file mode 100644
index 27d15cc3cc..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/messages.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/terminate_co.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/terminate_co.gif
deleted file mode 100644
index dc47edf069..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/etool16/terminate_co.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies.gif
deleted file mode 100644
index 952ed084bd..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies_alt.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies_alt.gif
deleted file mode 100644
index a60af4ec90..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddies_alt.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy.gif
deleted file mode 100644
index 5eed04350e..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_away.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_away.gif
deleted file mode 100644
index 93bd424131..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_away.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_disabled.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_disabled.gif
deleted file mode 100644
index c684f405b5..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_disabled.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_do_not_disturb.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_do_not_disturb.gif
deleted file mode 100644
index 86c8cb915e..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_do_not_disturb.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_lonesome.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_lonesome.gif
deleted file mode 100644
index 1b87e3ccc4..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/buddy_lonesome.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/collaboration.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/collaboration.gif
deleted file mode 100644
index 21a902fd1a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/collaboration.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/message.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/message.gif
deleted file mode 100644
index b949ac948a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/message.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/messages.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/messages.gif
deleted file mode 100644
index 27d15cc3cc..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/messages.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/open_contacts.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/open_contacts.gif
deleted file mode 100644
index 1ab317a1c3..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/open_contacts.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/person.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/person.gif
deleted file mode 100644
index 608d2d165c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/obj16/person.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/buddies_view.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/buddies_view.gif
deleted file mode 100644
index 952ed084bd..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/buddies_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/collaborations_view.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/collaborations_view.gif
deleted file mode 100644
index 21a902fd1a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/collaborations_view.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/shared_editor.gif b/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/shared_editor.gif
deleted file mode 100644
index 9226c49630..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/view16/shared_editor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/.cvsignore b/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_32X32.png b/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_32X32.png
deleted file mode 100644
index 21d3eed256..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_32X32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_wizard.png b/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_wizard.png
deleted file mode 100644
index 74aee56b21..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/chat_wizard.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_32x32.png b/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_32x32.png
deleted file mode 100644
index 134a1a97b3..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_32x32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_wizard.png b/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_wizard.png
deleted file mode 100644
index 8b468507c0..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/icons/full/wizban/collaboration_wizard.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies.ui/license.html b/plugins/org.eclipse.net4j.buddies.ui/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies.ui/plugin.properties b/plugins/org.eclipse.net4j.buddies.ui/plugin.properties
deleted file mode 100644
index 0db4a05f0e..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Buddies UI (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.buddies.ui/plugin.xml b/plugins/org.eclipse.net4j.buddies.ui/plugin.xml
deleted file mode 100644
index 852099eb9b..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/plugin.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension-point id="facilityPaneCreators" name="Facility Pane Creators" schema="schema/facilityPaneCreators.exsd"/>
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            class="org.eclipse.net4j.buddies.internal.ui.preferences.BuddiesPreferencePage"
-            id="org.eclipse.net4j.buddies.ui.preferences.BuddiesPreferencePage"
-            name="Buddies">
-      </page>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            id="org.eclipse.net4j.buddies"
-            name="Net4j Buddies"/>
-      <view
-            category="org.eclipse.net4j.buddies"
-            class="org.eclipse.net4j.buddies.internal.ui.views.BuddiesView"
-            icon="icons/full/view16/buddies_view.gif"
-            id="org.eclipse.net4j.BuddiesView"
-            name="Buddies"/>
-      <view
-            category="org.eclipse.net4j.buddies"
-            class="org.eclipse.net4j.buddies.internal.ui.views.CollaborationsView"
-            icon="icons/full/view16/collaborations_view.gif"
-            id="org.eclipse.net4j.CollaborationsView"
-            name="Collaborations"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.ui.resourcePerspective">
-         <view
-               id="org.eclipse.net4j.BuddiesView"
-               ratio="1"
-               relationship="stack"
-               relative="org.eclipse.ui.views.ContentOutline">
-         </view>
-      </perspectiveExtension>
-   </extension>
-   
-</plugin>
diff --git a/plugins/org.eclipse.net4j.buddies.ui/schema/facilityPaneCreators.exsd b/plugins/org.eclipse.net4j.buddies.ui/schema/facilityPaneCreators.exsd
deleted file mode 100644
index 3cee15e367..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/schema/facilityPaneCreators.exsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.net4j.buddies.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.net4j.buddies.ui" id="facilityPaneCreators" name="Facility Pane Creators"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="facilityPaneCreator" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="facilityPaneCreator">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="type" icon="icon"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.net4j.buddies.ui.IFacilityPaneCreator"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
deleted file mode 100644
index cc576a7356..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.buddies.IBuddyCollaboration;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.IMembership;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.ui.UIUtil;
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.views.ContainerView;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractItemProvider extends ContainerItemProvider<IContainer<Object>>
-{
-  public static final Color GRAY = UIUtil.getDisplay().getSystemColor(SWT.COLOR_GRAY);
-
-  private Font bold;
-
-  public AbstractItemProvider()
-  {
-  }
-
-  public AbstractItemProvider(IElementFilter rootElementFilter)
-  {
-    super(rootElementFilter);
-  }
-
-  @Override
-  public void dispose()
-  {
-    UIUtil.dispose(bold);
-    super.dispose();
-  }
-
-  public Font getBold()
-  {
-    return bold;
-  }
-
-  @Override
-  protected Node createNode(Node parent, Object element)
-  {
-    if (element instanceof IMembership)
-    {
-      IMembership membership = (IMembership)element;
-      return createMembershipNode(parent, membership);
-    }
-
-    return super.createNode(parent, element);
-  }
-
-  protected abstract Node createMembershipNode(Node parent, IMembership membership);
-
-  @Override
-  public String getText(Object obj)
-  {
-    if (obj instanceof IBuddy)
-    {
-      IBuddy buddy = (IBuddy)obj;
-      return buddy.getUserID();
-    }
-
-    if (obj instanceof ICollaboration)
-    {
-      ICollaboration collaboration = (ICollaboration)obj;
-      return collaboration.getTitle();
-    }
-
-    if (obj instanceof IMembership)
-    {
-      IMembership membership = (IMembership)obj;
-      return getText(membership);
-    }
-
-    return super.getText(obj);
-  }
-
-  protected abstract String getText(IMembership membership);
-
-  @Override
-  public Image getImage(Object obj)
-  {
-    if (obj instanceof IBuddy)
-    {
-      IBuddy buddy = (IBuddy)obj;
-      switch (buddy.getState())
-      {
-      case AVAILABLE:
-        return SharedIcons.getImage(SharedIcons.OBJ_BUDDY);
-
-      case LONESOME:
-        return SharedIcons.getImage(SharedIcons.OBJ_BUDDY_LONESOME);
-
-      case AWAY:
-        return SharedIcons.getImage(SharedIcons.OBJ_BUDDY_AWAY);
-
-      case DO_NOT_DISTURB:
-        return SharedIcons.getImage(SharedIcons.OBJ_BUDDY_DO_NOT_DISTURB);
-      }
-    }
-
-    if (obj instanceof ICollaboration)
-    {
-      return SharedIcons.getImage(SharedIcons.OBJ_COLLABORATION);
-    }
-
-    if (obj instanceof IMembership)
-    {
-      IMembership membership = (IMembership)obj;
-      return getImage(membership);
-    }
-
-    return super.getImage(obj);
-  }
-
-  protected abstract Image getImage(IMembership membership);
-
-  @Override
-  public Color getForeground(Object obj)
-  {
-    if (obj instanceof IBuddy)
-    {
-      IBuddy buddy = (IBuddy)obj;
-      switch (buddy.getState())
-      {
-      case AWAY:
-      case DO_NOT_DISTURB:
-        return GRAY;
-      }
-    }
-
-    return super.getForeground(obj);
-  }
-
-  @Override
-  public Font getFont(Object obj)
-  {
-    if (obj instanceof IBuddy)
-    {
-      IBuddy buddy = (IBuddy)obj;
-      switch (buddy.getState())
-      {
-      case LONESOME:
-        return bold;
-      }
-    }
-
-    return super.getFont(obj);
-  }
-
-  @Override
-  protected void fillContextMenu(IMenuManager manager, ITreeSelection selection)
-  {
-    manager.add(new Separator());
-    if (selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj instanceof IBuddy)
-      {
-        manager.add(new RemoveAction(obj));
-      }
-      else if (obj instanceof IBuddyCollaboration)
-      {
-        final IBuddyCollaboration collaboration = (IBuddyCollaboration)obj;
-        manager.add(new SafeAction("Leave", "Leave this collaboration")
-        {
-          @Override
-          protected void safeRun() throws Exception
-          {
-            collaboration.leave();
-          }
-        });
-      }
-    }
-  }
-
-  @Override
-  public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-  {
-    UIUtil.dispose(bold);
-    super.inputChanged(viewer, oldInput, newInput);
-    bold = UIUtil.getBoldFont(getViewer().getControl());
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class RemoveAction extends LongRunningAction
-  {
-    private Object object;
-
-    public RemoveAction(Object object)
-    {
-      super("Remove", "Remove", ContainerView.getDeleteImageDescriptor());
-      this.object = object;
-    }
-
-    @Override
-    protected void doRun() throws Exception
-    {
-      LifecycleUtil.deactivateNoisy(object);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
deleted file mode 100644
index 6f348e27df..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.buddies.protocol.IBuddyContainer;
-import org.eclipse.net4j.util.ui.StructuredContentProvider;
-
-/**
- * @author Eike Stepper
- */
-public class BuddiesContentProvider extends StructuredContentProvider<IBuddyContainer>
-{
-  public BuddiesContentProvider()
-  {
-  }
-
-  public Object[] getElements(Object inputElement)
-  {
-    return getInput().getElements();
-  }
-
-  @Override
-  protected void connectInput(IBuddyContainer input)
-  {
-    input.addListener(this);
-  }
-
-  @Override
-  protected void disconnectInput(IBuddyContainer input)
-  {
-    input.removeListener(this);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
deleted file mode 100644
index db03ececce..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.buddies.protocol.IMembership;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Eike Stepper
- */
-public class BuddiesItemProvider extends AbstractItemProvider
-{
-  public BuddiesItemProvider()
-  {
-  }
-
-  public BuddiesItemProvider(IElementFilter rootElementFilter)
-  {
-    super(rootElementFilter);
-  }
-
-  @Override
-  protected Node createMembershipNode(Node parent, IMembership membership)
-  {
-    return createLeafNode(parent, membership);
-  }
-
-  @Override
-  protected String getText(IMembership membership)
-  {
-    return getText(membership.getCollaboration());
-  }
-
-  @Override
-  protected Image getImage(IMembership membership)
-  {
-    return getImage(membership.getCollaboration());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
deleted file mode 100644
index 82032f6929..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.buddies.IBuddyCollaboration;
-import org.eclipse.net4j.chat.IChat;
-
-/**
- * @author Eike Stepper
- */
-public final class ChatInstaller
-{
-  private ChatInstaller()
-  {
-  }
-
-  public static void installChat(IBuddyCollaboration collaboration)
-  {
-    collaboration.installFacility(IChat.TYPE);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
deleted file mode 100644
index 7921da1356..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.buddies.protocol.ICollaborationContainer;
-import org.eclipse.net4j.util.ui.StructuredContentProvider;
-
-/**
- * @author Eike Stepper
- */
-public class CollaborationsContentProvider extends StructuredContentProvider<ICollaborationContainer>
-{
-  public CollaborationsContentProvider()
-  {
-  }
-
-  public Object[] getElements(Object inputElement)
-  {
-    return getInput().getElements();
-  }
-
-  @Override
-  protected void connectInput(ICollaborationContainer input)
-  {
-    input.addListener(this);
-  }
-
-  @Override
-  protected void disconnectInput(ICollaborationContainer input)
-  {
-    input.removeListener(this);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java
deleted file mode 100644
index e89954bd10..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.IMembership;
-import org.eclipse.net4j.internal.buddies.Self;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-import org.eclipse.swt.graphics.Image;
-
-import java.util.Collection;
-
-/**
- * @author Eike Stepper
- */
-public class CollaborationsItemProvider extends AbstractItemProvider
-{
-  public CollaborationsItemProvider()
-  {
-  }
-
-  public CollaborationsItemProvider(IElementFilter rootElementFilter)
-  {
-    super(rootElementFilter);
-  }
-
-  @Override
-  protected Node createNode(Node parent, Object element)
-  {
-    if (element instanceof Self)
-    {
-      return new SelfNode((Self)element);
-    }
-
-    if (element instanceof IMembership)
-    {
-      IMembership membership = (IMembership)element;
-      if (membership.getBuddy() instanceof Self)
-      {
-        return null;
-      }
-    }
-
-    return super.createNode(parent, element);
-  }
-
-  @Override
-  protected Node createMembershipNode(Node parent, IMembership membership)
-  {
-    return createLeafNode(parent, membership);
-  }
-
-  @Override
-  protected String getText(IMembership membership)
-  {
-    return getText(membership.getBuddy());
-  }
-
-  @Override
-  protected Image getImage(IMembership membership)
-  {
-    return getImage(membership.getBuddy());
-  }
-
-  @Override
-  protected void refreshElement(Object element, boolean updateLabels)
-  {
-    super.refreshElement(null, updateLabels);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private class SelfNode extends AbstractContainerNode implements IListener
-  {
-    private Self self;
-
-    public SelfNode(Self self)
-    {
-      super(null);
-      this.self = self;
-    }
-
-    @Override
-    public void dispose()
-    {
-      if (!isDisposed())
-      {
-        self.removeListener(containerListener);
-        super.dispose();
-      }
-    }
-
-    public Self getElement()
-    {
-      return self;
-    }
-
-    public void notifyEvent(IEvent event)
-    {
-      IMembership membership = (IMembership)event.getSource();
-      if (event instanceof ILifecycleEvent)
-      {
-        ILifecycleEvent e = (ILifecycleEvent)event;
-        if (e.getKind() == ILifecycleEvent.Kind.DEACTIVATED)
-        {
-          membership.removeListener(this);
-          ICollaboration collaboration = membership.getCollaboration();
-          Node node = getNode(collaboration);
-          if (node != null)
-          {
-            node.dispose();
-          }
-        }
-      }
-    }
-
-    @Override
-    protected Node addChild(Collection<Node> children, Object element)
-    {
-      IMembership membership = (IMembership)element;
-      membership.addListener(this);
-      return super.addChild(children, membership.getCollaboration());
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
deleted file mode 100644
index 8430f78cc0..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.buddies.protocol.IMembership;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Eike Stepper
- */
-public class MembershipItemProvider extends AbstractItemProvider
-{
-  public MembershipItemProvider()
-  {
-  }
-
-  public MembershipItemProvider(IElementFilter rootElementFilter)
-  {
-    super(rootElementFilter);
-  }
-
-  @Override
-  protected Node createMembershipNode(Node parent, IMembership membership)
-  {
-    return createContaineNode(parent, membership);
-  }
-
-  @Override
-  protected String getText(IMembership membership)
-  {
-    return getText(membership.getBuddy()) + "(" + getText(membership.getCollaboration()) + ")";
-  }
-
-  @Override
-  protected Image getImage(IMembership membership)
-  {
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java
deleted file mode 100644
index 9dc74ed073..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.buddies.BuddiesUtil;
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.ui.ISessionManager;
-import org.eclipse.net4j.buddies.ui.ISessionManagerEvent;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.buddies.Self;
-import org.eclipse.net4j.internal.util.event.Event;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import java.text.MessageFormat;
-
-public class SessionManager extends Lifecycle implements ISessionManager, IListener
-{
-  public static final SessionManager INSTANCE = new SessionManager();
-
-  private IBuddySession session;
-
-  private State state = State.DISCONNECTED;
-
-  private boolean connecting;
-
-  private boolean flashing;
-
-  private SessionManager()
-  {
-  }
-
-  public IBuddySession getSession()
-  {
-    return session;
-  }
-
-  public State getState()
-  {
-    return state;
-  }
-
-  public void setState(State state)
-  {
-    if (this.state != state)
-    {
-      IEvent event = new SessionManagerEvent(this.state, state, session);
-      this.state = state;
-      fireEvent(event);
-    }
-  }
-
-  public boolean isFlashing()
-  {
-    return flashing;
-  }
-
-  public boolean isConnecting()
-  {
-    return state == ISessionManager.State.CONNECTING;
-  }
-
-  public String getConnectorDescription()
-  {
-    return OM.PREF_CONNECTOR_DESCRIPTION.getValue();
-  }
-
-  public String getUserID()
-  {
-    return OM.PREF_USER_ID.getValue();
-  }
-
-  public String getPassword()
-  {
-    return OM.PREF_PASSWORD.getValue();
-  }
-
-  public Boolean isAutoConnect()
-  {
-    return OM.PREF_AUTO_CONNECT.getValue();
-  }
-
-  public void connect()
-  {
-    new Thread("buddies-connector")
-    {
-      @Override
-      public void run()
-      {
-        try
-        {
-          setState(ISessionManager.State.CONNECTING);
-          connecting = true;
-          while (session == null && connecting)
-          {
-            IConnector connector = Net4jUtil.getConnector(IPluginContainer.INSTANCE, getConnectorDescription());
-            if (connector == null)
-            {
-              throw new IllegalStateException("connector == null");
-            }
-
-            boolean connected = connector.waitForConnection(5000L);
-            if (connected)
-            {
-              session = BuddiesUtil.openSession(connector, getUserID(), getPassword(), 5000L);
-              if (session != null)
-              {
-                if (connecting)
-                {
-                  session.addListener(SessionManager.this);
-                  setState(ISessionManager.State.CONNECTED);
-                }
-                else
-                {
-                  session.close();
-                  session = null;
-                  setState(ISessionManager.State.DISCONNECTED);
-                }
-              }
-            }
-            else
-            {
-              LifecycleUtil.deactivate(connector);
-            }
-          }
-        }
-        finally
-        {
-          connecting = false;
-        }
-      }
-    }.start();
-  }
-
-  public void disconnect()
-  {
-    connecting = false;
-    if (session != null)
-    {
-      session.removeListener(this);
-      session.close();
-      session = null;
-    }
-
-    setState(ISessionManager.State.DISCONNECTED);
-  }
-
-  public void flashMe()
-  {
-    if (session != null && !flashing)
-    {
-      final Self self = (Self)session.getSelf();
-      final IBuddy.State original = self.getState();
-      new Thread("buddies-flasher")
-      {
-        @Override
-        public void run()
-        {
-          flashing = true;
-          IBuddy.State state = original == IBuddy.State.AVAILABLE ? IBuddy.State.LONESOME : IBuddy.State.AVAILABLE;
-          for (int i = 0; i < 15; i++)
-          {
-            self.setState(state);
-            ConcurrencyUtil.sleep(200);
-            state = state == IBuddy.State.AVAILABLE ? IBuddy.State.LONESOME : IBuddy.State.AVAILABLE;
-          }
-
-          self.setState(original);
-          flashing = false;
-        }
-      }.start();
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public void notifyEvent(IEvent event)
-  {
-    if (event.getSource() == session)
-    {
-      if (event instanceof ILifecycleEvent)
-      {
-        if (((ILifecycleEvent)event).getKind() == ILifecycleEvent.Kind.DEACTIVATED)
-        {
-          disconnect();
-          if (isAutoConnect())
-          {
-            connect();
-          }
-        }
-      }
-      else if (event instanceof IContainerEvent)
-      {
-        IContainerEvent<IBuddy> e = (IContainerEvent<IBuddy>)event;
-        if (e.getDeltaKind() == IContainerDelta.Kind.ADDED)
-        {
-          e.getDeltaElement().addListener(this);
-        }
-        else if (e.getDeltaKind() == IContainerDelta.Kind.REMOVED)
-        {
-          e.getDeltaElement().removeListener(this);
-        }
-      }
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    if (isAutoConnect())
-    {
-      connect();
-    }
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    disconnect();
-    super.doDeactivate();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class SessionManagerEvent extends Event implements ISessionManagerEvent
-  {
-    private static final long serialVersionUID = 1L;
-
-    private State oldState;
-
-    private State newState;
-
-    private IBuddySession session;
-
-    public SessionManagerEvent(State oldState, State newState, IBuddySession session)
-    {
-      super(SessionManager.this);
-      this.oldState = oldState;
-      this.newState = newState;
-      this.session = session;
-    }
-
-    public State getOldState()
-    {
-      return oldState;
-    }
-
-    public State getNewState()
-    {
-      return newState;
-    }
-
-    public IBuddySession getSession()
-    {
-      return session;
-    }
-
-    @Override
-    public String toString()
-    {
-      return MessageFormat.format("SessionManagerEvent[source={0}, oldState={1}, newState={2}, session={3}]",
-          getSource(), getOldState(), getNewState(), getSession());
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SharedIcons.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SharedIcons.java
deleted file mode 100644
index 093e9617de..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SharedIcons.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class SharedIcons
-{
-  private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
-
-  @SuppressWarnings("unused")
-  private static final String ETOOL = "etool16/";
-
-  private static final String OBJ = "obj16/";
-
-  @SuppressWarnings("unused")
-  private static final String VIEW = "view16/";
-
-  @SuppressWarnings("unused")
-  private static final String WIZBAN = "wizban/";
-
-  public static final String OBJ_COLLABORATION = OBJ + "collaboration";
-
-  public static final String OBJ_BUDDY = OBJ + "buddy";
-
-  public static final String OBJ_BUDDY_LONESOME = OBJ + "buddy_lonesome";
-
-  public static final String OBJ_BUDDY_AWAY = OBJ + "buddy_away";
-
-  public static final String OBJ_BUDDY_DO_NOT_DISTURB = OBJ + "buddy_do_not_disturb";
-
-  public static Image getImage(String key)
-  {
-    key = mangleKey(key);
-    Image image = REGISTRY.get(key);
-    if (image == null)
-    {
-      createDescriptor(key);
-      image = REGISTRY.get(key);
-    }
-
-    return image;
-  }
-
-  public static ImageDescriptor getDescriptor(String key)
-  {
-    key = mangleKey(key);
-    ImageDescriptor descriptor = REGISTRY.getDescriptor(key);
-    if (descriptor == null)
-    {
-      descriptor = createDescriptor(key);
-    }
-
-    return descriptor;
-  }
-
-  private static ImageDescriptor createDescriptor(String key)
-  {
-    ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
-    if (descriptor != null)
-    {
-      REGISTRY.put(key, descriptor);
-    }
-
-    return descriptor;
-  }
-
-  private static Display getDisplay()
-  {
-    Display display = Display.getCurrent();
-    if (display == null)
-    {
-      display = Display.getDefault();
-    }
-
-    if (display == null)
-    {
-      throw new IllegalStateException("display == null");
-    }
-
-    return display;
-  }
-
-  private static String mangleKey(String key)
-  {
-    return "icons/full/" + key + ".gif";
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
deleted file mode 100644
index cc34609dcc..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.actions;
-
-import org.eclipse.net4j.buddies.ui.ISessionManager;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-
-/**
- * @author Eike Stepper
- */
-public final class ConnectAction extends SafeAction
-{
-  public ConnectAction()
-  {
-    super("Connect", "Connect to buddies server");
-  }
-
-  @Override
-  protected void safeRun() throws Exception
-  {
-    ISessionManager.INSTANCE.connect();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
deleted file mode 100644
index 359e7f6379..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.actions;
-
-import org.eclipse.net4j.buddies.ui.ISessionManager;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-
-/**
- * @author Eike Stepper
- */
-public final class DisconnectAction extends SafeAction
-{
-  public DisconnectAction()
-  {
-    super("Disonnect", "Disconnect from buddies server");
-  }
-
-  @Override
-  protected void safeRun() throws Exception
-  {
-    ISessionManager.INSTANCE.disconnect();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
deleted file mode 100644
index 3b35d0a632..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.actions;
-
-import org.eclipse.net4j.buddies.ui.ISessionManager;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-
-/**
- * @author Eike Stepper
- */
-public final class FlashAction extends SafeAction
-{
-  public FlashAction()
-  {
-    super("Flash Me", "Flash Me");
-  }
-
-  @Override
-  protected void safeRun() throws Exception
-  {
-    ISessionManager.INSTANCE.flashMe();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
deleted file mode 100644
index 7b5bb62280..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.actions;
-
-import org.eclipse.net4j.buddies.ui.ISessionManager;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-
-/**
- * @author Eike Stepper
- */
-public final class ReconnectAction extends SafeAction
-{
-  public ReconnectAction()
-  {
-    super("Reconnect", "Reconnect to buddies server");
-  }
-
-  @Override
-  protected void safeRun() throws Exception
-  {
-    ISessionManager.INSTANCE.disconnect();
-    ISessionManager.INSTANCE.connect();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java
deleted file mode 100644
index 8e38d9d105..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.actions;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.ui.SharedIcons;
-import org.eclipse.net4j.buddies.protocol.IBuddy.State;
-import org.eclipse.net4j.buddies.ui.ISessionManager;
-import org.eclipse.net4j.internal.buddies.Self;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-
-/**
- * @author Eike Stepper
- */
-public class StateAction extends SafeAction
-{
-  private State state;
-
-  public StateAction(String text, State state, String key)
-  {
-    super(text, Action.AS_RADIO_BUTTON);
-    setToolTipText("Set own state to '" + text.toLowerCase() + "'");
-    setImageDescriptor(SharedIcons.getDescriptor(key));
-    this.state = state;
-  }
-
-  public void updateState()
-  {
-    IBuddySession session = ISessionManager.INSTANCE.getSession();
-    setEnabled(session != null);
-    setChecked(session != null && session.getSelf().getState() == state);
-  }
-
-  @Override
-  protected void safeRun() throws Exception
-  {
-    IBuddySession session = ISessionManager.INSTANCE.getSession();
-    if (session != null && isChecked())
-    {
-      Self self = (Self)session.getSelf();
-      self.setState(state);
-    }
-  }
-
-  public static class DropDownAction extends Action implements IMenuCreator
-  {
-    private Menu fMenu;
-
-    private StateAction availableAction = new AvailableAction();
-
-    private StateAction lonesomeAction = new LonesomeAction();
-
-    private StateAction awayAction = new AwayAction();
-
-    private StateAction doNotDisturbAction = new DoNotDisturbAction();
-
-    public DropDownAction()
-    {
-      setText("Set My State");
-      setMenuCreator(this);
-    }
-
-    public void dispose()
-    {
-      if (fMenu != null)
-      {
-        fMenu.dispose();
-        fMenu = null;
-      }
-    }
-
-    public void updateState()
-    {
-      availableAction.updateState();
-      lonesomeAction.updateState();
-      awayAction.updateState();
-      doNotDisturbAction.updateState();
-
-      IBuddySession session = ISessionManager.INSTANCE.getSession();
-      if (session != null)
-      {
-        setEnabled(true);
-        State state = session.getSelf().getState();
-        switch (state)
-        {
-        case AVAILABLE:
-          setImageDescriptor(availableAction.getImageDescriptor());
-          break;
-
-        case LONESOME:
-          setImageDescriptor(lonesomeAction.getImageDescriptor());
-          break;
-
-        case AWAY:
-          setImageDescriptor(awayAction.getImageDescriptor());
-          break;
-
-        case DO_NOT_DISTURB:
-          setImageDescriptor(doNotDisturbAction.getImageDescriptor());
-          break;
-        }
-      }
-      else
-      {
-        setImageDescriptor(awayAction.getImageDescriptor());
-        setEnabled(false);
-      }
-    }
-
-    public Menu getMenu(Control parent)
-    {
-      if (fMenu != null)
-      {
-        fMenu.dispose();
-      }
-
-      fMenu = new Menu(parent);
-      addActionToMenu(fMenu, availableAction);
-      addActionToMenu(fMenu, lonesomeAction);
-      addActionToMenu(fMenu, awayAction);
-      addActionToMenu(fMenu, doNotDisturbAction);
-      return fMenu;
-    }
-
-    public Menu getMenu(Menu parent)
-    {
-      return null;
-    }
-
-    @Override
-    public void run()
-    {
-
-    }
-
-    protected void addActionToMenu(Menu parent, Action action)
-    {
-      ActionContributionItem item = new ActionContributionItem(action);
-      item.fill(parent, -1);
-    }
-  }
-
-  public static final class AvailableAction extends StateAction
-  {
-    public AvailableAction()
-    {
-      super("Available", State.AVAILABLE, SharedIcons.OBJ_BUDDY);
-    }
-  }
-
-  public static final class LonesomeAction extends StateAction
-  {
-    public LonesomeAction()
-    {
-      super("Lonesome", State.LONESOME, SharedIcons.OBJ_BUDDY_LONESOME);
-    }
-  }
-
-  public static final class AwayAction extends StateAction
-  {
-    public AwayAction()
-    {
-      super("Away", State.AWAY, SharedIcons.OBJ_BUDDY_AWAY);
-    }
-  }
-
-  public static final class DoNotDisturbAction extends StateAction
-  {
-    public DoNotDisturbAction()
-    {
-      super("Do Not Disturb", State.DO_NOT_DISTURB, SharedIcons.OBJ_BUDDY_DO_NOT_DISTURB);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
deleted file mode 100644
index 677ea95108..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.bundle;
-
-import org.eclipse.net4j.buddies.internal.ui.SessionManager;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-import org.eclipse.net4j.util.om.pref.OMPreferences;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-import org.eclipse.net4j.util.ui.UIActivator;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.buddies.ui"; //$NON-NLS-1$
-
-  public static final String EXT_POINT = "facilityPaneCreators";
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  public static final OMPreferences PREFS = BUNDLE.preferences();
-
-  public static final OMPreference<String> PREF_CONNECTOR_DESCRIPTION = // 
-  PREFS.init("PREF_CONNECTOR_DESCRIPTION", "tcp://localhost"); //$NON-NLS-1$
-
-  public static final OMPreference<String> PREF_USER_ID = // 
-  PREFS.init("PREF_USER_ID", System.getProperty("user.name")); //$NON-NLS-1$
-
-  public static final OMPreference<String> PREF_PASSWORD = // 
-  PREFS.initString("PREF_PASSWORD"); //$NON-NLS-1$
-
-  public static final OMPreference<Boolean> PREF_AUTO_CONNECT = // 
-  PREFS.init("PREF_AUTO_CONNECT", false); //$NON-NLS-1$
-
-  static void start() throws Exception
-  {
-    SessionManager.INSTANCE.activate();
-  }
-
-  static void stop() throws Exception
-  {
-    SessionManager.INSTANCE.deactivate();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends UIActivator
-  {
-    public static Activator INSTANCE;
-
-    public Activator()
-    {
-      super(BUNDLE);
-      INSTANCE = this;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
deleted file mode 100644
index 01f5b808a7..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.dnd;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.ui.SessionManager;
-import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-import org.eclipse.net4j.util.ui.dnd.DNDTransfer;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class BuddiesTransfer extends DNDTransfer<IBuddy[]>
-{
-  public static final String TYPE_NAME = "buddies-transfer-format";
-
-  public static final BuddiesTransfer INSTANCE = new BuddiesTransfer();
-
-  public BuddiesTransfer()
-  {
-    super(TYPE_NAME);
-  }
-
-  @Override
-  protected void writeObject(ExtendedDataOutputStream out, IBuddy[] buddies) throws IOException
-  {
-    out.writeInt(buddies.length);
-    for (IBuddy buddy : buddies)
-    {
-      out.writeString(buddy.getUserID());
-    }
-  }
-
-  @Override
-  protected IBuddy[] readObject(ExtendedDataInputStream in) throws IOException
-  {
-    IBuddySession session = SessionManager.INSTANCE.getSession();
-    if (session == null)
-    {
-      OM.LOG.warn("Buddy session is not available");
-      return null;
-    }
-
-    List<IBuddy> buddies = new ArrayList<IBuddy>();
-    int size = in.readInt();
-    for (int i = 0; i < size; i++)
-    {
-      String userID = in.readString();
-      IBuddy buddy = session.getBuddy(userID);
-      if (buddy != null)
-      {
-        buddies.add(buddy);
-      }
-      else
-      {
-        OM.LOG.warn("Buddy is not available: " + userID);
-      }
-    }
-
-    return buddies.toArray(new IBuddy[buddies.size()]);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
deleted file mode 100644
index 76f9650b96..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.preferences;
-
-import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-import org.eclipse.net4j.util.ui.UIUtil;
-import org.eclipse.net4j.util.ui.prefs.OMPreferencePage;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Eike Stepper
- */
-public class BuddiesPreferencePage extends OMPreferencePage
-{
-  private Text connectorDescription;
-
-  private Text userID;
-
-  private Text password;
-
-  private Button autoConnect;
-
-  public BuddiesPreferencePage()
-  {
-    super(OM.PREFS);
-  }
-
-  @Override
-  protected Control createUI(Composite parent)
-  {
-    Composite composite = UIUtil.createGridComposite(parent, 2);
-    composite.setLayoutData(UIUtil.createGridData());
-
-    new Label(composite, SWT.NONE).setText("Server:");
-    connectorDescription = new Text(composite, SWT.BORDER);
-    connectorDescription.setLayoutData(UIUtil.createGridData(true, false));
-
-    new Label(composite, SWT.NONE).setText("User ID:");
-    userID = new Text(composite, SWT.BORDER);
-    userID.setLayoutData(new GridData(100, SWT.DEFAULT));
-
-    new Label(composite, SWT.NONE).setText("Password:");
-    password = new Text(composite, SWT.BORDER | SWT.PASSWORD);
-    password.setLayoutData(new GridData(100, SWT.DEFAULT));
-
-    new Label(composite, SWT.NONE);
-    autoConnect = new Button(composite, SWT.CHECK);
-    autoConnect.setText("Auto Connect");
-
-    initValues();
-    return composite;
-  }
-
-  protected void initValues()
-  {
-    connectorDescription.setText(OM.PREF_CONNECTOR_DESCRIPTION.getValue());
-    userID.setText(OM.PREF_USER_ID.getValue());
-    password.setText(OM.PREF_PASSWORD.getValue());
-    autoConnect.setSelection(OM.PREF_AUTO_CONNECT.getValue());
-  }
-
-  @Override
-  public boolean performOk()
-  {
-    OM.PREF_CONNECTOR_DESCRIPTION.setValue(connectorDescription.getText());
-    OM.PREF_USER_ID.setValue(userID.getText());
-    OM.PREF_PASSWORD.setValue(password.getText());
-    OM.PREF_AUTO_CONNECT.setValue(autoConnect.getSelection());
-    return super.performOk();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java
deleted file mode 100644
index 75d1b503cf..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.views;
-
-import org.eclipse.net4j.buddies.internal.ui.dnd.BuddiesTransfer;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.util.ui.dnd.DNDDragListener;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * @author Eike Stepper
- */
-public class BuddiesDragListener extends DNDDragListener<IBuddy[]>
-{
-  private static final Transfer[] TRANSFERS = new Transfer[] { BuddiesTransfer.INSTANCE };
-
-  public BuddiesDragListener(StructuredViewer viewer)
-  {
-    super(BuddiesTransfer.INSTANCE, viewer);
-  }
-
-  @Override
-  protected IBuddy[] getObject(IStructuredSelection selection)
-  {
-    Collection<IBuddy> buddies = new ArrayList<IBuddy>();
-    for (Iterator<?> it = selection.iterator(); it.hasNext();)
-    {
-      Object element = it.next();
-      if (element instanceof IBuddy)
-      {
-        IBuddy buddy = (IBuddy)element;
-        buddies.add(buddy);
-      }
-    }
-
-    if (buddies.isEmpty())
-    {
-      return null;
-    }
-
-    return buddies.toArray(new IBuddy[buddies.size()]);
-  }
-
-  public static void support(StructuredViewer viewer)
-  {
-    viewer.addDragSupport(DND.DROP_MOVE, TRANSFERS, new BuddiesDragListener(viewer));
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java
deleted file mode 100644
index bd17f171b6..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.views;
-
-import org.eclipse.net4j.buddies.IBuddyCollaboration;
-import org.eclipse.net4j.buddies.internal.ui.dnd.BuddiesTransfer;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.util.ui.dnd.DNDDropAdapter;
-
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-
-/**
- * @author Eike Stepper
- */
-public class BuddiesDropAdapter extends DNDDropAdapter<IBuddy[]>
-{
-  private static final Transfer[] TRANSFERS = new Transfer[] { BuddiesTransfer.INSTANCE };
-
-  public BuddiesDropAdapter(StructuredViewer viewer)
-  {
-    super(BuddiesTransfer.INSTANCE, viewer);
-    setExpandEnabled(false);
-  }
-
-  @Override
-  protected boolean performDrop(IBuddy[] buddies, Object target)
-  {
-    IBuddyCollaboration collaboration = (IBuddyCollaboration)target;
-    collaboration.invite(buddies);
-    return true;
-  }
-
-  @Override
-  protected boolean validateTarget(Object target, int operation)
-  {
-    return target instanceof IBuddyCollaboration;
-  }
-
-  public static void support(StructuredViewer viewer)
-  {
-    viewer.addDropSupport(DND.DROP_MOVE, TRANSFERS, new BuddiesDropAdapter(viewer));
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
deleted file mode 100644
index 37616666ca..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.views;
-
-import org.eclipse.net4j.buddies.IBuddyCollaboration;
-import org.eclipse.net4j.buddies.internal.ui.ChatInstaller;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IMembership;
-import org.eclipse.net4j.util.container.ContainerUtil;
-import org.eclipse.net4j.util.container.IContainer;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-public class BuddiesView extends SessionManagerView
-{
-  public BuddiesView()
-  {
-  }
-
-  @Override
-  protected IContainer<?> getContainer()
-  {
-    return getSession() != null ? getSession() : ContainerUtil.emptyContainer();
-  }
-
-  @Override
-  protected Control createControl(Composite parent)
-  {
-    Control control = super.createControl(parent);
-    BuddiesDragListener.support(getViewer());
-    BuddiesDropAdapter.support(getViewer());
-    return control;
-  }
-
-  @Override
-  protected void doubleClicked(Object object)
-  {
-    if (getSession() != null && object instanceof IBuddy)
-    {
-      IBuddy buddy = (IBuddy)object;
-      IBuddy self = getSession().getSelf();
-      IMembership membership = self.initiate(buddy);
-
-      try
-      {
-        // The chat dependency is optional
-        ChatInstaller.installChat((IBuddyCollaboration)membership.getCollaboration());
-      }
-      catch (Throwable ignore)
-      {
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsPane.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsPane.java
deleted file mode 100644
index 3fe996495c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsPane.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.views;
-
-import org.eclipse.net4j.buddies.IBuddyCollaboration;
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.IFacility;
-import org.eclipse.net4j.buddies.protocol.IFacilityInstalledEvent;
-import org.eclipse.net4j.buddies.protocol.IMembership;
-import org.eclipse.net4j.buddies.ui.IFacilityPaneCreator;
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IContainerEventVisitor;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IActionBars;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class CollaborationsPane extends Composite implements IListener
-{
-  private CollaborationsView collaborationsView;
-
-  private IBuddySession session;
-
-  private IBuddyCollaboration activeCollaboration;
-
-  private Map<IBuddyCollaboration, IFacility> activeFacilities = new HashMap<IBuddyCollaboration, IFacility>();
-
-  private Map<IFacility, FacilityPane> facilityPanes = new HashMap<IFacility, FacilityPane>();
-
-  private List<ActivateFacilityAction> activateFacilityActions = new ArrayList<ActivateFacilityAction>();
-
-  private StackLayout paneStack;
-
-  public CollaborationsPane(Composite parent, CollaborationsView collaborationsView)
-  {
-    super(parent, SWT.NONE);
-    setLayout(paneStack = new StackLayout());
-    this.collaborationsView = collaborationsView;
-  }
-
-  public CollaborationsView getCollaborationsView()
-  {
-    return collaborationsView;
-  }
-
-  public IBuddySession getSession()
-  {
-    return session;
-  }
-
-  public void setSession(IBuddySession session)
-  {
-    this.session = session;
-    if (session != null)
-    {
-      for (ICollaboration collaboration : session.getSelf().getCollaborations())
-      {
-        collaborationAdded((IBuddyCollaboration)collaboration);
-      }
-    }
-
-    updateState();
-  }
-
-  public IBuddyCollaboration getActiveCollaboration()
-  {
-    return activeCollaboration;
-  }
-
-  public void setActiveCollaboration(IBuddyCollaboration collaboration)
-  {
-    if (activeCollaboration != collaboration)
-    {
-      activeCollaboration = collaboration;
-      IFacility facility = activeFacilities.get(collaboration);
-      setActiveFacility(collaboration, facility);
-      updateState();
-      collaborationsView.refreshViewer(true);
-    }
-  }
-
-  public void setActiveFacility(IBuddyCollaboration collaboration, IFacility facility)
-  {
-    activeFacilities.put(collaboration, facility);
-    if (collaboration == activeCollaboration)
-    {
-      FacilityPane facilityPane = facilityPanes.get(facility);
-      setActiveFacilityPane(facilityPane);
-      updateState();
-    }
-  }
-
-  protected void setActiveFacilityPane(FacilityPane newPane)
-  {
-    if (paneStack.topControl != newPane)
-    {
-      FacilityPane oldPane = (FacilityPane)paneStack.topControl;
-      if (oldPane != null)
-      {
-        oldPane.hidden(newPane);
-      }
-
-      paneStack.topControl = newPane;
-      layout();
-      if (newPane != null)
-      {
-        newPane.showed(oldPane);
-      }
-
-      updateState();
-    }
-  }
-
-  public void fillActionBars(IActionBars bars)
-  {
-    IToolBarManager manager = bars.getToolBarManager();
-    for (IFacilityPaneCreator c : collaborationsView.getFacilityPaneCreators().values())
-    {
-      ActivateFacilityAction action = new ActivateFacilityAction(c.getType(), c.getImageDescriptor());
-      activateFacilityActions.add(action);
-      manager.add(action);
-    }
-  }
-
-  public void updateState()
-  {
-    for (ActivateFacilityAction action : activateFacilityActions)
-    {
-      if (activeCollaboration == null)
-      {
-        action.setEnabled(false);
-      }
-      else
-      {
-        String type = action.getType();
-        action.setEnabled(activeCollaboration.getFacility(type) != null);
-
-        IFacility activeFacility = activeFacilities.get(activeCollaboration);
-        action.setChecked(activeFacility != null && ObjectUtil.equals(activeFacility.getType(), type));
-      }
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public void notifyEvent(IEvent event)
-  {
-    if (session == null)
-    {
-      return;
-    }
-
-    if (event.getSource() == session.getSelf() && event instanceof IContainerEvent)
-    {
-      IContainerEvent<IMembership> e = (IContainerEvent<IMembership>)event;
-      e.accept(new IContainerEventVisitor<IMembership>()
-      {
-        public void added(IMembership membership)
-        {
-          collaborationAdded((IBuddyCollaboration)membership.getCollaboration());
-        }
-
-        public void removed(IMembership membership)
-        {
-          collaborationRemoved((IBuddyCollaboration)membership.getCollaboration());
-        }
-      });
-    }
-    else if (event instanceof IFacilityInstalledEvent)
-    {
-      IFacilityInstalledEvent e = (IFacilityInstalledEvent)event;
-      facilityInstalled(e.getFacility(), e.fromRemote());
-    }
-  }
-
-  protected void collaborationAdded(IBuddyCollaboration collaboration)
-  {
-    IFacility[] facilities = collaboration.getFacilities();
-    for (IFacility facility : facilities)
-    {
-      addFacilityPane(facility);
-    }
-
-    if (activeCollaboration == null)
-    {
-      setActiveCollaboration(collaboration);
-    }
-
-    if (facilities.length != 0)
-    {
-      setActiveFacility(collaboration, facilities[0]);
-    }
-
-    collaboration.addListener(this);
-  }
-
-  protected void collaborationRemoved(IBuddyCollaboration collaboration)
-  {
-    collaboration.removeListener(this);
-    if (activeCollaboration == collaboration)
-    {
-      setActiveCollaboration(activeFacilities.isEmpty() ? null : activeFacilities.keySet().iterator().next());
-    }
-
-    activeFacilities.remove(collaboration);
-    for (IFacility facility : collaboration.getFacilities())
-    {
-      FacilityPane pane = facilityPanes.remove(facility);
-      if (pane != null)
-      {
-        pane.dispose();
-      }
-    }
-  }
-
-  protected void facilityInstalled(final IFacility facility, boolean fromRemote)
-  {
-    final IBuddyCollaboration collaboration = (IBuddyCollaboration)facility.getCollaboration();
-    if (fromRemote)
-    {
-      Runnable runnable = new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            addFacilityPane(facility);
-            IFacility activeFacility = activeFacilities.get(collaboration);
-            if (activeFacility == null)
-            {
-              setActiveFacility(collaboration, facility);
-            }
-            else
-            {
-              updateState();
-            }
-          }
-          catch (RuntimeException ignore)
-          {
-          }
-        }
-      };
-
-      try
-      {
-        Display display = getDisplay();
-        if (display.getThread() == Thread.currentThread())
-        {
-          runnable.run();
-        }
-        else
-        {
-          display.asyncExec(runnable);
-        }
-      }
-      catch (RuntimeException ignore)
-      {
-      }
-    }
-    else
-    {
-      addFacilityPane(facility);
-      setActiveCollaboration(collaboration);
-      setActiveFacility(collaboration, facility);
-    }
-  }
-
-  protected FacilityPane addFacilityPane(IFacility facility)
-  {
-    IFacilityPaneCreator creator = collaborationsView.getFacilityPaneCreators().get(facility.getType());
-    FacilityPane pane = creator.createPane(this, SWT.NONE);
-    pane.setFacility(facility);
-    facilityPanes.put(facility, pane);
-    return pane;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class ActivateFacilityAction extends SafeAction
-  {
-    private final String type;
-
-    private ActivateFacilityAction(String type, ImageDescriptor descriptor)
-    {
-      super(StringUtil.cap(type), AS_RADIO_BUTTON);
-      setToolTipText("Activate " + type + " facility");
-      setImageDescriptor(descriptor);
-      this.type = type;
-    }
-
-    public String getType()
-    {
-      return type;
-    }
-
-    @Override
-    protected void safeRun() throws Exception
-    {
-      if (activeCollaboration != null)
-      {
-        IFacility facility = activeCollaboration.getFacility(type);
-        setActiveFacility(activeCollaboration, facility);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java
deleted file mode 100644
index 6960b1291c..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.views;
-
-import org.eclipse.net4j.buddies.IBuddyCollaboration;
-import org.eclipse.net4j.buddies.internal.ui.CollaborationsItemProvider;
-import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-import org.eclipse.net4j.buddies.ui.IFacilityPaneCreator;
-import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.container.ContainerUtil;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-import org.eclipse.net4j.util.ui.actions.SashLayoutAction;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.widgets.SashComposite;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchActionConstants;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class CollaborationsView extends SessionManagerView
-{
-  private SashComposite sashComposite;
-
-  private Map<String, IFacilityPaneCreator> facilityPaneCreators = new HashMap<String, IFacilityPaneCreator>();
-
-  public CollaborationsView()
-  {
-    initFacilityPaneCreators();
-  }
-
-  public CollaborationsPane getCollaborationsPane()
-  {
-    return (CollaborationsPane)sashComposite.getControl2();
-  }
-
-  public Map<String, IFacilityPaneCreator> getFacilityPaneCreators()
-  {
-    return facilityPaneCreators;
-  }
-
-  @Override
-  protected Control createControl(Composite parent)
-  {
-    sashComposite = new SashComposite(parent, SWT.NONE, 10, 30)
-    {
-      @Override
-      protected Control createControl1(Composite parent)
-      {
-        return CollaborationsView.super.createControl(parent);
-      }
-
-      @Override
-      protected Control createControl2(Composite parent)
-      {
-        return new CollaborationsPane(parent, CollaborationsView.this);
-      }
-    };
-
-    IActionBars bars = getViewSite().getActionBars();
-    bars.getMenuManager().add(new Separator());
-    bars.getToolBarManager().add(new Separator());
-    getCollaborationsPane().fillActionBars(bars);
-
-    BuddiesDropAdapter.support(getViewer());
-    return sashComposite;
-  }
-
-  @Override
-  protected void queryBuddiesManager()
-  {
-    super.queryBuddiesManager();
-    getCollaborationsPane().setSession(getSession());
-  }
-
-  @Override
-  public void notifyEvent(IEvent event)
-  {
-    super.notifyEvent(event);
-    getCollaborationsPane().notifyEvent(event);
-  }
-
-  @Override
-  protected void fillLocalPullDown(IMenuManager manager)
-  {
-    super.fillLocalPullDown(manager);
-    manager.add(new Separator());
-    manager.add(new SashLayoutAction.LayoutMenu(sashComposite));
-  }
-
-  @Override
-  protected void fillContextMenu(IMenuManager manager, ITreeSelection selection)
-  {
-    super.fillContextMenu(manager, selection);
-    if (selection.size() == 1)
-    {
-      final IBuddyCollaboration collaboration = (IBuddyCollaboration)selection.getFirstElement();
-      if (collaboration != null)
-      {
-        manager.insertBefore(IWorkbenchActionConstants.MB_ADDITIONS, new Separator());
-        for (IFacilityPaneCreator c : facilityPaneCreators.values())
-        {
-          String type = c.getType();
-          if (collaboration.getFacility(type) == null)
-          {
-            IAction action = new StartFacilityAction(collaboration, type, c.getImageDescriptor());
-            manager.insertBefore(IWorkbenchActionConstants.MB_ADDITIONS, action);
-          }
-        }
-      }
-    }
-  }
-
-  @Override
-  protected void doubleClicked(Object object)
-  {
-    if (object instanceof IBuddyCollaboration)
-    {
-      IBuddyCollaboration collaboration = (IBuddyCollaboration)object;
-      getCollaborationsPane().setActiveCollaboration(collaboration);
-    }
-  }
-
-  @Override
-  protected IContainer<?> getContainer()
-  {
-    return getSession() != null ? getSession().getSelf() : ContainerUtil.emptyContainer();
-  }
-
-  @Override
-  protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
-  {
-    return new CollaborationsItemProvider()
-    {
-      @Override
-      public Font getFont(Object obj)
-      {
-        if (obj instanceof IBuddyCollaboration)
-        {
-          if (obj == getCollaborationsPane().getActiveCollaboration())
-          {
-            return getBold();
-          }
-        }
-
-        return super.getFont(obj);
-      }
-    };
-  }
-
-  protected void initFacilityPaneCreators()
-  {
-    IExtensionRegistry registry = Platform.getExtensionRegistry();
-    IConfigurationElement[] elements = registry.getConfigurationElementsFor(OM.BUNDLE_ID, OM.EXT_POINT);
-    for (final IConfigurationElement element : elements)
-    {
-      if ("facilityPaneCreator".equals(element.getName()))
-      {
-        try
-        {
-          IFacilityPaneCreator creator = (IFacilityPaneCreator)element.createExecutableExtension("class");
-          facilityPaneCreators.put(creator.getType(), creator);
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-        }
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class StartFacilityAction extends SafeAction
-  {
-    private final String type;
-
-    private IBuddyCollaboration collaboration;
-
-    private StartFacilityAction(IBuddyCollaboration collaboration, String type, ImageDescriptor descriptor)
-    {
-      super("Start " + StringUtil.cap(type), AS_RADIO_BUTTON);
-      setToolTipText("Start a " + type + " facility");
-      setImageDescriptor(descriptor);
-      this.collaboration = collaboration;
-      this.type = type;
-    }
-
-    @Override
-    protected void safeRun() throws Exception
-    {
-      collaboration.installFacility(type);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
deleted file mode 100644
index 0c315fb09e..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.views;
-
-import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-import org.eclipse.net4j.buddies.protocol.IFacility;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.jface.action.CoolBarManager;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.ICoolBarManager;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.CoolBar;
-import org.eclipse.swt.widgets.Layout;
-
-/**
- * @author Eike Stepper
- */
-public abstract class FacilityPane extends Composite implements IListener
-{
-  private IFacility facility;
-
-  private CollaborationsPane collaborationsPane;
-
-  private CoolBarManager coolBarManager;
-
-  private Control control;
-
-  public FacilityPane(CollaborationsPane collaborationsPane, int style)
-  {
-    super(collaborationsPane, style);
-    this.collaborationsPane = collaborationsPane;
-    setLayout(new FacilityPaneLayout());
-
-    ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT | SWT.RIGHT | SWT.WRAP);
-    fillCoolBar(toolBarManager);
-
-    coolBarManager = new CoolBarManager(SWT.FLAT | SWT.RIGHT | SWT.WRAP);
-    coolBarManager.add(toolBarManager);
-    coolBarManager.setLockLayout(true);
-    coolBarManager.createControl(this);
-    coolBarManager.update(true);
-
-    Composite composite = new Composite(this, SWT.NONE);
-    composite.setLayout(UIUtil.createGridLayout(1));
-
-    control = createUI(composite);
-    control.setLayoutData(UIUtil.createGridData());
-  }
-
-  @Override
-  public void dispose()
-  {
-    facility.removeListener(this);
-    coolBarManager.dispose();
-    super.dispose();
-  }
-
-  public IFacility getFacility()
-  {
-    return facility;
-  }
-
-  public void setFacility(IFacility facility)
-  {
-    this.facility = facility;
-    facility.addListener(this);
-  }
-
-  public CollaborationsPane getCollaborationsPane()
-  {
-    return collaborationsPane;
-  }
-
-  public ICoolBarManager getCoolBarManager()
-  {
-    return coolBarManager;
-  }
-
-  public Control getControl()
-  {
-    return control;
-  }
-
-  public final void notifyEvent(final IEvent event)
-  {
-    try
-    {
-      control.getDisplay().syncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            handleEvent(event);
-          }
-          catch (Exception ex)
-          {
-            OM.LOG.error(ex);
-          }
-        }
-      });
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  protected abstract void handleEvent(IEvent event) throws Exception;
-
-  public void hidden(FacilityPane newPane)
-  {
-  }
-
-  public void showed(FacilityPane oldPane)
-  {
-  }
-
-  protected abstract Control createUI(Composite parent);
-
-  protected CoolBar getCoolBarControl()
-  {
-    if (coolBarManager != null)
-    {
-      return coolBarManager.getControl();
-    }
-
-    return null;
-  }
-
-  protected void fillCoolBar(IContributionManager manager)
-  {
-  }
-
-  /**
-   * @author Eike Stepper
-   * @see org.eclipse.jface.window.ApplicationWindow.ApplicationWindowLayout
-   */
-  public class FacilityPaneLayout extends Layout
-  {
-    static final int BAR_SIZE = 23;
-
-    @Override
-    protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache)
-    {
-      if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
-      {
-        return new Point(wHint, hHint);
-      }
-
-      Point result = new Point(0, 0);
-      Control[] ws = composite.getChildren();
-      for (int i = 0; i < ws.length; i++)
-      {
-        Control w = ws[i];
-        boolean hide = false;
-        if (w == getCoolBarControl())
-        {
-          if (!coolBarChildrenExist())
-          {
-            hide = true;
-            result.y += BAR_SIZE;
-          }
-        }
-        else if (i > 0)
-        {
-          hide = false;
-        }
-
-        if (!hide)
-        {
-          Point e = w.computeSize(wHint, hHint, flushCache);
-          result.x = Math.max(result.x, e.x);
-          result.y += e.y;
-        }
-      }
-
-      if (wHint != SWT.DEFAULT)
-      {
-        result.x = wHint;
-      }
-
-      if (hHint != SWT.DEFAULT)
-      {
-        result.y = hHint;
-      }
-
-      return result;
-    }
-
-    @Override
-    protected void layout(Composite composite, boolean flushCache)
-    {
-      Rectangle clientArea = composite.getClientArea();
-      Control[] ws = composite.getChildren();
-      for (int i = 0; i < ws.length; i++)
-      {
-        Control w = ws[i];
-        if (w == getCoolBarControl())
-        {
-          if (coolBarChildrenExist())
-          {
-            Point e = w.computeSize(clientArea.width, SWT.DEFAULT, flushCache);
-            w.setBounds(clientArea.x, clientArea.y, clientArea.width, e.y);
-            clientArea.y += e.y;
-            clientArea.height -= e.y;
-          }
-        }
-        else
-        {
-          w.setBounds(clientArea.x, clientArea.y, clientArea.width, clientArea.height);
-        }
-      }
-    }
-
-    protected boolean coolBarChildrenExist()
-    {
-      CoolBar coolBarControl = getCoolBarControl();
-      if (coolBarControl != null)
-      {
-        return coolBarControl.getItemCount() > 0;
-      }
-
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
deleted file mode 100644
index 9c7a1762b0..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui.views;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.ui.BuddiesItemProvider;
-import org.eclipse.net4j.buddies.internal.ui.actions.ConnectAction;
-import org.eclipse.net4j.buddies.internal.ui.actions.DisconnectAction;
-import org.eclipse.net4j.buddies.internal.ui.actions.FlashAction;
-import org.eclipse.net4j.buddies.internal.ui.actions.ReconnectAction;
-import org.eclipse.net4j.buddies.internal.ui.actions.StateAction.DropDownAction;
-import org.eclipse.net4j.buddies.protocol.IBuddyStateEvent;
-import org.eclipse.net4j.buddies.ui.ISessionManager;
-import org.eclipse.net4j.buddies.ui.ISessionManagerEvent;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.views.ContainerView;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-public abstract class SessionManagerView extends ContainerView implements IListener
-{
-  private IBuddySession session;
-
-  private ConnectAction connectAction = new ConnectAction();
-
-  private DisconnectAction disconnectAction = new DisconnectAction();
-
-  private ReconnectAction reconnectAction = new ReconnectAction();
-
-  private FlashAction flashAction = new FlashAction();
-
-  private DropDownAction dropDownAction = new DropDownAction();
-
-  private Control control;
-
-  public SessionManagerView()
-  {
-  }
-
-  public IBuddySession getSession()
-  {
-    return session;
-  }
-
-  @Override
-  public void dispose()
-  {
-    ISessionManager.INSTANCE.removeListener(this);
-    session = null;
-    super.dispose();
-  }
-
-  public void notifyEvent(IEvent event)
-  {
-    if (event instanceof ISessionManagerEvent)
-    {
-      queryBuddiesManager();
-    }
-    else if (event instanceof IBuddyStateEvent)
-    {
-      if (session != null && event.getSource() == session.getSelf())
-      {
-        updateState();
-      }
-    }
-  }
-
-  @Override
-  protected final Control createUI(Composite parent)
-  {
-    control = createControl(parent);
-    queryBuddiesManager();
-    ISessionManager.INSTANCE.addListener(this);
-    return control;
-  }
-
-  protected Control createControl(Composite parent)
-  {
-    return super.createUI(parent);
-  }
-
-  @Override
-  protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
-  {
-    return new BuddiesItemProvider();
-  }
-
-  @Override
-  protected void fillLocalToolBar(IToolBarManager manager)
-  {
-    super.fillLocalToolBar(manager);
-    manager.add(dropDownAction);
-  }
-
-  @Override
-  protected void fillLocalPullDown(IMenuManager manager)
-  {
-    manager.add(connectAction);
-    manager.add(disconnectAction);
-    manager.add(reconnectAction);
-    manager.add(new Separator());
-    manager.add(flashAction);
-    super.fillLocalPullDown(manager);
-  }
-
-  protected void queryBuddiesManager()
-  {
-    IBuddySession oldSession = session;
-    session = ISessionManager.INSTANCE.getSession();
-    if (oldSession != session)
-    {
-      if (oldSession != null)
-      {
-        oldSession.removeListener(this);
-        oldSession.getSelf().removeListener(this);
-      }
-
-      if (session != null)
-      {
-        session.addListener(this);
-        session.getSelf().addListener(this);
-      }
-    }
-
-    resetInput();
-    updateState();
-  }
-
-  protected void updateState()
-  {
-    connectAction.setEnabled(session == null);
-    disconnectAction.setEnabled(session != null);
-    reconnectAction.setEnabled(session != null);
-    flashAction.setEnabled(session != null && !ISessionManager.INSTANCE.isFlashing());
-    dropDownAction.updateState();
-    // control.setEnabled(session != null);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java
deleted file mode 100644
index cc7a9cd320..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.ui;
-
-import org.eclipse.net4j.buddies.internal.ui.views.CollaborationsPane;
-import org.eclipse.net4j.buddies.internal.ui.views.FacilityPane;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * @author Eike Stepper
- */
-public interface IFacilityPaneCreator
-{
-  public String getType();
-
-  public ImageDescriptor getImageDescriptor();
-
-  public FacilityPane createPane(CollaborationsPane collaborationsPane, int style);
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManager.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManager.java
deleted file mode 100644
index a168df5d14..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManager.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.ui;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.ui.SessionManager;
-import org.eclipse.net4j.util.event.INotifier;
-
-/**
- * @author Eike Stepper
- */
-public interface ISessionManager extends INotifier
-{
-  public static final ISessionManager INSTANCE = SessionManager.INSTANCE;
-
-  public IBuddySession getSession();
-
-  public State getState();
-
-  public boolean isConnecting();
-
-  public void connect();
-
-  public void disconnect();
-
-  public void flashMe();
-
-  public boolean isFlashing();
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum State
-  {
-    CONNECTING, CONNECTED, DISCONNECTED
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManagerEvent.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManagerEvent.java
deleted file mode 100644
index a681be1e7a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManagerEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies.ui;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Eike Stepper
- */
-public interface ISessionManagerEvent extends IEvent
-{
-  public ISessionManager.State getOldState();
-
-  public ISessionManager.State getNewState();
-
-  public IBuddySession getSession();
-}
diff --git a/plugins/org.eclipse.net4j.buddies/.classpath b/plugins/org.eclipse.net4j.buddies/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.buddies/.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.buddies/.cvsignore b/plugins/org.eclipse.net4j.buddies/.cvsignore
deleted file mode 100644
index 5298e8d079..0000000000
--- a/plugins/org.eclipse.net4j.buddies/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-mixin-bin
-doc
-text
diff --git a/plugins/org.eclipse.net4j.buddies/.options b/plugins/org.eclipse.net4j.buddies/.options
deleted file mode 100644
index cdd0a9dd46..0000000000
--- a/plugins/org.eclipse.net4j.buddies/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.buddies/debug = true
diff --git a/plugins/org.eclipse.net4j.buddies/.project b/plugins/org.eclipse.net4j.buddies/.project
deleted file mode 100644
index 118149f778..0000000000
--- a/plugins/org.eclipse.net4j.buddies/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.buddies</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1ff851ee40..0000000000
--- a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,272 +0,0 @@
-#Sat Feb 23 10:52:49 CET 2008
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 21e7e6a404..0000000000
--- a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:52:49 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.buddies/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF
deleted file mode 100644
index 950945e512..0000000000
--- a/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.buddies; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.net4j.internal.buddies.bundle.OM$Activator
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.buddies.protocol;visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies;version="0.8.0",
- org.eclipse.net4j.internal.buddies;version="0.8.0",
- org.eclipse.net4j.internal.buddies.protocol;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies/about.html b/plugins/org.eclipse.net4j.buddies/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.buddies/about.html
+++ /dev/null
@@ -1,28 +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.buddies/about.ini b/plugins/org.eclipse.net4j.buddies/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.net4j.buddies/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.buddies/about.mappings b/plugins/org.eclipse.net4j.buddies/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.net4j.buddies/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.buddies/about.properties b/plugins/org.eclipse.net4j.buddies/about.properties
deleted file mode 100644
index 71900449ad..0000000000
--- a/plugins/org.eclipse.net4j.buddies/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 Buddies (Incubation)
-featureText = Net4j Buddies \n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/Net4j
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.buddies/build.properties b/plugins/org.eclipse.net4j.buddies/build.properties
deleted file mode 100644
index 9309926198..0000000000
--- a/plugins/org.eclipse.net4j.buddies/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.xml,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.net4j.buddies/copyright.txt b/plugins/org.eclipse.net4j.buddies/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.buddies/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies/epl-v10.html b/plugins/org.eclipse.net4j.buddies/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.buddies/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies/license.html b/plugins/org.eclipse.net4j.buddies/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.buddies/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.buddies/modeling32.png b/plugins/org.eclipse.net4j.buddies/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.net4j.buddies/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.buddies/plugin.properties b/plugins/org.eclipse.net4j.buddies/plugin.properties
deleted file mode 100644
index 1acb2ae1f0..0000000000
--- a/plugins/org.eclipse.net4j.buddies/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Buddies (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.buddies/plugin.xml b/plugins/org.eclipse.net4j.buddies/plugin.xml
deleted file mode 100644
index 6b9364d081..0000000000
--- a/plugins/org.eclipse.net4j.buddies/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.net4j.util.factories">
-      <factory
-            class="org.eclipse.net4j.internal.buddies.protocol.ClientProtocolFactory"
-            productGroup="org.eclipse.net4j.clientProtocols"
-            type="buddies"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
deleted file mode 100644
index 6faae33375..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies;
-
-import org.eclipse.net4j.buddies.internal.protocol.ClientFacilityFactory;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.buddies.protocol.OpenSessionRequest;
-import org.eclipse.net4j.signal.SignalActor;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.container.IPluginContainer;
-
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public final class BuddiesUtil
-{
-  private BuddiesUtil()
-  {
-  }
-
-  public static Set<String> getFacilityTypes()
-  {
-    return IPluginContainer.INSTANCE.getFactoryTypes(ClientFacilityFactory.PRODUCT_GROUP);
-  }
-
-  public static IBuddySession openSession(IConnector connector, String userID, String password, long timeout)
-  {
-    try
-    {
-      IChannel channel = connector.openChannel(ProtocolConstants.PROTOCOL_NAME, null);
-      OpenSessionRequest request = new OpenSessionRequest(channel, userID, password, getFacilityTypes());
-      return request.send(timeout);
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  public static IBuddySession openSession(IConnector connector, String userID, String password)
-  {
-    return openSession(connector, userID, password, SignalActor.NO_TIMEOUT);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddyCollaboration.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddyCollaboration.java
deleted file mode 100644
index bed20729e5..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddyCollaboration.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies;
-
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.IFacility;
-
-/**
- * @author Eike Stepper
- */
-public interface IBuddyCollaboration extends ICollaboration
-{
-  public IBuddySession getSession();
-
-  public IFacility installFacility(String type);
-
-  public IBuddy[] invite(String... userIDs);
-
-  public void invite(IBuddy... buddies);
-
-  public void leave();
-
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
deleted file mode 100644
index 3d24d9ce80..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buddies;
-
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IBuddyContainer;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.channel.IChannel;
-
-/**
- * @author Eike Stepper
- */
-public interface IBuddySession extends ISession, IBuddyContainer
-{
-  public IChannel getChannel();
-
-  public IBuddy getSelf();
-
-  public void close();
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java
deleted file mode 100644
index 629ff3fae4..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies;
-
-import org.eclipse.net4j.buddies.IBuddyCollaboration;
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.protocol.ClientFacilityFactory;
-import org.eclipse.net4j.buddies.internal.protocol.Collaboration;
-import org.eclipse.net4j.buddies.internal.protocol.CollaborationLeftNotification;
-import org.eclipse.net4j.buddies.internal.protocol.Message;
-import org.eclipse.net4j.buddies.internal.protocol.MessageNotification;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IFacility;
-import org.eclipse.net4j.buddies.protocol.IMessage;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.buddies.protocol.InstallFacilityRequest;
-import org.eclipse.net4j.internal.buddies.protocol.InviteBuddiesNotification;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.container.IPluginContainer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class BuddyCollaboration extends Collaboration implements IBuddyCollaboration
-{
-  private static final String FACILITY_GROUP = ClientFacilityFactory.PRODUCT_GROUP;
-
-  private IBuddySession session;
-
-  public BuddyCollaboration(IBuddySession session, long id)
-  {
-    super(id);
-    this.session = session;
-  }
-
-  public IBuddySession getSession()
-  {
-    return session;
-  }
-
-  public IFacility installFacility(String type)
-  {
-    return installFacility(type, true);
-  }
-
-  public IFacility installFacility(String type, boolean request)
-  {
-    IFacility facility = createFacility(type);
-    if (request)
-    {
-      try
-      {
-        IChannel channel = session.getChannel();
-        boolean success = new InstallFacilityRequest(channel, getID(), type).send(ProtocolConstants.TIMEOUT);
-        if (!success)
-        {
-          return null;
-        }
-      }
-      catch (Exception ex)
-      {
-        throw WrappedException.wrap(ex);
-      }
-    }
-
-    addFacility(facility, !request);
-    return facility;
-  }
-
-  public IFacility createFacility(String type)
-  {
-    IFacility facility = (IFacility)getContainer().getElement(FACILITY_GROUP, type, String.valueOf(getID()));
-    facility.setCollaboration(this);
-    return facility;
-  }
-
-  @Override
-  public void sendMessage(long collaborationID, String facilityType, IMessage message)
-  {
-    if (message instanceof Message)
-    {
-      ((Message)message).setSenderID(session.getSelf().getUserID());
-    }
-
-    try
-    {
-      IChannel channel = session.getChannel();
-      new MessageNotification(channel, collaborationID, facilityType, message).send();
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  public IBuddy[] invite(String... userIDs)
-  {
-    List<IBuddy> buddies = new ArrayList<IBuddy>();
-    for (String userID : userIDs)
-    {
-      IBuddy buddy = session.getBuddy(userID);
-      buddies.add(buddy);
-    }
-
-    IBuddy[] array = buddies.toArray(new IBuddy[buddies.size()]);
-    invite(array);
-    return array;
-  }
-
-  public void invite(IBuddy... buddies)
-  {
-    List<IBuddy> invitations = new ArrayList<IBuddy>();
-    for (IBuddy buddy : buddies)
-    {
-      if (getMembership(buddy) == null)
-      {
-        invitations.add(buddy);
-      }
-    }
-
-    if (!invitations.isEmpty())
-    {
-      try
-      {
-        IChannel channel = session.getChannel();
-        new InviteBuddiesNotification(channel, getID(), invitations).send();
-      }
-      catch (Exception ex)
-      {
-        throw WrappedException.wrap(ex);
-      }
-    }
-  }
-
-  public void leave()
-  {
-    try
-    {
-      IChannel channel = session.getChannel();
-      new CollaborationLeftNotification(channel, getID(), session.getSelf().getUserID()).send();
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-
-    deactivate();
-  }
-
-  protected IPluginContainer getContainer()
-  {
-    return IPluginContainer.INSTANCE;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
deleted file mode 100644
index b43f8037dd..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies;
-
-import org.eclipse.net4j.buddies.internal.protocol.Buddy;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IMembership;
-
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class ClientBuddy extends Buddy
-{
-  private String userID;
-
-  private IAccount account;
-
-  public ClientBuddy(ClientSession session, String userID)
-  {
-    super(session, null);
-    this.userID = userID;
-  }
-
-  @Override
-  public ClientSession getSession()
-  {
-    return (ClientSession)super.getSession();
-  }
-
-  public String getUserID()
-  {
-    return userID;
-  }
-
-  public IAccount getAccount()
-  {
-    if (account == null)
-    {
-      account = loadAccount(userID);
-    }
-
-    return account;
-  }
-
-  public IMembership[] initiate(Collection<IBuddy> buddies)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public IMembership join(long collaborationID)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public IMembership join(Object invitationToken)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  protected IAccount loadAccount(String userID)
-  {
-    // TODO Implement method ClientBuddy.loadAccount()
-    throw new UnsupportedOperationException("Not yet implemented");
-  }
-
-  @Override
-  protected Set<String> loadFacilityTypes()
-  {
-    // TODO Implement method ClientBuddy.loadFacilityTypes()
-    throw new UnsupportedOperationException("Not yet implemented");
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java
deleted file mode 100644
index 1de04b6afe..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.protocol.BuddyContainer;
-import org.eclipse.net4j.buddies.internal.protocol.BuddyStateNotification;
-import org.eclipse.net4j.buddies.internal.protocol.Collaboration;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IBuddyStateEvent;
-import org.eclipse.net4j.buddies.protocol.IMembership;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.buddies.bundle.OM;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.PlatformObject;
-
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class ClientSession extends BuddyContainer implements IBuddySession, IListener
-{
-  private IChannel channel;
-
-  private Self self;
-
-  public ClientSession(IChannel channel)
-  {
-    this.channel = channel;
-  }
-
-  public IChannel getChannel()
-  {
-    return channel;
-  }
-
-  public Self getSelf()
-  {
-    return self;
-  }
-
-  public void setSelf(IAccount account, Set<String> facilityTypes)
-  {
-    self = new Self(this, account, facilityTypes);
-    self.activate();
-    self.addListener(this);
-  }
-
-  public void close()
-  {
-    channel.close();
-    deactivate();
-  }
-
-  /**
-   * @see PlatformObject#getAdapter(Class)
-   */
-  @SuppressWarnings("unchecked")
-  public Object getAdapter(Class adapter)
-  {
-    return Platform.getAdapterManager().getAdapter(this, adapter);
-  }
-
-  @Override
-  public void notifyEvent(IEvent event)
-  {
-    if (event.getSource() == channel)
-    {
-      if (event instanceof ILifecycleEvent)
-      {
-        if (((ILifecycleEvent)event).getKind() == ILifecycleEvent.Kind.DEACTIVATED)
-        {
-          deactivate();
-        }
-      }
-    }
-    else if (event.getSource() == self)
-    {
-      if (event instanceof IBuddyStateEvent)
-      {
-        try
-        {
-          new BuddyStateNotification(channel, self.getUserID(), ((IBuddyStateEvent)event).getNewState()).send();
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-        }
-      }
-    }
-  }
-
-  public void buddyAdded(String userID)
-  {
-    ClientBuddy buddy = new ClientBuddy(this, userID);
-    buddy.activate();
-    addBuddy(buddy);
-  }
-
-  public void buddyRemoved(String userID)
-  {
-    IBuddy buddy = removeBuddy(userID);
-    if (buddy != null)
-    {
-      for (IMembership membership : self.getMemberships())
-      {
-        Collaboration collaboration = (Collaboration)membership.getCollaboration();
-        collaboration.removeMembership(buddy);
-      }
-
-      LifecycleUtil.deactivate(buddy);
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    channel.addListener(this);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    channel.removeListener(this);
-    LifecycleUtil.deactivate(self);
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
deleted file mode 100644
index ee56e89ecb..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies;
-
-import org.eclipse.net4j.buddies.internal.protocol.Buddy;
-import org.eclipse.net4j.buddies.internal.protocol.Membership;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IMembership;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.buddies.protocol.InitiateCollaborationRequest;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class Self extends Buddy
-{
-  private IAccount account;
-
-  protected Self(ClientSession session, IAccount account, Set<String> facilityTypes)
-  {
-    super(session, facilityTypes);
-    this.account = account;
-  }
-
-  @Override
-  public ClientSession getSession()
-  {
-    return (ClientSession)super.getSession();
-  }
-
-  public String getUserID()
-  {
-    return account.getUserID();
-  }
-
-  public IAccount getAccount()
-  {
-    return account;
-  }
-
-  public IMembership[] initiate(Collection<IBuddy> buddies)
-  {
-    try
-    {
-      ClientSession session = getSession();
-      IChannel channel = session.getChannel();
-      long id = new InitiateCollaborationRequest(channel, buddies).send(ProtocolConstants.TIMEOUT);
-
-      BuddyCollaboration collaboration = new BuddyCollaboration(session, id);
-      collaboration.activate();
-      Membership.create(this, collaboration);
-
-      List<IMembership> memberships = new ArrayList<IMembership>();
-      for (IBuddy buddy : buddies)
-      {
-        IMembership membership = Membership.create(buddy, collaboration);
-        memberships.add(membership);
-      }
-
-      return memberships.toArray(new IMembership[memberships.size()]);
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  public IMembership join(long collaborationID)
-  {
-    // TODO Implement method Self.join()
-    throw new UnsupportedOperationException("Not yet implemented");
-  }
-
-  public IMembership join(Object invitationToken)
-  {
-    // TODO Implement method Self.join()
-    throw new UnsupportedOperationException("Not yet implemented");
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    for (IMembership membership : getMemberships())
-    {
-      LifecycleUtil.deactivate(membership.getCollaboration());
-    }
-
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java
deleted file mode 100644
index 39e8a89b92..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.pref.OMPreferences;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.buddies"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  public static final OMPreferences PREFS = BUNDLE.preferences();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
deleted file mode 100644
index ec1d7be73a..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.internal.buddies.ClientSession;
-import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class BuddyAddedIndication extends Indication
-{
-  public BuddyAddedIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_BUDDY_ADDED;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    String buddy = in.readString();
-    ClientSession session = ((ClientProtocol)getProtocol()).getSession();
-    session.buddyAdded(buddy);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
deleted file mode 100644
index f71d5e5c2c..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.internal.buddies.ClientSession;
-import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class BuddyRemovedIndication extends Indication
-{
-  public BuddyRemovedIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_BUDDY_REMOVED;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    String buddy = in.readString();
-    ClientSession session = ((ClientProtocol)getProtocol()).getSession();
-    session.buddyRemoved(buddy);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
deleted file mode 100644
index 7e2d5b0910..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.BuddyStateIndication;
-import org.eclipse.net4j.buddies.protocol.IBuddy.State;
-import org.eclipse.net4j.internal.buddies.ClientBuddy;
-import org.eclipse.net4j.internal.buddies.ClientSession;
-
-/**
- * @author Eike Stepper
- */
-public class ClientBuddyStateIndication extends BuddyStateIndication
-{
-  public ClientBuddyStateIndication()
-  {
-  }
-
-  @Override
-  protected void stateChanged(final String userID, final State state)
-  {
-    ClientSession session = ((ClientProtocol)getProtocol()).getSession();
-    ClientBuddy buddy = (ClientBuddy)session.getBuddy(userID);
-    if (buddy != null)
-    {
-      buddy.setState(state);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java
deleted file mode 100644
index 76c9df1c59..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.CollaborationLeftIndication;
-import org.eclipse.net4j.internal.buddies.Self;
-
-/**
- * @author Eike Stepper
- */
-public class ClientCollaborationLeftIndication extends CollaborationLeftIndication
-{
-  public ClientCollaborationLeftIndication(Self self)
-  {
-    super(self.getSession(), self);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java
deleted file mode 100644
index bb4d9b49c1..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.MessageIndication;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.internal.buddies.ClientSession;
-import org.eclipse.net4j.internal.buddies.Self;
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-
-/**
- * @author Eike Stepper
- */
-public class ClientProtocol extends SignalProtocol
-{
-  private static final long GET_SESSION_TIMEOUT = 20000;
-
-  private static final int GET_SESSION_INTERVAL = 100;
-
-  public ClientProtocol()
-  {
-  }
-
-  public String getType()
-  {
-    return ProtocolConstants.PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor doCreateSignalReactor(short signalID)
-  {
-    switch (signalID)
-    {
-    case ProtocolConstants.SIGNAL_BUDDY_ADDED:
-      return new BuddyAddedIndication();
-
-    case ProtocolConstants.SIGNAL_BUDDY_REMOVED:
-      return new BuddyRemovedIndication();
-
-    case ProtocolConstants.SIGNAL_BUDDY_STATE:
-      return new ClientBuddyStateIndication();
-
-    case ProtocolConstants.SIGNAL_COLLABORATION_INITIATED:
-      return new CollaborationInitiatedIndication();
-
-    case ProtocolConstants.SIGNAL_COLLABORATION_LEFT:
-      return new ClientCollaborationLeftIndication(getSelf());
-
-    case ProtocolConstants.SIGNAL_FACILITY_INSTALLED:
-      return new FacilityInstalledIndication();
-
-    case ProtocolConstants.SIGNAL_MESSAGE:
-      return new MessageIndication(getSelf());
-    }
-
-    return null;
-  }
-
-  protected Self getSelf()
-  {
-    ISession session = (ISession)getInfraStructure();
-    return (Self)session.getSelf();
-  }
-
-  public ClientSession getSession()
-  {
-    int max = (int)(GET_SESSION_TIMEOUT / GET_SESSION_INTERVAL);
-    for (int i = 0; i < max; i++)
-    {
-      ClientSession session = (ClientSession)getInfraStructure();
-      if (session == null)
-      {
-        ConcurrencyUtil.sleep(GET_SESSION_INTERVAL);
-      }
-      else
-      {
-        return session;
-      }
-    }
-
-    throw new IllegalStateException("No session after " + max + " milliseconds");
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java
deleted file mode 100644
index 23cb313c87..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public final class ClientProtocolFactory extends org.eclipse.internal.net4j.protocol.ClientProtocolFactory
-{
-  public static final String TYPE = ProtocolConstants.PROTOCOL_NAME;
-
-  public ClientProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public ClientProtocol create(String description)
-  {
-    return new ClientProtocol();
-  }
-
-  public static ClientProtocol get(IManagedContainer container, String description)
-  {
-    return (ClientProtocol)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
deleted file mode 100644
index ffc97e97c7..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.protocol.Membership;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.internal.buddies.BuddyCollaboration;
-import org.eclipse.net4j.internal.buddies.Self;
-import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import java.io.IOException;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class CollaborationInitiatedIndication extends Indication
-{
-  public CollaborationInitiatedIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_COLLABORATION_INITIATED;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    IBuddySession session = (IBuddySession)getProtocol().getInfraStructure();
-    Self self = (Self)session.getSelf();
-
-    long collaborationID = in.readLong();
-    Set<IBuddy> buddies = ProtocolUtil.readBuddies(in, session);
-    String[] facilityTypes = ProtocolUtil.readFacilityTypes(in);
-
-    BuddyCollaboration collaboration = (BuddyCollaboration)self.getCollaboration(collaborationID);
-    if (collaboration == null)
-    {
-      collaboration = new BuddyCollaboration(session, collaborationID);
-      collaboration.activate();
-
-      Membership.create(self, collaboration);
-      for (IBuddy buddy : buddies)
-      {
-        Membership.create(buddy, collaboration);
-      }
-    }
-    else
-    {
-      for (IBuddy buddy : buddies)
-      {
-        Membership.create(buddy, collaboration);
-      }
-    }
-
-    for (String facilityType : facilityTypes)
-    {
-      collaboration.installFacility(facilityType, false);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
deleted file mode 100644
index 6004de644a..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IFacility;
-import org.eclipse.net4j.internal.buddies.BuddyCollaboration;
-import org.eclipse.net4j.internal.buddies.Self;
-import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class FacilityInstalledIndication extends Indication
-{
-  public FacilityInstalledIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_FACILITY_INSTALLED;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    long collaborationID = in.readLong();
-    String facilityType = in.readString();
-
-    IBuddySession session = (IBuddySession)getProtocol().getInfraStructure();
-    Self self = (Self)session.getSelf();
-    BuddyCollaboration collaboration = (BuddyCollaboration)self.getCollaboration(collaborationID);
-    if (collaboration != null)
-    {
-      IFacility facility = collaboration.createFacility(facilityType);
-      collaboration.addFacility(facility, true);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
deleted file mode 100644
index a0ea41447e..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-import java.util.Collection;
-
-/**
- * @author Eike Stepper
- */
-public class InitiateCollaborationRequest extends RequestWithConfirmation<Long>
-{
-  private Collection<IBuddy> buddies;
-
-  public InitiateCollaborationRequest(IChannel channel, Collection<IBuddy> buddies)
-  {
-    super(channel);
-    this.buddies = buddies;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_INITIATE_COLLABORATION;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    ProtocolUtil.writeBuddies(out, buddies);
-  }
-
-  @Override
-  protected Long confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readLong();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
deleted file mode 100644
index 145f6aa895..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class InstallFacilityRequest extends RequestWithConfirmation<Boolean>
-{
-  private long collaborationID;
-
-  private String facilityType;
-
-  public InstallFacilityRequest(IChannel channel, long collaborationID, String facilityType)
-  {
-    super(channel);
-    this.collaborationID = collaborationID;
-    this.facilityType = facilityType;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_INSTALL_FACILITY;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeLong(collaborationID);
-    out.writeString(facilityType);
-  }
-
-  @Override
-  protected Boolean confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readBoolean();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
deleted file mode 100644
index 08d2fd5ce9..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-import java.util.Collection;
-
-/**
- * @author Eike Stepper
- */
-public class InviteBuddiesNotification extends Request
-{
-  private long collaborationID;
-
-  private Collection<IBuddy> buddies;
-
-  public InviteBuddiesNotification(IChannel channel, long collaborationID, Collection<IBuddy> buddies)
-  {
-    super(channel);
-    this.buddies = buddies;
-    this.collaborationID = collaborationID;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_INVITE_BUDDIES;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeLong(collaborationID);
-    ProtocolUtil.writeBuddies(out, buddies);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
deleted file mode 100644
index 8bb97b81aa..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class LoadAccountRequest extends RequestWithConfirmation<IAccount>
-{
-  private String userID;
-
-  public LoadAccountRequest(IChannel channel, String userID)
-  {
-    super(channel);
-    this.userID = userID;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_LOAD_ACCOUNT;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(userID);
-  }
-
-  @Override
-  protected IAccount confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return ProtocolUtil.readAccount(in);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
deleted file mode 100644
index a83ae6275c..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.protocol.IAccount;
-import org.eclipse.net4j.buddies.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.buddies.ClientSession;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession>
-{
-  private String userID;
-
-  private String password;
-
-  private Set<String> facilityTypes;
-
-  public OpenSessionRequest(IChannel channel, String userID, String password, Set<String> facilityTypes)
-  {
-    super(channel);
-    this.userID = userID;
-    this.password = password;
-    this.facilityTypes = facilityTypes;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ProtocolConstants.SIGNAL_OPEN_SESSION;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(userID);
-    out.writeString(password);
-    out.writeInt(facilityTypes.size());
-    for (String facilityType : facilityTypes)
-    {
-      out.writeString(facilityType);
-    }
-  }
-
-  @Override
-  protected IBuddySession confirming(ExtendedDataInputStream in) throws IOException
-  {
-    IAccount account = ProtocolUtil.readAccount(in);
-    if (account == null)
-    {
-      return null;
-    }
-
-    ClientSession session = new ClientSession(getProtocol().getChannel());
-    getProtocol().setInfraStructure(session);
-    session.setSelf(account, facilityTypes);
-
-    int size = in.readInt();
-    for (int i = 0; i < size; i++)
-    {
-      session.buddyAdded(in.readString());
-    }
-
-    session.activate();
-    return session;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.derby/.classpath b/plugins/org.eclipse.net4j.db.derby/.classpath
deleted file mode 100644
index 8f738638a3..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/.classpath
+++ /dev/null
@@ -1,9 +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 exported="true" kind="lib" path="lib/derby.jar" sourcepath="org.eclipse.net4j.db.derbysrc.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/derbyclient.jar" sourcepath="org.eclipse.net4j.db.derbysrc.zip"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.net4j.db.derby/.cvsignore b/plugins/org.eclipse.net4j.db.derby/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.net4j.db.derby/.options b/plugins/org.eclipse.net4j.db.derby/.options
deleted file mode 100644
index b93dc7c8b1..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/.options
+++ /dev/null
@@ -1,4 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.db.derby/debug = true
-org.eclipse.net4j.db.derby/debug.sql = true
diff --git a/plugins/org.eclipse.net4j.db.derby/.project b/plugins/org.eclipse.net4j.db.derby/.project
deleted file mode 100644
index 13d4feeb1a..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.db.derby</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 79fe4943fb..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:43:09 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ee55115ebf..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:43:09 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.db.derby/DerbyServer start.launch b/plugins/org.eclipse.net4j.db.derby/DerbyServer start.launch
deleted file mode 100644
index 6f6fbaaa21..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/DerbyServer start.launch
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="derby.system.home" value="/temp"/>
-</mapAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\develop\_lib\db-derby-10.3.2.1-bin\bin\startNetworkServer.bat"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="C:\temp"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.db.derby/DerbyServer stop.launch b/plugins/org.eclipse.net4j.db.derby/DerbyServer stop.launch
deleted file mode 100644
index fd93debb92..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/DerbyServer stop.launch
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="derby.system.home" value="/temp"/>
-</mapAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\develop\_lib\db-derby-10.3.2.1-bin\bin\stopNetworkServer.bat"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="C:\temp"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
deleted file mode 100644
index e90a372339..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,100 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.db.derby;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .,
- lib/derby.jar,
- lib/derbyclient.jar
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db;visibility:=reexport
-Export-Package: org.apache.derby.authentication,
- org.apache.derby.catalog,
- org.apache.derby.catalog.types,
- org.apache.derby.client,
- org.apache.derby.client.am,
- org.apache.derby.client.net,
- org.apache.derby.database,
- org.apache.derby.diag,
- org.apache.derby.iapi.db,
- org.apache.derby.iapi.error,
- org.apache.derby.iapi.jdbc,
- org.apache.derby.iapi.services.cache,
- org.apache.derby.iapi.services.classfile,
- org.apache.derby.iapi.services.compiler,
- org.apache.derby.iapi.services.context,
- org.apache.derby.iapi.services.crypto,
- org.apache.derby.iapi.services.daemon,
- org.apache.derby.iapi.services.diag,
- org.apache.derby.iapi.services.i18n,
- org.apache.derby.iapi.services.info,
- org.apache.derby.iapi.services.io,
- org.apache.derby.iapi.services.loader,
- org.apache.derby.iapi.services.locks,
- org.apache.derby.iapi.services.memory,
- org.apache.derby.iapi.services.monitor,
- org.apache.derby.iapi.services.property,
- org.apache.derby.iapi.services.stream,
- org.apache.derby.iapi.services.timer,
- org.apache.derby.iapi.services.uuid,
- org.apache.derby.iapi.sql,
- org.apache.derby.iapi.sql.compile,
- org.apache.derby.iapi.sql.conn,
- org.apache.derby.iapi.sql.depend,
- org.apache.derby.iapi.sql.dictionary,
- org.apache.derby.iapi.sql.execute,
- org.apache.derby.iapi.store.access,
- org.apache.derby.iapi.store.access.conglomerate,
- org.apache.derby.iapi.store.access.xa,
- org.apache.derby.iapi.store.raw,
- org.apache.derby.iapi.store.raw.data,
- org.apache.derby.iapi.store.raw.log,
- org.apache.derby.iapi.store.raw.xact,
- org.apache.derby.iapi.tools.i18n,
- org.apache.derby.iapi.types,
- org.apache.derby.iapi.util,
- org.apache.derby.impl.db,
- org.apache.derby.impl.io,
- org.apache.derby.impl.jdbc,
- org.apache.derby.impl.jdbc.authentication,
- org.apache.derby.impl.load,
- org.apache.derby.impl.services.bytecode,
- org.apache.derby.impl.services.cache,
- org.apache.derby.impl.services.daemon,
- org.apache.derby.impl.services.jce,
- org.apache.derby.impl.services.locks,
- org.apache.derby.impl.services.monitor,
- org.apache.derby.impl.services.reflect,
- org.apache.derby.impl.services.stream,
- org.apache.derby.impl.services.timer,
- org.apache.derby.impl.services.uuid,
- org.apache.derby.impl.sql,
- org.apache.derby.impl.sql.catalog,
- org.apache.derby.impl.sql.compile,
- org.apache.derby.impl.sql.conn,
- org.apache.derby.impl.sql.depend,
- org.apache.derby.impl.sql.execute,
- org.apache.derby.impl.sql.execute.rts,
- org.apache.derby.impl.store.access,
- org.apache.derby.impl.store.access.btree,
- org.apache.derby.impl.store.access.btree.index,
- org.apache.derby.impl.store.access.conglomerate,
- org.apache.derby.impl.store.access.heap,
- org.apache.derby.impl.store.access.sort,
- org.apache.derby.impl.store.raw,
- org.apache.derby.impl.store.raw.data,
- org.apache.derby.impl.store.raw.log,
- org.apache.derby.impl.store.raw.xact,
- org.apache.derby.impl.tools.sysinfo,
- org.apache.derby.io,
- org.apache.derby.jdbc,
- org.apache.derby.osgi,
- org.apache.derby.shared.common.error,
- org.apache.derby.shared.common.i18n,
- org.apache.derby.tools,
- org.apache.derby.vti,
- org.eclipse.net4j.db.internal.derby;version="0.8.0"
-Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.derby/about.html b/plugins/org.eclipse.net4j.db.derby/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/about.html
+++ /dev/null
@@ -1,28 +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.db.derby/build.properties b/plugins/org.eclipse.net4j.db.derby/build.properties
deleted file mode 100644
index 52384b7539..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               .options,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               plugin.xml,\
-               lib/
diff --git a/plugins/org.eclipse.net4j.db.derby/copyright.txt b/plugins/org.eclipse.net4j.db.derby/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.derby/epl-v10.html b/plugins/org.eclipse.net4j.db.derby/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.derby/lib/LICENSE b/plugins/org.eclipse.net4j.db.derby/lib/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/lib/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/plugins/org.eclipse.net4j.db.derby/lib/NOTICE b/plugins/org.eclipse.net4j.db.derby/lib/NOTICE
deleted file mode 100644
index 563d7af8a1..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/lib/NOTICE
+++ /dev/null
@@ -1,31 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache Derby distribution.       ==
-=========================================================================
-
-Apache Derby
-Copyright 2004-2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of Derby were originally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
-informally known as the "Derby CLA".
-The following copyright notice(s) were affixed to portions of the code
-with which this file is now or was at one time distributed
-and are placed here unaltered.
-
-(C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.
-
-(C) Copyright IBM Corp. 2003. 
-
-The portion of the functionTests under 'nist' was originally 
-developed by the National Institute of Standards and Technology (NIST), 
-an agency of the United States Department of Commerce, and adapted by
-International Business Machines Corporation in accordance with the NIST
-Software Acknowledgment and Redistribution document at
-http://www.itl.nist.gov/div897/ctg/sql_form.htm
-
diff --git a/plugins/org.eclipse.net4j.db.derby/license.html b/plugins/org.eclipse.net4j.db.derby/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.derby/plugin.properties b/plugins/org.eclipse.net4j.db.derby/plugin.properties
deleted file mode 100644
index 546b125168..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j DB Derby (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.db.derby/plugin.xml b/plugins/org.eclipse.net4j.db.derby/plugin.xml
deleted file mode 100644
index a9e4895f86..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/plugin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.net4j.db.dbAdapters">
-      <dbAdapter
-            class="org.eclipse.net4j.db.internal.derby.EmbeddedDerbyAdapter"
-            name="derby-embedded"
-            version="10.3.2.1"/>
-      <dbAdapter
-            class="org.eclipse.net4j.db.internal.derby.ClientDerbyAdapter"
-            name="derby-client"
-            version="10.3.2.1"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/ClientDerbyAdapter.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/ClientDerbyAdapter.java
deleted file mode 100644
index a06242bfc8..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/ClientDerbyAdapter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.internal.derby;
-
-import org.apache.derby.jdbc.ClientDataSource;
-import org.apache.derby.jdbc.ClientDriver;
-
-import javax.sql.DataSource;
-
-import java.sql.Driver;
-
-/**
- * @author Eike Stepper
- */
-public class ClientDerbyAdapter extends DerbyAdapter
-{
-  public static final String NAME = "derby-client";
-
-  public ClientDerbyAdapter()
-  {
-    super(NAME);
-  }
-
-  public Driver getJDBCDriver()
-  {
-    return new ClientDriver();
-  }
-
-  public DataSource createJDBCDataSource()
-  {
-    return new ClientDataSource();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java
deleted file mode 100644
index 4625ce3c2f..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.internal.derby;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.internal.db.DBAdapter;
-import org.eclipse.net4j.internal.db.ddl.DBField;
-
-/**
- * @author Eike Stepper
- */
-public abstract class DerbyAdapter extends DBAdapter
-{
-  public static final String VERSION = "10.3.2.1";
-
-  private static final String[] RESERVED_WORDS = { "ADD", "ALL", "ALLOCATE", "ALTER", "AND", "ANY", "ARE", "AS", "ASC",
-      "ASSERTION", "AT", "AUTHORIZATION", "AVG", "BEGIN", "BETWEEN", "BIGINT", "BIT", "BOOLEAN", "BOTH", "BY", "CALL",
-      "CASCADE", "CASCADED", "CASE", "CAST", "CHAR", "CHARACTER", "CHECK", "CLOSE", "COALESCE", "COLLATE", "COLLATION",
-      "COLUMN", "COMMIT", "CONNECT", "CONNECTION", "CONSTRAINT", "CONSTRAINTS", "CONTINUE", "CONVERT", "CORRESPONDING",
-      "CREATE", "CURRENT", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", "DEALLOCATE",
-      "DEC", "DECIMAL", "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "DELETE", "DESC", "DESCRIBE", "DIAGNOSTICS",
-      "DISCONNECT", "DISTINCT", "DOUBLE", "DROP", "ELSE", "END", "END-EXEC", "ESCAPE", "EXCEPT", "EXCEPTION", "EXEC",
-      "EXECUTE", "EXISTS", "EXPLAIN", "EXTERNAL", "FALSE", "FETCH", "FIRST", "FLOAT", "FOR", "FOREIGN", "FOUND",
-      "FROM", "FULL", "FUNCTION", "GET", "GETCURRENTCONNECTION", "GLOBAL", "GO", "GOTO", "GRANT", "GROUP", "HAVING",
-      "HOUR", "IDENTITY", "IMMEDIATE", "IN", "INDICATOR", "INITIALLY", "INNER", "INOUT", "INPUT", "INSENSITIVE",
-      "INSERT", "INT", "INTEGER", "INTERSECT", "INTO", "IS", "ISOLATION", "JOIN", "KEY", "LAST", "LEFT", "LIKE",
-      "LOWER", "LTRIM", "MATCH", "MAX", "MIN", "MINUTE", "NATIONAL", "NATURAL", "NCHAR", "NVARCHAR", "NEXT", "NO",
-      "NOT", "NULL", "NULLIF", "NUMERIC", "OF", "ON", "ONLY", "OPEN", "OPTION", "OR", "ORDER", "OUTER", "OUTPUT",
-      "OVERLAPS", "PAD", "PARTIAL", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", "PROCEDURE", "PUBLIC",
-      "READ", "REAL", "REFERENCES", "RELATIVE", "RESTRICT", "REVOKE", "RIGHT", "ROLLBACK", "ROWS", "RTRIM", "SCHEMA",
-      "SCROLL", "SECOND", "SELECT", "SESSION_USER", "SET", "SMALLINT", "SOME", "SPACE", "SQL", "SQLCODE", "SQLERROR",
-      "SQLSTATE", "SUBSTR", "SUBSTRING", "SUM", "SYSTEM_USER", "TABLE", "TEMPORARY", "TIMEZONE_HOUR",
-      "TIMEZONE_MINUTE", "TO", "TRANSACTION", "TRANSLATE", "TRANSLATION", "TRIM", "TRUE", "UNION", "UNIQUE", "UNKNOWN",
-      "UPDATE", "UPPER", "USER", "USING", "VALUES", "VARCHAR", "VARYING", "VIEW", "WHENEVER", "WHERE", "WITH", "WORK",
-      "WRITE", "XML", "XMLEXISTS", "XMLPARSE", "XMLQUERY", "XMLSERIALIZE", "YEAR" };
-
-  public DerbyAdapter(String name)
-  {
-    super(name, VERSION);
-  }
-
-  @Override
-  protected String getTypeName(DBField field)
-  {
-    DBType type = field.getType();
-    switch (type)
-    {
-    case TINYINT:
-    case BOOLEAN:
-    case BIT:
-      return "SMALLINT";
-
-    case LONGVARBINARY:
-    case VARBINARY:
-    case BINARY:
-      return "BLOB";
-    }
-
-    return super.getTypeName(field);
-  }
-
-  @Override
-  public void appendValue(StringBuilder builder, IDBField field, Object value)
-  {
-    if (value instanceof Boolean)
-    {
-      value = (Boolean)value ? 1 : 0;
-    }
-
-    super.appendValue(builder, field, value);
-  }
-
-  public String[] getReservedWords()
-  {
-    return RESERVED_WORDS;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/EmbeddedDerbyAdapter.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/EmbeddedDerbyAdapter.java
deleted file mode 100644
index 9d49455a3a..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/EmbeddedDerbyAdapter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.internal.derby;
-
-import org.apache.derby.jdbc.EmbeddedDataSource;
-import org.apache.derby.jdbc.EmbeddedDriver;
-
-import javax.sql.DataSource;
-
-import java.sql.Driver;
-
-/**
- * @author Eike Stepper
- */
-public class EmbeddedDerbyAdapter extends DerbyAdapter
-{
-  public static final String NAME = "derby-embedded";
-
-  public EmbeddedDerbyAdapter()
-  {
-    super(NAME);
-  }
-
-  public Driver getJDBCDriver()
-  {
-    return new EmbeddedDriver();
-  }
-
-  public DataSource createJDBCDataSource()
-  {
-    return new EmbeddedDataSource();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java
deleted file mode 100644
index e7997fa809..0000000000
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.internal.derby.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.db.derby"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_SQL = DEBUG.tracer("sql"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.classpath b/plugins/org.eclipse.net4j.db.hsqldb/.classpath
deleted file mode 100644
index c6fb0e5c84..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/.classpath
+++ /dev/null
@@ -1,8 +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 exported="true" kind="lib" path="lib/hsqldb.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.cvsignore b/plugins/org.eclipse.net4j.db.hsqldb/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.options b/plugins/org.eclipse.net4j.db.hsqldb/.options
deleted file mode 100644
index 9a0c12b92c..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/.options
+++ /dev/null
@@ -1,4 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.db.hsqldb/debug = true
-org.eclipse.net4j.db.hsqldb/debug.sql = true
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.project b/plugins/org.eclipse.net4j.db.hsqldb/.project
deleted file mode 100644
index 1d91938957..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.db.hsqldb</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 141436d517..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:43:21 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c5dfbc3288..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:43:21 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
deleted file mode 100644
index b526e78fb9..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.db.hsqldb;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ClassPath: .,
- lib/hsqldb.jar
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db;bundle-version="0.8.0";visibility:=reexport
-Export-Package: org.eclipse.net4j.db.hsqldb;version="0.8.0",
- org.eclipse.net4j.db.internal.hsqldb;version="0.8.0",
- org.hsqldb,
- org.hsqldb.index,
- org.hsqldb.jdbc,
- org.hsqldb.lib,
- org.hsqldb.lib.java,
- org.hsqldb.persist,
- org.hsqldb.resources,
- org.hsqldb.rowio,
- org.hsqldb.scriptio,
- org.hsqldb.store,
- org.hsqldb.types,
- org.hsqldb.util
-Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/about.html b/plugins/org.eclipse.net4j.db.hsqldb/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/about.html
+++ /dev/null
@@ -1,28 +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.db.hsqldb/build.properties b/plugins/org.eclipse.net4j.db.hsqldb/build.properties
deleted file mode 100644
index 514e156d39..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               .options,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               plugin.xml,\
-               lib/,\
-               lib/hsqldb.jar
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/copyright.txt b/plugins/org.eclipse.net4j.db.hsqldb/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/epl-v10.html b/plugins/org.eclipse.net4j.db.hsqldb/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/.cvsignore b/plugins/org.eclipse.net4j.db.hsqldb/lib/.cvsignore
deleted file mode 100644
index d392f0e82c..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_2.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_2.txt
deleted file mode 100644
index 453d63ab32..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_2.txt
+++ /dev/null
@@ -1,813 +0,0 @@
-Chronological Change List
-
-This file is the accumulated list of changes in the course of development of
-hsqldb 1.7.2 in reverse chronological order. A list of changes by subject 
-area is in changelog_1_7_2.txt.
-
-Fred Toussi (fredt@users.sourceforge.net)
-
-2004.12.24 UPDATED RELEASE 1.7.2.11
-
-Fixed NPE error when functions in subqueries.
-Added support for STDDEV_POP, STDDEV_SAMP, VAR_POP, VAR_SAMP, EVERY and SOME set functions.
-Fixed potential issues with logging DELETE statements for tables with multi-key primary keys.
-
-2004.12.05 UPDATED RELEASE 1.7.2.10
-
-Fixed minor type conversion bugs.
-Fixed JDK 1.1 compile issue
-Fixed minor bug relating to server thread startup
-
-2004.11.25 UPDATED RELEASE 1.7.2.8
-
-Fixed bug LIMIT and TOP with UNION
-Fixed bug running Database Manager as applet
-Enhancement to allow a table with a label used in DELETE and UPDATE
-Enhancement to reduce memory use when restoring long log with too many connections
-Enhancement to persist values set by SET LOGSIZE
-Minor internal enhancements and refactoring
-
-2004.10.28 UPDATED RELEASE 1.7.2.7
-
-Fixed new bug with TEXT TABLES without primary key
-
-2004.10.25 UPDATED RELEASE 1.7.2.6
-
-Fixed new bug with DATETIME literal default values
-
-2004.10.22 UPDATED RELEASE 1.7.2.5
-
-Fixed bugs OUTER support.
-Fixed bug that resulted in slowdown when JDBC metadata calls are called many times.
-Fixed bug related to Statement.setMaxRows(int). The maximum row count will no
-longer apply to result sets returned and used internally.
-Fixed bug to allow ResultSetMetaData methods to be used inside stored procedures.
-Fixed bugs related to some OUTER queries.
-Performance improvements to some operations on CACHED tables.
-Improved compatibility with older database files, allowing old style DEFAULT
-clauses to compile.
-Improvements to startup after a machine crash. The .log file is now read only
-until the first malformed line.
-Corrections to build scripts and #idfef blocks to allow jars to be compiled to
-run under JDK 1.1.
- 
-
-2004.08.26 UPDATED RELEASE 1.7.2.4
-
-Fixed bug in data file enlargement.
-Fixed bug where temp tables were removed after another connection closed.
-
-2004.08.12 UPDATED RELEASE 1.7.2.3
-
-Fixed bug preventing the use of hsqldb.files_read_only property
-Minor enhancements allowing use of SELECT ALL and COUNT(ALL colname) etc.
-Corrections to the documentation
-
-2004.07.25 UPDATED RELEASE 1.7.2.2
-
-Fixed bug that prevented ALTER TABLE ADD FOREIGH KEY, ADD UNIQUE and ADD CHECK
-(unnamed constraints) from executing.
-
-Fixed excessive logging of SEQUENCE values.
-
-
-2004.07.20 UPDATED RELEASE 1.7.2.1
-
-Fixed bug where a foreign key with ON DELETE CASCADE action on a table masked
-other foreign keys on the table and resulted in completion of the 
-cascading action when referential integrity was violated.
-
-2004.07.15 RC_6e INITIAL RELEASE 1.7.2
-
-Enhancements to ALTER TABLE ADD COLUMN and DROP COLUMN.
-Fixed bug with closed HTTP connections.
-Fixed bug with large .data files switching to random access from nio. 
-
-2004.06.28 RC_6d
-
-The implemntation of UNION, EXCEPT and INTERSECT set operations has been 
-rewritten to comply with SQL standards.
-When multiple set operations are present in a query, they are now evaluated
-from left to right, with INTERSECT taking precedence over the rest.
-It is now possible to use parentheses around multiple (or single) select
-statements with set operations to change the order of evalation.E.g.:
-
-((SELECT * FROM A EXCEPT SELECT * FROM B) INTERSECT SELECT * FROM D UNION SELECT * FROM E)
-
-Timestamp, date and time values in TEXT TABLE source files are treated more
-leniently, allowing spaces before values.   
-
-2004.06.19 RC_6c 
-
-Fixed bug in default value definition.
-Fixed bug in getURL() for internal connections
-Fixed bug in evaluation of BOOLEAN values
-Fixed bug in Statement.executeBatch()
-Improvements in CHECKPIONT DEFRAG
-Improvements in nio .data file handling
-Added a procedural language to SqlTool.  Made error handling and control more
-robust.  Implemented several new features.
-Updated documentation
-
-2004.05.31 RC_6b
-
-Fixed CHECKPOINT DEFRAG bug with empty tables
-Fixed ORDER BY with HAVING
-Fixed SELECT .. INTO table issue with outer joins etc.
-Fixed issue with NOT used in WHERE clause of OUTER select
-Fixed issue with DAYOFWEEK() etc. library calls with NULL parameter
-Fixes for TRIGGER thread termination
-Fixes for minor bugs
-Updated documentation
-
-2004.05.18 RC_6a
-
-Fix for two bugs, some doc updates, etc.
-
-2004.05.17 RC_6
-Final Release Candidate
-
-This is the final release candidate for 1.7.2.
-
-More tests are required to verify the improvements. Please perform tests and 
-report any issues. Testers are needed for build scripts with different JVM's 
-using both ANT and batch builds.
-
-Documentation has been updated and is available in HTML and PDF formats.
-
-More bug fixes to engine and JDBC classes.
-
-Bug fixes and minor enhancements to Database Manager and Transfer tools.
-
-Database Manager Swing table view is sortable.
-
-Fixed bug with different values in one row with multiple CURRENT_TIMESTAMP or
-NOW() calls.
-
-Introduction of CURRENT_USER, can be used as column default value as well.
-
-CURRENT_TIMESTAMP, NOW, TODAY etc. should not be quoted when used as column
-default values.
-
-Improvements to PreparedStatement set stream methods.
-
-Improvements to Clob and Blob implementations.
-
-Much of the UNIX init script redesigned.  Now supports TLS and WebServer.
-
-2004.05.01
-
-Small improvements in different areas
-
-CURRENT_TIME, CURRENT_DATE, CURRENT_TIMESTAMP and their aliases can now
-be used in views and prepared statements.
-
-Some bug fixes and updates to utility programs. 
-
-Improvements to cascading update operations, allowing full capability with
-FK's referencing the same table.
-Improved parametric INSERT .... SELECT.
-CHECKPOINT DEFRAG now works with nio mode .data files.
-DATEDIFF function has been added.
-
-
-2004.04.01 RC_5
-
-Some bug fixes.
-
-2004.03.22 RC_4
-
-Included hsqldb.jar has been compiled with JDK 1.4 and will not work with JRE 1.3.x or
-earlier. Please recompile with JDK 1.3 for use with this or earlier JDK's.
-
-Improvements to ALTER TABLE when VIEWS reference the table
-Enhancements to Server
-
-Bug fixes for: 
-BIGINT values in IN predicate value lists.
-Creation of self ref foreign keys.
-Corrupted log file with SET AUTOCOMMIT
-SET LOGSIZE
- 
-
-Bug fixes for LIKE with default local and ALTER TABLE with CHECK
-
-2004.03.13 RC_3
-
-Various bug fixes.
-
-
-2004.02.22 RC_2
-
-Release Candidate 2 for HSQLDB version 1.7.2 includes almost all of the features of the release
-version. It is possible that by the time of the release, a small number of minor features will
-be added or changed.
-
-One area that is likely to change is the SQL_STATE values for errors returned by
-JDBC.
-
-Changes since RC_1
-
-Constraint names must be unique within each database.
-
-Refactoring groups of classes into new packages. This change is internal and does not affect the
-use of hsqldb.
-
-New SqlTool and SqlFile utilities by Blaine Simpson. See hsqlSqlTool.html for details.
-
-Support for new system tables for constraints, views and sequences.
-
-Support for increments in GENERATED BY DEFAULT AS IDENTITY(START WITH <n>, INCREMENT BY <m>>)
-
-Support for table aliases in UPDATE
-
-BOOLEAN is now the default SQL type for boolean values. BIT is treated as an alias
-for BOOLEAN in table definition and queries.
-
-Library function CURTIME() changed to return CURRENT_TIME instead of CURRENT_TIMESTAMP
-
-Added logging for sequence generation
-
-Bug Fixes since RC_1
-
-Values for BOOLEAN expressions containing AND, OR, LIKE and used in columns
-returned by queries are now correct.
-
-Fixed issue with single value selects in UPDATE and SELECT statements.
-
-Fixed issue with Turkish Locale.
-
-Fixed issue with compiled statements.
-
-Added mutable object cloning and serialization on PrepredStatement parameter entry points
-for in-process connections. Isolates the stored objects (DATETIME, BINARY and OTHER) from
-subsequent changes made to the copy used for setting the parameter. To do same for Result.
-
-More extensive error message when internal asserts fail.
-
-Various other bug fixes.
-
-
-2003.12.28 RC_1
-
-Release Candidate 1 for HSQLDB version 1.7.2 includes most of the features of the release
-version. It is likely that by the time of the release, a small number of features will
-be added to the engine.
-
-One area that is likely to change is the SQL_STATE values for errors returned by
-JDBC.
-
-Changes since ALPHA_T
-
-
-Added referential integrity checks when a foreign key is added
-to a populated table.
-
-support for SQL style SEQUENCE objects.
-
-support for DROP INDEX <IDX> IF EXISTS
-
-Changes to SET PROPERTY command with better error checking.
-
-Added support for LIMIT ? ? and TOP ? (prepared statement)
-
-Fixed reported bugs including order by with UNION.
-
-Added support for aggregate functions in CASEWHEN, IFNULL, etc.
-
-Added support for aggregate functions as arguments to non-aggregate functions.
-
-Views and subqueries can appear in a view definition.
-
-
-2003.10.26
-
-HSQLDB 1.7.2 ALPHA_T
-
-Improved index use for multiple key joins.
-
-2003.10.24
-
-Fixed some reported and unreported bugs.
-
-View definitions can now have a column name list:
-
-CREATE VIEW <viewname> [(<colnmae>, ...)] AS SELECT ....
-
-
-2003.10.21
-
-HSQLDB 1.7.2 ALPHA_S
-
-Fixed name resolution issues in some IN (SELECT ...) and EXISTS (SELECT ...)
-queries. Optimisation of these queries when not correlated.
-
-Speed optimisation of joins with views and subqueries.
-
-Fixed LIKE parameter bug.
-
-Support for CHECK constraints that apply to the modified/inserted row only.
-This can be added via ALTER TABLE ADD CHECK() or in table definition.
-
-Fixed the DATETIME normalisation issues.
-Fixed ResultSet.isAfterLast() issue.
-
-Reverted column name case in ResultSet methods to JDBC compliance.
-
-
-2003.10.12
-
-HSQLDB 1.7.2 ALPHA_R
-
-This release features full support for prepared statements with parameters, including
-those in IN lists.
-
-Query processing has been extensively enhanced in this release and better standards
-compliance has been achieved. Major implications of the recent changes are as follows:
-
-- Columns in correlated subqueries are resolved independently first. If there is an
-unresolved column, then the surrounding context is used to resolve it. This is 
-opposite the resolution order previously enforced in the engine.
-
-- Some ambiguities and errors in ORDER BY clauses are now caught.
-
-- UNION and other set queries accept only one ORDER BY clause at the end. In this
-clause, only column indexes are allowed as sort specification e.g.:
-
-SELECT .. UNION SELECT .. ORDER BY 1 DESC, 5, 3
-
-- Outer join conditions can now include most comparison operators, as well as OR
-logical operators , e.g
-
-LEFT OUTER JOIN atable ON a=b AND c>d OR a=2 ...
-
-Illegal forward table references are no longer allowed in join conditions.
-
-There are many other small improvements and fixes, including:
-
-- IN value lists can now contain column values or expressions. See TestSelfQueries.txt
-for an example.
-
-- LIKE has been optimised when possible.
-
-- COALESCE() can now take several arguments
-
-
-2003.09.24
-
-HSQLDB 1.7.2 ALPHA_Q
-
-The problem with PreparedStatement parameters in IN lists still remains to be fixed.
-
-This release includes some bug fixes and improvements. In the /doc directory
-there is a new how-to document on using HSQLDB in OpenOffice.org.
-
-
-HSQLDB 1.7.2 ALPHA_P
-
-Apart from the bugs and limitations of PreparedStatement, all the bugs reported since
-the release of ALPHA_O have been fixed in this alpha version. Some minor enhancements
-have been made to increase compatibility with OpenOffice.org applications.
-
-In addition, it is now possible to execute triggers in the main execution thread.
-This allows uses for triggers that were not possible before.
-
-
-HSQLDB 1.7.2 ALPHA_O
-
-Due to the large number of small bug fixes since the release of ALPHA_N,
-a new ALPHA_0 version is now released. 
-
-Please see the bug tracker for a list of some of the bugs that have been fixed.
-This version does not yet support prepared statements with IN(?,?) parameters.
-
-Please report any bugs or suggestions through the normal channels. Bugs with test
-cases should be posted to the bug tracker on the HSQLDB Sourceforge site.
-
-A new JDBC connection property "toupper_column_name" can be used when the application
-program submits lowercase / mixedcase column names to Result.getXXX(String column)
-methods when the names are in fact UPPERCASE as they were not quoted when the
-table was created. The default value is false. See related documentation in
-hsqldbAdvancedGuide.html on how to set this property value. (this property was 
-subsequently dropped)
-
-The rest of the information for ALPHA_N below applies to this version too.
-
-
-HSQLDB 1.7.2 ALPHA_N
-
-ALPHA_N is the ultimate ALPHA version for the 1.7.2 release cycle. Known
-deficiencies and reported bugs will be addressed for the first Release Candidate
-to be issued in the next few weeks.
-
-Please report any bugs or suggestions through the normal channels. Bugs with test
-cases should be posted to the bug tracker on the HSQLDB Sourceforge site.
-
-The included documentation has been updated. The JavaDoc for the jdbcXXX classes
-covers the JDBC interface. You can make the JavaDoc via the build scripts.
-
-The jar has been compiled with JDK 1.4. To run under earlier JDK's recompile using
-JDK 1.3.x.
-
-Changes since 1.7.2 are listed here in the reverse chronological order.
-
-2003.09.02
-
-ADDED JDBC SUPPORT FOR SAVPOINTS
-
-2003.08.22
-
-FURTHER SPEED IMPROVEMENTS IN ALL LOGGED MODES
-INSERT and UPDATE ops are faster by 5-20% in MEMORY tables, less in CACHED tables.
-
-
-ADDED SUPPORT FOR A RANGE OF SQL STYLE FUNCTIONS:
-
-CASE .. WHEN ... THEN .. ELSE ... END
-CASE WHEN .. THEN .. ELSE ... END
-NULLIF(.. , ..)
-SUBSTRING(.. FROM .. FOR ..)
-POSITION(.. IN ..)
-TRIM( {LEADING | TRAILING .. } FROM ..)
-EXTRACT({DAY | TIME |..} FROM ..)
-COALESCE(.. , ..)
-
-
-2003.08.17
-
-FURTHER IMPROVEMENTS IN PREPARED STATEMENT EXECUTION SPEED
-
-SUPPORT FOR JDBC BATCH EXECUTION
-
-SUPPORT FOR MULTIPLE ROWS WITH NULL FIELDS UNDER UNIQUE CONSTRAINTS
-
-IMPROVEMENTS TO TestSelf
-
-IMPROVEMENTS TO ON UPDATE CASCADE / SET DEFAULT / SET NULL
-
-2003.08.11
-
-REWRITE OF LEFT OUTER JOIN SUPPORT
-
-- Complete rewrite of join processing abolishes the requirement for 
-an index on any joined columns. All expressions with AND are supported
-in the join condition (JOIN atable ON ....)
-
-IMPROVEMENTS TO ON DELETE CASCADE / SET DEFAULT / SET NULL
-
-- Self referencing foreign keys and multiple foreign keys now support
-ON DELETE CASCADE.
-
-2003.08.02
-
-NIO ACCESS FOR .data FILES
-
-New nio access layer for .data files speeds up most CACHED TABLE related
-operations very significantly. 90% speedups in TestCacheSize tests
-have been observed. The program must be compiled with JDK 1.4 and run
-in a 1.4 JRE to use the new access mode.
-
-IMPROVEMENTS TO UPDATE AND INSERT
-
-Certain types of UPDATES and INSERTS that previously failed due to
-blanket application of UNIQUE constraints now work.
-
-Examples include UPDATE ... SET col = col + 1 where col is an identity
-column or INSERT a self referencing row under FOREIGN key constraints.
-
-2003.07.30
-
-IMPORTANT FIX IN SELECT QUERY PROCESSING
-
-Problems with OUTER and INNER joins returning incorrect results 
-have been reported over the last couple of years. A new fix is 
-intended to ensure correct results in all cases.
-
-- When two tables are joined, rows resulting from joining null
-values in the joined columns are no longer returned.
-
-- Use of OUTER requires the existence of an index on a joined OUTER column
-- There are still limitations on the conditions used in OUTER joins.
-
-AGGREGATES
-
-- enhancements to aggregate functions: aggregates of different numeric
-types are now supported
-
-SUM returns a BIGINT for TINYINT, SMALLINT and INTEGER columns. It
-returns a DECIMAL for BIGINT columns (scale 0) and DECIMAL columns 
-scale equals to that of the column).
-
-AVG returns the same type as the column or the expression in its 
-argument.
-
-- aggregates with GROUP BY do not return any rows if table is empty
-
-OLDER ENHANCEMENTS NOT PREVIOUSLY REPORTED
-
-- IDENTITY columns can now be of BIGINT type:
-
-CREATE TABLE <name> (<column> BIGINT IDENTITY, ...)
-
-- With contributed patch, TEXT TABLES encoding of the source file can
-now be specified. UTF-8 and other encodings can be used.
-
-- Two new options for databases: files_readonly and files_in_jar
-were added based on submitted patches.
-
-FILE READ-ONLY
-
-If the property files_readonly=true is set in the database 
-.properties file, no attempt is made to write the changes to data to
-file. Default, memory tables can be read/write but TEXT and CACHED
-tables are treated as read-only.
-
-FILES IN JAR
-
-This option allows database files to be distributed in the 
-application jar. We have changed the original contribution so
-that a special URL is used for this mode in the form of:
-
-jdbc:hsqldb:res:<path in jar>
-
-The URL type 'res' determines that the path that follows is a path
-into the JAR.
-
-The database can be readonly or files_readonly, depending on the
-value set in .properties file.
-
-2003.07.09
-
-SCRIPT FORMAT
-
-- change to command previously named SET LOGTYPE (discussed below for
-earlier alphas) new form is:
-SET SCRIPTFORMAT {TEXT | BINARY | COMPRESSED }
-
-The new binary and compressed formats are not compatible with previous
-ones, so you should change any old 1.7.2 ALPHA_? database to text
-mode with SET LOGTYPE 0 before opening with the new version.
-
-'OTHER' DATA TYPE
-
-- change to handling of OTHER columns. It is no longer required that
-the classes for objects stored in OTHER columns to be available on
-the path of an HSQLDB engine running as a server. Classes must be
-available on the JDBC client's path.
-
-OBJECT POOLING
-
-- the new Object pool has been incorporated. This reduces memory
-usage to varying degrees depending on the contents of database
-tables and speeds up the database in most cases. Currently the
-size of the pool is hard-coded but it will be user adjustable in the
-release version.
-
-CONNECTION PROPERTY
-
-- a new property, ifexists={true|false} can be specified for connections.
-It has an effect only on connections to in-process databases. The default
-is false and corresponds to current behaviour. 
-
-If set true, the connection is opened only if
-the database files have already been created -- otherwise no new database
-is created and the connection attempt will fail. Example:
-
-jdbc:hsqldb:hsql:mydb;ifexists=true
-
-This property is intended to reduce problems resulting from wrong URL's 
-which get translated to unintended new database files. It is recommended
-to use this property for troubleshooting.
-
-2003.07.04
-
-PREPARED STATEMENTS
-
-- support for real PreparedStatements - major speedup. Current limitations
-include lack of support for parameters in IN() predicates of queries.
-
-TRANSACTIONS VIA WEB SERVER
-
-- uniform support for transactions via HSQL and HTTP (WebServer and Servlet)
-protocols
-
-MULTIPLE IN-MEMORY AND SERVERS DATABASES
-
-- support for multiple memory-only databases within the same JVM
-
-- support for simultaneous multiple servers, multiple internal
-connections and multiple databases within the same JVM
-
-
-NEW CONVENTIONS FOR URL'S AND .properties FILES
-
-Each HSQLDB server or webserver can now serve up to 10 different databases.
-
-The server.properties and webserver.properties method for defining the
-databases has changed. The following properties should be used:
-
-server.database.0   path_of_the_first_database
-server.dbname.0 alias_for_the_first_database
-
-Up to 10 databases can be defined but they must start from 0 
-
-The same applies to command line arguments for Server and WebServer.
-
-The urls for connecting to servers should have the alias of the database
-at the end.
-
-For example, to connect to the HSQL protocol server on the localhost use:
-
-jdbc:hsqldb:hsql://localhost/alias_for_the_database
-
-where alias_for_the_database is the same string as defined in
-server.properties as server.dbnam.n
-
-The default for server.dbname.0 is "" (empty string) so that
-old URL types continue to work.
-
-Multiple memory-only database are supported by the use of:
-
-jdbc:hsqldb:mem:alias_for_the_first_database
-jdbc:hsqldb:mem:alias_for_the_second_database
-
-Examples: jdbc:hsqldb:mem:db1 jdbc:hsqldb:mem:mydb
-
-The conneciton type, 'file', can be used for file database
-connections. example below:
-
-jdbc:hsqldb:hsql:file:mydb;ifexists=true
-
-
-The URL for connecting to a Servlet HTTP server must have a 
-forward-slash at the end. Servlet serves only one database.
-
-jdbc:hsqldb:hsql://localhost:8080/servlet/HsqlServlet/
-
-
-
-2003.03.10
-
-DATABASE METADATA
-
--system table support and java.sql.DatabaseMetadate results have been
-overhauled by Campbell.
-
-STRICT FOREIGN KEYS
-
--strict treatment of foreign key index requirements is now enforced.
-A foreign key declaration _requires_ a unique constraint or index to exist
-on the columns of the referenced table. This applies both to old and
-new databases. Duplicate foreign keys (with exactly the same column sets)
-are now disallowed.
-
-TEXT TABLES
-
--further improvements to TEXT table support. Smaller cache sizes are
-now the default and the default properties can be specified in the 
-*.properties file.
-
-
-
-HSQLDB 1.7.2 ALPHA_M
-
-2003.01.23
-
--fixed reported bugs in SHUTDOWN COMPACT
--fixed reported bugs in GRANT statements on system tables
--fixed bug that prevented UPDATE in some circumstances
-
-some enhancements that appeared in previous versions but not reported:
-
--enhanced handling of DATE objects - comparability and normalisation
--support for CLOB methods in ResultSet
--fixed bug in afterLast() followed by previous() in ResultSet
-
-
-HSQLDB 1.7.2 ALPHA_L
-
-2003.01.16
-
-various patches and fixes
-
--fixes new issues reported with ALPHA_K
--fixes old issues related to uncommitted transactions in
-abnormal shutdown
--fixes old issues with SAVEPOINT names
--enhanced TEXT table handling and reporting of errors in
-CSV (source) files
-
-
-HSQLDB 1.7.2 ALPHA_K
-
-2003.01.10
-
-various patches and fixes
-
--OUTER with multiple column joins is now supported while OR is
-disallowed in the join expression. It is now possible to specify
-a range or equality condition on the OUTER columns returned.
-
--submitted patch for exclusion of NULL values from results of
-range queries has been applied. e.g. 
-WHERE columnvalue < 3
-will exclude from the result all rows with NULL in columnvalue.
-
--a number of small enhancements and bug fixes.
-
-further enhancements to logging. 
--The *.script file now contains only the DDL and data that is 
-written at CHECKPOINT or SHUTDOWN.
-The statements logged while the engine is running are stored
-in a *.log file.
--The format of the *.script file can now be one of TEXT,
-BINARY or COMPRESSED. The SET LOGTYPE {0|1|3} will reset the 
-format. A checkpoint is performed at this point if the format
-is different from the existing one.
-The COMPRESSED format has the side benefit of hiding the DDL
-and the admin password.
--The behaviour of SET WRITE_DELAY has changed with the
-introduction of the sync() method to force the log to be
-written out completely to disk at given intervals.
-SET WRITE_DELAY {TRUE | FALSE} is interpreted as synch every
-60 seconds or 1 second. SET WRITE_DELAY <n> where n is an integer
-is interpreted as synch every n seconds. The current default is
-60 seconds which seems to provide the right balance. The
-performance impact of SET WRITE_DELAY 1 is probably about 15% over that
-of SET WRITE_DELAY 300.
-
--The recovery from crash has been modified so that any line in the log
-that is not properly written (and causes an error) ends the redo process.
-A message is reported to the user, instead of stopping engine operation.
-
-HSQLDB 1.7.2 ALPHA_J
-
-2002.12.24
-CVS hsqldb-dev module tag: HSQLDB_1_7_2_ALPHA_J
-
--More work on text tables. See hsqlTextTables.html.
--Some refactoring of Table.java and Parser.java
-
-
-HSQLDB 1.7.2 ALPHA_I
-
-2002.12.16
-CVS hsqldb-dev module tag: HSQLDB_1_7_2_ALPHA_I
-
-More work on core classes to consolidate previous changes
--correction of reported bug with text tables and primary keys
--reducing data file writes esp. with big rows
--preventing Cache related error in ON DELETE CASCADE 
-
-
-HSQLDB 1.7.2 ALPHA_H
-
-2002.12.11
-CVS hsqldb-dev module tag: HSQLDB_1_7_2_ALPHA_H
-
-
-Reduction in JDK / JRE dependencies (see readmebuild.txt)
-Extensive refactoring of some of the larger classes.
-More changes to core classes Node, Row, Index, Cache, Log ...
-Some minor bug fixes and enhancements.
-Enhancements to text table support, including binary columns.
-Bug fixes to User.java and UserManager.java.
-Support for ON UPDATE / DELETE SET NULL / SET DEFAULT
-SSL support for Server mode operation.
-
-2002.10.30
-
-HSQLDB 1.7.2 ALPHA_G
-
-CVS hsqldb-dev module tag: HEAD data: 2002.10.30
-
-New features include:
-
-Tony Lai's enhancements to aggratates and support for HAVING.
-
-Tony's new UnifiedTable class (provisional name) which he kindly wrote
-at my request and provides sorted arrays with minimal storage
-requirements.
-
-My refactoring work on DatabaseRowInput/Output subclasses and Cache.java.
-
-This is still ongoing and has several features aimed at a more robust 
-database engine, including:
-- reduction in object creation;
-- possibility of resizing the cache while the engine is running;
-- possibility of exporting and backing up the DB files while the engine is
-  running.
-
-I have implemented the new feature, CHECKPOINT DEFRAG to defragment a
-*.data file without shutting down the engine, in two different versions,
-taking advantage of the above improvements.
-
-I have implemented binary logging of MEMORY table inserts in the *.script 
-file, resulting in much smaller startup and shutdown times with large 
-memory tables. Use SET LOGTYPE {0|1} to set the log type to text (0) or
-binary (1). This performs a checkpoint if the type needs changing.
-
-Also further performance optimisations resulting in faster CACHED table
-operations have been made.
-
-Sebastian has implemented ON UPDATE CASCADE support for foreign keys.
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_3.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_3.txt
deleted file mode 100644
index 7c91d928b2..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_7_3.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Chronological Change List
-
-This file is the accumulated list of changes in the course of development of
-hsqldb 1.7.3 in reverse chronological order.
-
-Fred Toussi (fredt@users.sourceforge.net)
-
-2004.02.23 1.7.3.4
-
-Fixed NPE when defining self referencing FK's with no primary key
-
-2004.02.07 1.7.3.3
-
-Fixed bug with loggin of deletes / updates from tables without primary keys. If the a row
-from such tables contained a null value and was deleted / updated, the operation was not 
-logged correctly. Subsequently, if there was an abnormal termination after such changes and
-the database was restarted, the logged delete statement would not have any effect and result
-in duplicate rows. This bug did not affect tables with primary keys or the normal operation
-(without abnormal termination) of other tables.
-
-
-2004.01.31 1.7.3.2
-
-Allow conversion from BIGINT to SAMMLINT and TYNYINT (all other legal conversions worked fine)
-Fixed issue with null values in calls to ResultSet methods with a Calendar
-argument.
-Enhancement to allow INSERT INTO <T> SELECT (....) where no column list
-list for the table T is specified.
-
-2004.12.24 1.7.3.1
-
-Corrected scripting of CHECK constraints with NOT NULL and IS NULL
-Fixed NPE error when functions in subqueries.
-Added support for STDDEV_POP, STDDEV_SAMP, VAR_POP, VAR_SAMP, EVERY and SOME set functions.
-Fixed potential issues with logging DELETE statements for tables with multi-key primary keys.
-
-Apart from the BOOLEAN type, 1.7.3.1 is identical to 1.7.2.11
-
-2004.12.05 First release 1.7.3.0
-
-Changed handling of the BOOLEAN type to allow the undefined state.
-This involves changes to the behariour of NOT and NULL, and also CHECK conditions,
-regarding NULL values.
-
-In all other respects, 1.7.3.0 is identical to 1.7.2.10
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_8_0.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_8_0.txt
deleted file mode 100644
index 439190022f..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelist_1_8_0.txt
+++ /dev/null
@@ -1,529 +0,0 @@
-Chronological Change List
-
-This file is the accumulated list of changes in the course of development of
-hsqldb 1.8.0, including point releases, in reverse chronological order.
-
-Fred Toussi (fredt@users.sourceforge.net)
-Maintainer, HSQLDB Project
-
-2007.09.06  1.8.0.8.1
-
-Fixed regression that impacted performance of system table selects and JDBC 
-DatabaseMetaData calls that use system tables.
-
-2007.08.28  1.8.0.8
-
-Fixed issue with some text table sources.
-Fixed issue caused after adding columns to tables used in certain view definitions
-Added sych call before closing .script files.
-Minor bug fixes
-
-New implementation of HsqlTimer to allow proper database shutdown while used 
-within an application server or similar.
-
-Improvements in TEXT TABLE source file handling. If source file is unavailable at
-startup, the source specification is retained but its usage is turned off.
-An SQL warning is added to the first session in the event.
-Added SET TABLE <tablename> SOURCE {ON | OFF} enables/disables the usage of the
-source file.
-
-Some relaxation of use of LIMIT in subqueries
-
-Improvements to SqlTool and DatabaseManager tools by Blaine Simpson.
-
-2006.09.27  1.8.0.7
-
-Fixed regression in 1.8.0.6 that prevented reuse of empty spaces in the .data file.
-Fixed regression that prevented setting the textdb.allow_full_path property
-
-2006.09.22  1.8.0.6
-
-Fixed issue where missing dbname.0 in server properties files was not ignored
-Fixed issue where a crash during logging of an update query may result in
-incomplete logging and recovery
-Fixed issue where a PK defined after another constraint would result in wrong
-constraint name
-Fixed issue with incorrect evaluation of null values in CASE WHEN in certain cases
-Fixed issue where ResultSet column class names were misreported for functions
-returning primitive types
-
-2006.07.27 1.8.0.5
-
-(3 fixed issues affecting durability)
-Fixed serious reported issue in some JVM's zip libraries by adding a workaround.
-Fixed serious issue when cache_scale and cache_size_scale are small but very 
-large rows are inserted in cached tables.
-Fixed bug where an automatic rollback of an UPDATE statement was not logged.
-
-Fixed bug with nested JDBC escapes.
-Fixed bug with logging of schema definition.
-Fixed bug where DROP TABLE was allowed even when a view used the table.
-Fixed bug where DISTINCT together with some GROUP BY lists were not allowed.
-Fixed bug where Server.shutdown() threw spurious NPE.
-
-Improved .data file persistence classes with better errror logging.
- 
-Improved client/server retrieval speed of large result sets.
-Column declarations of TIME(0) are now accepted.
-Named parameter in the form of :name are allowed in prepared statements.
-
-2006.04.16 1.8.0.4
-
-General improvements to all utilities, including SQLTool, DatabaseManager, etc.
-General improvements to build.xml.
-Improvement to fail-safe persistence by saving the .properties file first as a 
-new file, before renaming.
-Fixed bugs with text tables that use quoted source files and have a heading row.
-Fixed bug which prevented dropping a column before an indexed column.
-Fixed bug where DISTINCT was not allowed with SQL functions (BT 1400344)
-Fixed bug where PreparedStatement calls were allowed with some unbound variable
-(Bug Tracker 1399324) but commented out to allow compatibility with earlier 
-versions (see org.hsqldb.jdbc.jdbcPreparedStatement).
-VARCHAR_IGNORECASE size specification is now enforeced.
-Fixed bugs where ORDER BY did not work in some cases (BT 1383218, BT 1344895).
-Fixed bug where IFNULL was used with a function (BT 1315834).
-Fixed bug where creation of a new table was not allowed if the old table with
-the same name had been renamed.
-Fixed bug where SYSTEM_INDEXINFO could not be read.
-Fixed bug to allow running with JDK 1.1 when compiled for this target.
-Fixed bug with COALESCE, et containing an aggregate function (BT 1242448).
-
-Fixed bug with ResultSet.getTimestamp(int, Clandar).
-Fixed bug with access non-admin access to tables was allowed when using 
-PreparedStatement objects.
-Added org.hsqldb.Library function, getDatabaseFullProductVersion to return the 
-full version string, including the 4th digit (e.g 1.8.0.4).
-
-2006.01.08
-
-Fixed bug in WebServer
-Added support for remote startup of databases in Server and WebServer
-
-2005.12.22
-
-Fixed bug where ON DELETE SET DEFAULT was accepted without a matching DEFAULT value
-Fixed bug where column renaming was allowed in tables accessed in views
-Fixed bug where TRUE or FALSE is used as search condition as WHERE .. AND FALSE
-Fixed bug where dropping TEMPORARY tables was not logged
-Fixed bug where negative values for IDENTITY columns were treated as positive
-
-
-2005.11.02 1.8.0.3
-
-Bug fixes
-
-Fixed bug with tables formed with SELECT .. INTO that did not allow creation of indexes
-Fixed bug with scripting of some VIEW definitions with quoted column names
-Fixed bug in generation of some system tables with multi schema databases
-Fixed bug with access to network result set data when UNION with different column
-types is used
-Fixed bug with scripting of some TIMESTAMP values
-
-2005.08.18 1.8.0.2
-
-Bug fixes and enhancements:
-
-Fixed bugs with GLOBAL TEMPORARY tables with PRESERVE ROWS or 
-DELETE ROWS options.
-Fixed bug with DESC ignored in ORDER BY when a correlation name was used to 
-specify the column.
-Fixed ResultSet.getTimestamp() and PreparedStatement.setTimestam() bug with null
-timestamp parameters.
-Enhancement to allow string contatenation in LIKE predicates.
-Fixed two JDK 1.1.x incompatibilities.
-Fixed issue with some SET TABLE <name> SOURCE <source> command.
-Fixed issue with DDL not being logged immediatedly with WRITE_DELAY set to 0.
-Fixed issue with the combination of CASE WHEN (or COALESCE, etc.) with
-aggregate functions when the table contains no rows and the aggregate function
-returns null.
-Fixed issue with ALTER SCHEMA <name> RENAME TO <name>
-
-New features
-
-Support for RIGHT OUTER JOIN and CROSS JOIN in select statements 
-
-ALTER TABLE <name> ALTER COLUMN <name> SET [NOT] NULL
-
-Added DAY_OF_WEEK as an alternative for EXTRACT(XXX FROM <date time>)
- 
-
-2005.07.11 1.8.0.1
-
-Bug fixes and enhancements:
-
-Correlated subqueries with UNION (and other set operators) are allowed.
-LEFT OUTER JOIN join statement can contain NOT expressions.
-Set functions, SOME() and EVERY() implementation corrected.
-Quoted empty strings in TEXT table sources are no-longer interpreted as null.
-CHECKPOINT DEFRAG issued while there are uncommitted transactions works correctly.
-build.xml updated to fix issue with JDK 1.3 build  
-
-2005.07.01 1.8.0.0
-
-First release.
-
-2005.06.16 1.8.0.RC12
-
-Introduced new connection property shutdown, which, if true on the first 
-connection, will cause the engine to perform a SHUTDOWN on the database when
-the last connection is closed.
-
-Enhancements to TEXT table implementation to maintain the commit status of rows 
-during recovery from an abrupt shutdown. Uncommitted rows will not appear in
-TEXT tables.
-
-2005.05.17 1.8.0.RC10
-
-SCHEMAS
-
-Support for SQL schemas. Each database can contain multiple schemas. The 
-following commands have been introduced:
-
-CREATE SCHMEA <schemaname> AUTHORIZATION DBA
-DROP SCHEMA <schemaname> {CASCADE | RESTRICT}
-ALTER SCHEMA <schemaname> RENAME TO <newname>
-SET SCHEMA <schemaname>
-
-Initially, the default user schema will be created with the name PUBLIC. This 
-schema can be renamed or dropped. When the last user schema has been dropped, 
-an empty default schema with the name PUBLIC is created.
-
-System tables all belong to INFORMATION_SCHEMA. To access system tables, either
-SET SCHEMA INFORMATION_SCHEMA should be used once or they should be referred to
-by fully specified names, e.g. 
-INFORMATION_SCHEMA.SYSTEM_TABLES
-
-Similarly all database objects apart from columns can be referenced with fully
-qualified schema names.
-
-The CREATE SCHEMA command can be followed by other CREATE and GRANT commands 
-without an intervening semicolon. All such commands are executed in the context
-of the newly created schema. A semicolon terminates an extended CREATE SCHEMA
-command.
-
-ROLES
-
-Support for SQL standard roles.
-
-CREATE ROLE <role name>
-GRANT ... TO <role name>
-REVOKE ... FROM <role name>
-GRANT <role name> TO <user name>
-DROP ROLE <role name>
-
-The GRANT and REVOKE commands are similar to those used for granting 
-permissions on different objects to USER objects. A role can then be granted to
-or revoked from different users, simplifying permission management.
-
-GLOBAL TEMPORARY TABLES
-
-The implementation of temporary tables has changed to conform to SQL standards.
-
-The definition of a GLOBAL TEMPORARY table persists with the database. When a 
-session (JDBC Connection) is started, an empty instance of the table is created.
-Temporary tables can be created with (the default) ON COMMIT DELETE ROWS or 
-ON COMMIT PRESERVE ROWS added to the end of table definition. 
-With ON COMMIT PRESERVE ROWS, the table contents are not cleared when the 
-session commits. In both cases, the contents are cleared when the session is
-closed.
-
-
-SCHEMA MANIPULATION COMMANDS
-
-Several schema manipulation commands have been enhanced. 
-
-Tables, views and sequences can be dropped with the CASCADE option. This 
-silently drops all tables and views that reference the given database object.
-
-DROP TABLE <table name> [IF EXISTS] [CASCADE];
-DROP VIEW <view name> [IF EXISTS] [CASCADE];
-DROP SEQUENCE <sequence name> [IF EXISTS] [CASCADE];
-
-ALTER TABLE <table name> DROP COLUMN now silently drops any primary key or 
-unique constraint declared on the column (excluding multi-column constraints).
-
-ALTER TABLE <table name> ADD [COLUMN] now accepts primary key and identity 
-attributes.
-
-COLUMN MANIPULATION
-
-Support for converting type, nullability and identity attributes of a column
-
-ALTER TABLE <table name> ALTER COLUMN <column name> <column definition>
-
-<column definition> has the same syntax as normal column definition. The new 
-column definition replaces the old one, so it is possible to add/remove a 
-DEFAULT expression, a NOT NULL constraint, or an IDENTITY definition. 
-No change to the primary key is allowed with this command. 
-
-- The column must be already be a PK column to accept an IDENTITY definition.
-- If the column is already an IDENTITY column and there is no IDENTITY 
-definition, the existing IDENTITY attribute is removed.
-- The default expression will be that of the new definition, meaning an 
-existing default can be dropped by ommission, or a new default added.
-- The NOT NULL attribute will be that of the new definition, similar to above.
-- Depending on the conversion type, the table may have to be empty for the
-command to work. It always works when the conversion is possible in general and
-the individual existing values can all be converted.
-
-A different syntax can be used to change the next value for an IDENTITY column:
-
-ALTER TABLE <table name> ALTER [COLUMN] <column name> RESTART WITH <n>
-
-
-ALL and ANY expressions
-
-Full support for ALL(SELECT ....) and ANY(SELECT ....) with comparison o
-perators: =, >, <, <>, >=, <=
-Example:
-
-SELECT ... WHERE <value expression> >= ALL(SELECT ...)
-
-LIMIT and OFFSET
-
-New alternative syntax for LIMIT at the end of the query:
-
-LIMIT L [OFFSET O]
-
-It is now possible to use LIMIT combined with ORDER BY in subqueries and SELECT
-statements in brackets that are terms of UNION or other set operations.
-
-An ORDER BY or LIMIT clause applies to the complete result of the UNION and 
-other set operations or alternatively to one of its components depending on how 
-parentheses are used. In the first example the scope is the second SELECT, 
-while in the second query, the scope is the result of the UNION.
-
-SELECT ... FROM ... UNION 
-(SELECT ... FROM ... ORDER BY .. LIMIT)
-
-SELECT ... FROM ... UNION 
-SELECT ... FROM ... ORDER BY .. LIMIT
-
-Support for ORDER BY, LIMIT and OFFSET in CREATE VIEW statements
-
-
-COLLATIONS
-
-Added support for collations. Each database can have its own collation. The SQL 
-command below sets the collation from the set of collations in the source 
-for org.hsqldb.Collation:
-
-SET DATABASE COLLATION <double quoted collation name>
-
-Once this command has been issued, the database can be opened in any JVM and 
-will retain its collation.
-
-The property sql.compare_in_locale=true is no longer supported. If the line 
-exists in a .properties file, it will switch the database to the collation for 
-the current default.  
-
-ENHANCEMENTS
-
-Support for the res: connection protocol (database files in a jar) has been
-extended to allow CACHED tables.
-
-Support for correct casting of TIME into TIMESTAMP, using CURRENT_DATE 
-
-Symmetrical handling of setTimestamp() and getTimestamp() with Calendar
-parameters.
-
-BUG FIX
-
-Fixed bug where two indexes where switched, causing wrong results in some 
-queries in the following circumstances:
-
-CREATE TABLE is executed.
-ALTER TABLE ADD FORIEGN KEY is used to create an FK on a different table that 
-was already present when the first command was issued.
-CREATE INDEX is used to add an index.
-Data is added to the table.
-Database is shutdown.
-Database is restarted.
-At this point the indexes are switched and queries that use either of the 
-indexes will not return the correct set of rows.
-
-BUG FIXES
-
-Fixed reported bug with NOT LIKE and null values
-
-Fixed bug with OR conditions in OUTER JOIN
-
-Fixed bug with duplicated closing of prepared statements
-
-Fixed bug with scalar subqueries. If the result of a scalar subquery is empty 
-(no rows returned), the value is NULL.
-
-Fixed various parsing anomalies where SQL commands were accepted when quoted, 
-double-quoted or prefixed with an identifier, or identifiers were accepted in 
-single quotes. Example of a command that is no-longer tolerated: 
-
-Malformed query: MY. "SELECT" ID FROM 'CUSTOMER' IF.WHERE ID=0;   
-Actual query: SELECT ID FROM CUSTOMER WHERE ID=0;
-
-Fixed bug that prevented adding a primary key with no name to a table.
-
-Fixed bug that resulted in an error when the type of a column was changed to 
-the same type as before. E.g. 
-ALTER TABLE <table name> ALTER COLUMN <column name> INTEGER
-
-BUG FIX
-
-Fixed bug in ROLLBACK. If several updates were made to a row of a table that 
-has no primary key, then ROLLBACK was issued, there would remain multiple 
-versions of the row. E.g.
-
-CREATE TABLE T (I INT);
-INSERT INTO T VALUES (0);
-SET AUTOCOMMIT FALSE;
-UPDATE T SET I=1 WHERE I = 0;
-UPDATE T SET I=2 WHERE I = 1;
-UPDATE T SET I=3 WHERE I = 2;
-UPDATE T SET I=4 WHERE I = 3;
-ROLLBACK
-
-After the rollback the table would contain more than one row.
-
-
-2005.03.02 1.8.0.RC9
-
-Fixed unreported bug in recovery when first column contains null.
-Fixed unreported issue with possible PK and FK name duplication
-Fixed reported bug in recovery when there is no primary key.
-Fixed reported issue with deleting self referencing row (with foreign key).
-Fixed reported issue with illegal user names
-Fixed jdk 1.3 compilation issues
-Applied submitted patch to Server
-
-Applied submitted patch for setting the default table type when CREATE TABLE is
-used. The connection property, hsqldb.default_table_type=cached will set the
-default to CACHED tables, or the SET PROPERTY command can be used. Values,
-"cached" and "memory" are allowed.
- 
-The database property sql.enforce_strict_size=true has now a wider effect
-Previously CHAR /VARCHAR lengths could be checked and padding performed only 
-when inserting / updating rows. Added support for CHAR(n), VARCHAR(n), 
-NUMERIC(p,s) and DECIMAL(p,s) including SQL standard cast and convert semantics.  
-Explicit CAST(c AS VARCHAR(2)) will always truncate the string. Explicit 
-CAST(n AS NUMERIC(p,s)) will always perform the conversion or throw if n is out
-of bounds. All other implicit and explicit conversions to CHAR(n) and VARCHAR(n) 
-are subject to SQL standard rules.
- 
-Bob has improved support for text tables. Newline support in quoted fields is
-now complete. It is now possible to save and restore the first line header of a
-CSV file when ignore_first=true is specified. When a text table is created with 
-a new source (CSV) file, and ignore_first=true has been specified the following
-command can be used to set a user defined string as the first line:
-SET TABLE <tablename> SOURCE HEADER <double quoted string>.
-
-When embedded in OOo, several defaults and properties are set automatically:
-
-CREATE TABLE ... defaults to CREATE CACHED TABLE ...
-hsqldb.cache_scale=13
-hsqldb.cache_size_scale=8
-hsqldb.log_size=10
-SET WRITE DELAY 2
-sql.enforce_strict_size=true
-hsqldb.first_identity=1
-
-
-2005.02.11 1.8.0.RC8
-
-Fixed minor bugs
-
-Added public shutdown() method to Server.
-
-A new application log has been introduced as an optional feature. The
-property/value pair "hsqldb.applog=1" can be used in the first connection string 
-to log some important messages. The default is "hsqldb.applog=0", meaning no
-logging. A file with the ending ".app.log" is generated alongside the rest of
-the database files for this purpose. 
-
-In the current version only the classes used for file persistence (different in
-OpenOffice.org), plus any error encountered while processing the .log file after
-an abnormal end is logged.
-
-Bob Preston has updated the text table support to accept new line characters
-inside quoted strings. It is still not possible to create / modify a row 
-containing a new line inside the engine. This will be a simple upgrade and will
-be included in the next RC.
-
-Note that the JDBC driver and the engine for 1.8.0 cannot be mixed with those of
-earlier versions in client/server setup. Check your classpaths and use the same
-version of the engine for both client and server.
-
-
-2005.01.28 1.8.0.RC7
-
-Fixed minor bugs
-
-2005.01.24 1.8.0.RC5
-
-Issues with SET CHECKPOINT DEFRAG fixed
-
-New property for larger data file limits is introduced. Once set, the limit will
-go up to 8GB. The property can be set with the following SQL command only when 
-the database has no tables (new database).
-
-SET PROPERTY "hsqldb.cache_file_scale" 8
-
-To apply the change to an existing database, SHUTDOWN SCRIPT should be performed 
-first, then the property=value line below should be added to the .properties
-file before reopening the database:
-
-hsqldb.cache_file_scale=8
-
-It is now possible to add or drop a primary key.
-
-An existing primary key that is to be removed should not be referenced in a
-FOREIGN KEY constraint. If a table has an IDENTITY column, removing a primary 
-key will remove the identity attribute of the column but leave the actual data.
-
-When adding a primary key, a NOT NULL constraint is automatically added to the 
-column definitions. The table data for the columns of a newly declared primary
-key should not contain null values. 
-
-ALTER TABLE <name> ADD CONSTRAINT <cname> PRIMARY KEY(collist);
-ALTER TABLE <name> DROP CONSTRAINT <cname>;
-ALTER TABLE <name> DROP PRIMARY KEY; // alternative syntax
-
-2005.01.20 1.8.0.RC4
-
-More minor bug fixes
-ResultSetMetaData reports identical precision/scale in embedded and 
-client/server modes
-
-2005.01.16 1.8.0.RC3
-
-Regression bug fixes.
-New property allows a CHECKPOINT DEFRAG to be performed automatically whenever
-CHECKPOINT is performed internally or via a user command.
-
-SET CHECKPOINT DEFRAG n
-
-The parameter n is the megabytes of abandoned space in the .data file. When
-a CHECKPOINT is performed either as a result of the .log file reaching the 
-limit set by "SET LOGSIZE m", or by the user issuing a CHECKPOINT command, the
-amount of space abandoned during the session is checked and if it is larger 
-than n, a CHECKPOINT DEFRAG is performed instead of a checkpoint.
-
-2005.01.14 1.8.0.RC2
-
-Regression bug fixes.
-
-
-2005.01.10 1.8.0.RC1
-
-Allows embedding into OpenOffice.org
-Rewrite of log and cache handling classes, including:
-New deleted block manager with more effective deleted block reuse.
-Faster log processing after an abnormal termination.
-Better checks when maximum data file size is reached.
-Better recovery when maximum data file size is reached.
-
-Changes to row access to use iterators. More code clarity.
-
-Various refactorings and new package for improved modularity. 
-
-Enhancements to DatabaseManagerSwing
-
-In all other respects, 1.8.0.RC1 is identical to 1.7.3.1
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_1.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_1.txt
deleted file mode 100644
index 41c87665d9..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_1.txt
+++ /dev/null
@@ -1,304 +0,0 @@
-
-Version 1.7.1 improves performance and fixes several bugs that have come to light since the release of 1.7.0. It does not feature any major new functionality in the database engine.
-
-*Over ten-fold speedup of function calls in queries introduced in 1.7.1.
-
-*Up to 30% reduction in memory used by indexes and table rows, resulting in smaller overall memory footprint in 1.7.1.
-
-*Linux scripts for starting and shutting down server instances in 1.7.1.
-
-*Linux build scripts in 1.7.1.
-
-*The Transfer Tool was enhanced for this version by Nicolas Bazin and Bob Preston.
-
-HSQLDB version 1.7.0 CHANGELOG SINCE VERSION 1.60
-
-* Enhancements to SQL
-
-LIMIT and TOP keywords
-
-The LIMIT keyword was introduced in 1.61 with limited functionality. In 1.7.0 the functionality has been fully extended:
-
-SELECT LIMIT <n> <m> DISTINCT is now allowed.
-
-SELECT LIMIT <n> <m> ... is now treated as a complete SELECT statement and can be used anywhere a SELECT is used, so statements such as the following return meaningful results:
-
-SELECT LIMIT <n> <m> ... WHERE <x> IN (SELECT LIMIT <o> <p> ... )
-
-SELECT LIMIT <n> <m> ...  UNION SELECT LIMIT <o> <p>
-
-TOP <m> is synonymous with LIMIT 0 <m>
-
-GROUP BY keyword
-
-GROUP BY had several problems and bugs that have now been resolved. The results are now correct regardless of the order of selected columns or when sorting by multiple columns.
-
-DEFAULT keyword
-
-This keyword has been introduced with full functionality for defining default values for table columns. Special cases 'CURRENT_DATE','CURRENT_TIME','CURRENT_TIMSTAMP', 'TODAY' and 'NOW' can set DATE, TIME and TIMESTAMP columns with current values when an INSERT statement is executed.
-
-SIZE and PRECISION
-
-Maximum column sizes for CHAR, VARCHAR, and other types are now stored in the database. The CHAR and VARCHAR sizes can be enforced when INSERT, UPDATE and SELECT ... INTO table operations are performed. The enforcement is optional and turned off by default.
-
-SAVEPOINT for TRANSACTION
-
-New feature to allow transactions to rollback to a specified point.
-
-CONSTRAINTS and INDEXES
-
-Primary keys declared as CONSTRAINT <name> PRIMARY KEY, either on a single column or on multiple columns, are now accepted and used. All constrains are named, with those generated by the system given unique names as SYS_CT_<n>.
-
-Each INDEX must have a unique name within the database. This conforms to SQL standards.
-
-FOREIGN KEYS, ON DELETE CASCADE
-
-Foreign key constraints referencing the same table are now allowed. New, stricter rules require a unique index to exist on the referenced column (this is the recommended behaviour for new databases but is turned off by default for existing databases). 
-
-ON DELETE CASCADE qualifiers are now supported for foreign keys in data definition scripts. These qualifiers are enforced with fast searches on underlying indexes. 
-
-New support for ALTER TABLE allows 'forward-referencing' foreign keys where the referencing table is created before the referenced table.
-
-TRIGGERS
-
-New multiple-row trigger queues are introduced to improve performance. Enhancements to prevent deadlocks are also added.
-
-TEMP tables
-
-Full support for session-specific temporary tables is introduced. TEMP tables can be used in any statement the same way as ordinary tables, the differences are they are not visible to other session and are dropped when the session is closed. Also, FOREIGN KEY constraints for ordinary tables cannot reference a TEMP table for obvious reasons (TEMP tables can have foreign keys that reference any ordinary or temp table).
-
-TEXT tables
-
-Full support for delimited text files (such as CSV) as the data source for SQL tables.
-
-VIEWS
-
-Views are supported as global objects. Internally, each time the view is used, the underlying select statement is performed. Views can be created and dropped using the following statements.
-
-
-CREATE VIEW <viewname> AS SELECT ... FROM ... WHERE ....
-DROP VIEW <viewname> {IF EXISTS}
-
-ALTER
-
-The following statements are now supported:
-
-ALTER TABLE <name> RENAME TO <newname>
-
-All tables can now be renamed. 
-
-ALTER TABLE <name> ADD COLUMN <column definition> [BEFORE <existing name>]
-ALTER TABLE <name> DROP COLUMN <colname>
-
-A column can be added to the column list, so long as its definition does not include PRIMARY KEY or IDENTITY keywords. If a DEFAULT clause is used in the definition, its value is used in all the existing rows. Any column can be dropped unless it is part of the column list for a constraint or index.
-
-ALTER TABLE <name> DROP CONSTRAINT <constname>
-
-Any constraint apart from primary key can be dropped. The index backing the constraint is dropped if not referenced by a foreign key.
-
-ALTER TABLE <name> ADD CONSTRAINT <constname> UNIQUE <column list>
-
-Unique constraints can be added. A new index is created if necessary.
-
-ALTER TABLE <name> ADD CONSTRAINT <constname> FOREIGN KEY <foreign key definition>
-
-Both backward and forward referencing foreign keys are supported.
-
-ALTER INDEX <name> RENAME TO <newname>
-
-Any index can be renamed, so long as it is not a primary key index or an automatically created index on the referencing columns of a foreign key.
-
-DROP INDEX <name>
-
-Any index can be dropped, so long as it is not a primary key index or an automatically created index on the referencing columns of a foreign key or an index backing a constraint.
-
-SQL NAMES
-
-Full support for quoted SQL object names which can include any Unicode character. This applies to TABLE, COLUMN, CONSTRAINT and INDEX names.
-
-* Functions
-
-SET FUNCTION such as COUNT AVG SUM now accept the DISTICT parameter. This feature is
-supported only when GROUP BY is not used in the query.
-
-A number of bugs in functions such as ABS, CONCAT and SUBSTR have been fixed.
-
-A small number of new functions have been added.
-
-The SOUNDEX function has been rewritten according to standards.
-
-* Expressions
-
-Arithmetic expressions in SQL statements are now fully supported. Previously, when an arithmetic expression was used to INSERT or UPDATE a value, the first term had to be of the same type as the columns. For example 2*1.2 could not be inserted into a DECIMAL or DOUBLE column. Now all expressions are evaluated and the resulting value can be inserted into a column so long as it can be converted without narrowing.
-
-More lenient treatment of values for TIMESTAMP columns in INSERT and UPDATE now allows a DATE or part TIMESTAMP string to be used instead of the full pattern.
-
-BIT columns can be initialised with numeric values in addition to true and false. Numeric value 0 represents false; all other values represent true.
-
-* Locales
-
-CHAR, VARCHAR and LONGVARCHAR columns can now be sorted according to the current JVM locale. This feature is optional and turned off by default. If turned on, it can slow down database operations, especially where indexes on CHAR columns and its variant are used.
-
-* Error Trapping
-
-Some errors in SQL statements that were not reported before and resulted in potentially incorrect data are now caught.
-
-Dropping tables that are referenced by foreign key constraints from other tables is now disallowed regardless of the system-wide REFERENTIAL_INTEGRITY setting.
-
-Duplicate column names in one table are no longer allowed.
-
-Duplicate index names are no longer allowed.
-
-Using system table names for user tables is disallowed.
-
-INSERT INTO table (a,b,c,...) VALUES (x,y,z,...) statements require the count of names and values to match.
-
-* Enhancements to JDBC
-
-JDBC ResultSet objects are now scrollable and fully support absolute and relative positioning.
-
-Extra getXXX() methods are now supported, including getAsciiStream(), getUnicodeStream(), getCharacterStream().
-
-Optional use of column labels (aliases) as the return value for getColumnName(int i) calls. This is turned off by default.
-
-JDBC PreparedStatement support has been enhanced with support for setting and reading Date, Time and Timestamp values with a given Calendar object. This allows, among others, specifying different time zones for values that are set or read.
-
-Extra setXXX() methods are now supported, including setAsciiStream(), setUnicodeStream(), setCharacterStream().
-
-setObject() methods of PreparedStatement have been improved to allow storage of any serializable object in columns of SQL type, OTHER.
-
-JDBC DatabaseMetaData getImportedKeys(), getExportedKeys(), getCrossReference(), getBestRowIdentifier() are now supported.
-
-* Interoperability Enhancements
-
-HsqlServerFactory allows interoperability with application servers.
-
-An embedded server (an HSQLDB server started inside another application) can be directed to avoid calling System.exit() when the SHUTDOWN command is issued to the database for admin purposes.
-
-javax.jdbc.DataSource interface has been introduced as an experimental feature. In order to include this support, the source code should be compiled with JDK 1.4 or with appropriate J2EE jars present in the class path.
-
-* Performance Enhancements
-
-Very large CHAR, VARCHAR, LONGVARCHAR values are now supported in all types of tables.
-
-Major overhaul of internal operations to drastically reduce creation of temporary objects and type conversion.
-
-Code enhancements to reduce unnecessary method calls in loops.
-
-Enhancements to avoid duplicate indexes (in source code but not activated).
-
-Over ten-fold speedup of function calls in queries intoduced in 1.7.1.
-
-Up to 30% reduction in memory used by indexes and table rows, resulting in smaller overall memory footprint in 1.7.1.
-
-* Reliability Enhancements
-
-Many bugs that existed in 1.43 have been fixed.
-
-Better catching of error conditions and special cases such as null values.
-
-Correct treatment of large binary data.
-
-Better enforcement of internal data consistency in a number of areas.
-
-* Utilities
-
-New Script Tool class allows executing an SQL script.
-
-Enhancements to Transfer Tool to allow the user to save the transfer settings and load them in future sessions. Additional enhancements to support different database source and targets in a modular way.
-
-Swing version of Database Manager.
-
-Linux scripts for starting and shutting down server instances in 1.7.1.
-
-* Build
-
-Better Ant build with automatic detection of JDK version
-
-Linux build scripts in 1.7.1
-
-List of patches and fixes numbered by SourceForge Tracker ID's.
-
-416437 by deforest@users - JDBC DataSource
-418017 by deforest@users - made optional
-437174 by hjb@users - cache enhancements
-442993 by fredt - mixed type arithmetic expressions
-448121 by sma@users - large binary values - part implemented
-489917 by jytou@users - optional getColumnName(int) return value
-450412 by elise@users - jdk 1.1 compatibility
-450455 by kibu@users - platform specific line endings in .scrip file
-455757 by galena@users (Michiel de Roo)
-455785 by hjbusch@users - large DECIMAL inserts
-456679 by hiep256@users - TOP keyword
-460907 by fredt - soundex
-461556 by paul-h@users - compatibility with application servers
-471710 by fredt - LIMIT rewritten
-473613 by thertz@users - error trapping for joins
-475199 by fredt - duplicate column
-475586 by wreissen@users - servlet database name
-476650 by johnhobs@users - GROUP BY aggregates
-476694 by velichko@users - transaction savepoints
-478657 by peterhudson@users - improved TRIGGER support
-481239 by xponsard@users - enhancement to Transfer Tool
-481239 by yfl@users - SQL script execution
-485704 by boucherb@users - null binary objects
-488200 by xclay@users - throw exception
-489184 by xclay@users - thread safety
-489777 by fredt - protection of system tables
-491987 by jimbag@users - column size enforcement and preservation
-495484 by boucherb@users - exception at shutdown
-495938 by johnhobs@users - GROUP BY sorting
-497714 by lakuhns@users - scrollable JDBC result sets
-497872 by Nitin Chauhan - performance enhancements
-497872 by Nitin Chauhan - default labels for aggregates
-500767 by adjbirch@users - TransferTool enhancements
-505356 by daniel_fiser@users - sorting according to Locale
-509002 by fredt - correct parsing of primary key constraints
-513005 by sqlbob@users - ABS function
-513005 by sqlbob@users - HOUR function
-513005 by sqlbob@users - TEMP tables
-513005 by sqlbob@users - TEXT TABLE support
-514111 by fredt - CONCAT function
-517028 by peterhudson@users - JDBC setDate(), etc. with Calendar
-521078 by boucherb@users - DROP TABLE checks
-523880 by leptitpre@users - VIEW SUPPORT
-544754 by sqlbob@users - RAWTOHEX and HEXTORAW functions
-549741 by velichko@users - RENAME for tables and indexes
-550970 by boucherb@users - fewer StringBuffers
-552830 by rougier@users - COUNT(DISTICT column)
-580430 by thomasm@users - wrong column name in getIndexInfo()
-
-List of enhancements without patch number
-
-1.7.0 by boucherb@users - maintaining constraint names
-1.7.0 by boucherb@users - self referenced foreign keys
-1.7.0 by boucherb@users - stubs for JDBC3 methods and updated Javadoc
-1.7.0 by boucherb@users - Javadoc for a number of classes
-1.7.0 by deforest@users - create database directory if not exists
-1.7.0 by fredt - full support for quoted identifiers
-1.7.0 by fredt - ON DELETE CASCADE qualifier for foreign keys
-1.7.0 by fredt - foreign keys without target column list
-1.7.0 by fredt - DEFAULT keyword in column definitions
-1.7.0 by fredt - GROUP BY with multiple columns in groups
-1.7.0 by fredt - JDBC getDate, etc. with Calendar
-1.7.0 by fredt - lenient handling of Timestamp inserts
-1.7.0 by fredt - JDK 1.1 compatible deque object backed by an array
-1.7.0 by fredt - new HsqlProperties class
-1.7.0 by fredt - preservation of column size, etc. with SELECT INTO
-1.7.0 by fredt - ensuring internal consistency of Result objects
-1.7.0 by fredt - resolving some deprecation warnings
-1.7.0 by fredt - ALTER TABLE for adding and dropping columns and constraints
-1.7.0 by fredt - revamped storage of cached table with very large strings
-1.7.0 by fredt - management of server connections with optional no system exit
-1.7.0 by fredt - revamped management of server and database properties
-1.7.0 by fredt - JDBC getUnicodeStream(), getAsciiStream(), getCharacterStream()
-1.7.0 by fredt - JDBC setAsciiStream(), setUnicodeStream(), setCharacterStream()
-1.7.0 by fredt - JDBC getCrossReference(), getImportedKeys(), getExportedKeys()
-1.7.0 by nbazin@users - enhancements to Transfer Tool
-1.7.0 by sqlbob@users - reengineering of Database Manager and Transfer Tool
-1.7.0 by sqlbob@users - TEMP, TEXT and CACHED table targets for SELECT INTO
-1.7.0 by sqlbob@users - improvements to cache size management
-1.7.0 by David Moles - tests for subselect
-1.7.0 by jrmaher@users - improvements to Script Tool
-
-also a large number of error-trapping and other fixes not documented
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_2.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_2.txt
deleted file mode 100644
index f99d65eda8..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_7_2.txt
+++ /dev/null
@@ -1,532 +0,0 @@
-HSQLDB 1.7.2 CHANGE LOG
-
-
-The development of 1.7.2 began in late 2002 with a plan to release the new version within 6 months. Several alpha versions, culminating in ALPHA_M, were released in the first three months and featured most of the intended enhancements. However, when newly written code for system tables was introduced, many changes had to be made to internal code to accommodate the reporting requirements. This was followed from around April 2003 with efforts to separate query compilation from execution. Other developments to allow multiple databases, better query processing, more advanced SQL keywords, etc. took place simultaneously, resulting in an extended scope for 1.7.2 and extensive addition and rewrite of several key classes. The next alpha version was released in September, followed by a further six, until the first Release Candidate became available at the end of 2003. Since then, all efforts have been focused on fixing bugs and inconsistencies, with 7 additional Release Candidates issued.
-
-As a result, 1.7.2 features major changes to the database engine. Existing applications that work with previous versions may need modifications to work with the new version. Changes are listed here and in the rest of the documentation.
-
-I would like to thank all developers, testers and users who have contributed to this effort.
-
-
-June 2004
-
-Fred Toussi
-
-Maintainer, HSQLDB Project
-http://hsqldb.sourceforge.net
-
-
-----------------------------------------------------
-----------------------------------------------------
-
-SQL ENHANCEMENTS AND CHANGES
-
-
-----------------
-
-DDL
-
-Some new restrictions have been imposed:
-
-CONSTRAINT names must be unique within each database (same with INDEX names).
-Size / precision / scale values for several types are now disallowed. Allowed types are: CHAR(n), VARCHAR(n), DOUBLE(n), DECIMAL(n,m)
-
-In column default value specification, functions such as CURRENT_TIME, CURRENT_DATA, etc. should not be enclosed in quotes. New function CURRENT_USER can also be used.
-
-SQL keywords are not allowed as table or column names unless they are double-quoted. 
-
-----------------
-
-VIEW
-
-
-View definitions can now have a column name list:
-
-CREATE VIEW <viewname> [(<colnmae>, ...)] AS SELECT ....
-
-ALTER TABLE commands take into account the views that reference the table and prevent illegal changes.
-
-
-
-----------------
-
-CHECK
-
-
-
-Support for CHECK constraints that apply to the modified/inserted row only. This can be added via ALTER TABLE ADD CHECK() or in table definition.
-
-
-
-----------------
-
-QUERY PROCESSING
-
-
-
-Query processing has been extensively enhanced in this release and better SQL standard compliance has been achieved. Major implications of the recent changes are as follows:
-
-Columns in correlated subqueries are resolved independently first. If there is an unresolved column, then the surrounding context is used to resolve it. This is opposite the resolution order previously enforced in the engine.
-
-Some ambiguities and errors in ORDER BY clauses are now caught.
-
-UNION and other set queries accept only one ORDER BY clause at the end. In this clause, column indexes or column names in the first select are allowed as sort specification e.g.:
-
-SELECT .. UNION SELECT .. ORDER BY 1 DESC, 5, 3
-
-The implemntation of UNION, EXCEPT and INTERSECT set operations has been rewritten to comply with SQL standards.
-
-When multiple set operations are present in a query, they are now evaluated from left to right, with INTERSECT taking precedence over the rest.
-
-It is now possible to use parentheses around multiple (or single) select statements with set operations to change the order of evalation.E.g.:
-
-((SELECT * FROM A EXCEPT SELECT * FROM B) INTERSECT SELECT * FROM D UNION SELECT * FROM E)
-
-The above applies to all cases where a SELECT can be used except a single value select inside another select. Eg.
-
-SELECT a, b, SELECT asinglevalue FROM anothertable WHERE ..., FROM atable JOIN ... 
-
-----------------
-
-IMPROVEMENTS TO UPDATE AND INSERT
-
-
-
-Certain types of UPDATES and INSERTS that previously failed due to blanket application of UNIQUE constraints now work.
-
-Examples include UPDATE ... SET col = col + 1 where col is an identity column or INSERT a self referencing row under FOREIGN key constraints.
-
-
-
-----------------
-
-AGGREGATES, GROUP BY, HAVING
-
-
-
-DISTINCT aggregates are now supported.
-
-Aggregates on all numeric type columns are now supported. Expressions are allowed as aggregate function parameter.
-
-SUM returns a BIGINT for TINYINT, SMALLINT and INTEGER columns. It returns a DECIMAL for BIGINT columns (scale 0). SUM of a DECIMAL column has the same scale as the column.
-
-AVG returns the same type as the column or the expression in its argument.
-
-Aggregates with GROUP BY do not return any rows if table is empty
-
-Fully enforced GROUP BY rules including support for HAVING conditions
-
-
-----------------
-
-JOINS
-
-
-
-Extensive rewrite of join processing abolishes the requirement for an index on any joined columns.
-
-Problems with OUTER and INNER joins returning incorrect results have been fixed and results are correct in all cases.
-
-When two tables are joined, rows resulting from joining null values in the joined columns are no longer returned.
-
-Most expressions are supported in the join condition (JOIN <table> ON ....).
-
-Outer join conditions can now include most comparison operators, as well as OR logical operators. For example:
-
-LEFT OUTER JOIN atable ON a=b AND c>d OR a=2 ...
-
-Illegal forward table references are no longer allowed in join conditions.
-
-There are many other small improvements and fixes, including:
-
-
-
-----------------
-
-NULLS
-
-
-
-Support for multiple rows with null fields under unique constraints.
-
-Exclusion of NULL values from results of queries with range conditions. 
-
-
-
-----------------
-
-FOREIGN KEY
-
-
-
-Full support for triggered actions, including foreign keys that reference the same table.
-
-FORIEGN KEY ... ON UPDATE { CASCADE | SET NULL | SET DEFAULT } ON DELETE { CASCADE | SET NULL | SET DEFAULT }
-
-Strict treatment of foreign key constraint requirements is now enforced. A foreign key declaration _requires_ a unique constraint to exist on the columns of the referenced table. This applies both to old and new databases. Duplicate foreign keys (with exactly the same column sets) are now disallowed.
-
-
-
-----------------
-
-SEQUENCE
-
-
-
-Support for sequences. Identity columns are now automatic sequence primary key columns that can be defined as INTEGER or BIGINT as follows:
-
-GENERATED BY DEFAULT AS IDENTITY (START WITH <n>, INCREMENT BY <m>)
-
-Named sequence objects can be defined with:
-
-CREATE SEQUENCE <sequencename> [AS {INTEGER | BIGINT}] [START WITH <startvalue>] [INCREMENT BY <incrementvalue>];
-
-And the next value can be retrieved with the following expression in SELECT, INSERT and UPDATE queries:
-
-NEXT VALUE FOR <sequencename>
-
-
-
-----------------
-
-SQL FUNCTIONS
-
-
-Added support for a range of SQL style functions:
-
-
-CASE .. WHEN .. THEN .. [WHEN .. THEN ..] ELSE .. END
-
-CASE WHEN .. THEN .. [WHEN .. THEN ..] ELSE ... END
-
-NULLIF(.. , ..)
-
-SUBSTRING(.. FROM .. FOR ..)
-
-POSITION(.. IN ..)
-
-TRIM( {LEADING | TRAILING .. } FROM ..)
-
-EXTRACT({DAY | TIME |..} FROM ..)
-
-COALESCE(.. , ..)
-
-
-
-----------------
-
-TRIGGER
-
-
-
-It is now possible to execute triggers in the main execution thread. This allows uses for triggers that were not possible before, especially checking and modifying inserted values.
-
-
-
-----------------
-
-DATETIME
-
-
-
-Fixed the TIMESTAMPS, TIME and DATE normalisation issues.
-
-
-
-----------------
-
-OTHER
-
-
-
-IN value lists can now contain column values or expressions. See TestSelfQueries.txt for an example.
-
-
-LIKE has been debugged and optimised when possible.
-
-
-
-----------------------------------------------------
-----------------------------------------------------
-
-JDBC ENHANCEMENTS
-
-
-
-JDBC support for savepoints.
-
-Support for JDBC batch execution with multiple-results. Both Statement and PreparedStatement batch modes are supported.
-
-SSL support for server mode operation.
-
-After calling Statement.setMaxRows(int), the maximum row count restriction will no longer apply to result sets returned and used internally. (change in 1_7_2_5)
-
-
-----------------
-
-CONNECTION PROPERTY
-
-
-
-A new property, ifexists={true|false} can be specified for connections. It has an effect only on connections to in-process databases. The default is false and corresponds to current behaviour. 
-
-If set true, the connection is opened only if the database files have already been created -- otherwise no new database is created and the connection attempt will fail. Example:
-
-jdbc:hsqldb:hsql:file:mydb;ifexists=true
-
-This property is intended to reduce problems resulting from wrong URL's which get translated to unintended new database files. It is recommended to use this property for troubleshooting.
-
-Database properties can be specified for the first connection to a new file: or mem: database. This allows properties such as enforce_strict_size to be specified for mem: databases, or for a new file: database.
-
-jdbc:hsqldb:hsql:mem:test;sql.enforce_strict_size=true
-
-
-
-----------------
-
-PREPARED STATEMENTS
-
-
-
-Support for real PreparedStatements - major speedup. This has introduced the following changes from the previous versions.
-
-The execute(String sql), executeUpdate(String sql) and executeQuery(String sql) commands are no-longer supported for PreparedStatements according to JDBC specs. Use an ordinary Statement for calling these methods.
-
-The SQL for each call to the prepareStatement() method of Connection must consist of a single SQL query. For multiple statements use either multiple PreparedStatement objects or an ordinary Statement object.
-
-Bug fixes ensure date / time, java object and binary values stored in in-process databases via prepared statements will not be altered if the object is modified outside the engine.
-
-Full support for ResultSetMetaData
-
-Full support for ParameterMetaData
-
-Support for CLOB methods in ResultSet
-
-
-
-----------------
-
-TRANSACTIONS VIA WEB SERVER
-
-
-
-Uniform support for transactions via HSQL and HTTP (WebServer and Servlet) protocols
-
-
-----------------------------------------------------
-----------------------------------------------------
-
-OTHER ENHANCEMENTS
-
-
-
-----------------------------------------------------
-
-SPEED
-
-
-
-Speed optimisation of joins with views and subqueries, using indexes to optimise join performance.
-
-Improved index use for multiple key joins.
-
-Further speed improvements in all logged modes
-
-INSERT and UPDATE ops are faster by 5-20% in MEMORY tables, less in CACHED tables.
-
-General speedup of CACHED table operation due to better management of the memory cache.
-
-
-
-----------------------------------------------------
-
-DATABASE PACKAGING AND MODES
-
-
-
-Two new options for databases: files_readonly and files_in_jar were added:
-
-
-FILE READ-ONLY
-
-
-If the property hsqldb.files_readonly=true is set in the database .properties file, no attempt is made to write the changes to data to file. Default, MEMORY tables can be read/write but TEXT and CACHED tables are treated as read-only.
-
-
-FILES IN JAR
-
-
-This option allows database files to be distributed in the application jar. We have changed the original contribution so that a special URL is used for this mode in the form of:
-
-jdbc:hsqldb:res:<path in jar>
-
-The URL type 'res' determines that the path that follows is a path into the JAR. The path must be all lowercase and begin with a forward slash.
-
-The database can be readonly or files_readonly, depending on the value set in .properties file.
-
-
-'OTHER' DATA TYPE
-
-
-Change to handling of OTHER columns. It is no longer required that the classes for objects stored in OTHER columns to be available on the path of an HSQLDB engine running as a server. Classes must be available on the JDBC client's path.
-
-
-----------------------------------------------------
-
-MULTIPLE IN-MEMORY AND SERVER DATABASES
-
-
-
-Support for multiple memory-only databases within the same JVM
-
-Support for simultaneous multiple servers on different ports, multiple internal connections and multiple databases within the same JVM
-
-Each HSQLDB server or webserver can now serve up to 10 different databases.
-
-The server.properties and webserver.properties method for defining the databases has changed. The following properties should be used:
-
-server.database.0   path_of_the_first_database
-server.dbname.0 alias_for_the_first_database
-
-Up to 10 databases can be defined but they must start from 0. The same applies to command line arguments for Server and WebServer.
-
-The URL's for connecting to servers should have the alias of the database at the end. For example, to connect to the HSQL protocol server on the localhost use:
-
-jdbc:hsqldb:hsql://localhost/alias_for_the_database
-
-where alias_for_the_database is the same string as defined in server.properties as server.dbname.n
-
-If not explicitly set, the default for server.dbname.0 is "" (empty string) so that old URL types continue to work.
-
-Multiple memory-only database are supported by the use of:
-
-jdbc:hsqldb:mem:alias_for_the_first_database
-jdbc:hsqldb:mem:alias_for_the_second_database
-
-Examples: jdbc:hsqldb:mem:db1 jdbc:hsqldb:mem:mydb
-
-The connection type, 'file:', can be used for file database connections. Example below:
-
-jdbc:hsqldb:file:mydb;ifexists=true
-
-The URL for connecting to a Servlet HTTP server must have a forward-slash at the end. Servlet serves only one database.
-
-jdbc:hsqldb:hsql://localhost:8080/servlet/HsqlServlet/
-
-
-----------------------------------------------------
-
-DATABASE METADATA
-
-
-System table support and java.sql.DatabaseMetadate have been overhauled.
-
-Use SELECT * FROM SYSTEM_TABLES to see the full list.
-
-
-
-----------------------------------------------------
-
-TEXT TABLES
-
-
-Enhanced TEXT table handling and reporting of errors in CSV (source) files
-
-TEXT TABLES encoding of the source file can now be specified. UTF-8 and other encodings can be used.
-
-
-
-----------------------------------------------------
-
-MEMORY USE AND OBJECT POOLING
-
-
-An Object pool has been incorporated. This reduces memory usage to varying degrees depending on the contents of database tables and speeds up the database in most cases. Currently the size of the pool is hard-coded but it will be user adjustable in a future version.
-
-
-
-----------------------------------------------------
-
-PERSISTENCE
-
-
-----------------
-
-CHECKPOINT DEFRAG
-
-Defragments the *.data file without shutting down the database
-
-
-----------------
-
-SET SCRIPTFORMAT {TEXT | BINARY | COMPRESSED }
-
-Changes the format of the *.script file and performs a checkpoint.
-
-Database script can be stored in binary or compressed binary formats, resulting in smaller size and faster loading.
-
-
-----------------
-
-The *.script file now contains only the DDL and data that is written at CHECKPOINT or SHUTDOWN. The COMPRESSED format has the side benefit of hiding the DDL and the admin password.
-
-The *.log file now contains the statements executed since the last startup or CHECKPOINT. This file is in plain text format.
-
-----------------
-
-SET WRITE_DELAY {TRUE | FALSE}
-
-SET WRITE_DELAY <n>
-
-The behaviour of SET WRITE_DELAY has changed with the introduction of the sync() method to force the log to be written out completely to disk at given intervals.
-
-SET WRITE_DELAY {TRUE | FALSE} is interpreted as synch every 60 seconds or 1 second. SET WRITE_DELAY <n> where n is an integer is interpreted as synch every n seconds. The current default is 60 seconds which seems to provide the right balance. Under heavy INSERT/DELETE/UPDATE test conditions, the performance impact of SET WRITE_DELAY 1 is probably about 15% over that of SET WRITE_DELAY 300.
-
-Crash recovery has been modified so that any line in the *.log file that is not properly written (and causes an error) ends the redo process. A message is reported to the user, instead of stopping engine operation.
-
-----------------
-
-NIO ACCESS FOR *.data FILES
-
-New nio access layer for .data files speeds up most CACHED TABLE related operations very significantly. 90% speedups in TestCacheSize tests have been observed.
-
-There must be enough available memory in the machine to allow a memory-mapped buffer for the entire *.data file. Beyond this size, the engine reverts to non-nio access.
-
-
-
-----------------------------------------------------
-
-BUILD
-
-Reduction in JDK / JRE dependencies (see readmebuild.txt)
-
-The supplied JAR is now compiled with JDK 1.4 and requires a JRE 1.4 or later to work. You can rebuild the JAR with JDK 1.3.x in order to use it with JRE 1.3 or earlier.
-
-
-
-----------------------------------------------------
-
-DOCUMENTATION
-
-
-Documentation is now maintained mainly in XML format with HTML and PDF versions available.
-
-
-
-----------------------------------------------------
-
-UTILITIES
-
-
-The SQL Tool is a powerful new utility in 1.7.2 and allows processing SQL commands via the shell or scripts.
-
-The Transfer Tool utility saw a major upgrade just before the 1.7.2 release cycle. In this release some minor updates and bug fixes, together with significant speedup, have been intoduced.
-
-The Database Manager has been enhanced slightly to include a command to save the result set in CSV format. The Swing version of Database Manager allows the user to sort the rows of the result set on any column.
-
-The connection dialogue in the AWT version of Database Manager and Transfer Tool allows saving and recalling connection URL's together with the user name and password.
-
-
-----------------------------------------------------
-
-END
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_8_0.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_8_0.txt
deleted file mode 100644
index 0a50153a5d..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/changelog_1_8_0.txt
+++ /dev/null
@@ -1,287 +0,0 @@
-
-HSQLDB 1.8.0 CHANGE LOG
-
-
-The development of 1.8.0 began in mid 2004 with a plan to release the new version in 2005. The main feature planned for this release was the ability to be used with OpenOffice.org 2.0 as the default database engine. Release candidate versions started to appear in January, culminating in RC10 in May. Several new and enhanced SQL commands have been introduced and new capabilities such as support for multiple SCHEMA objects in each database, database-wide collations and SQL ROLE objects have been added. Parts of the persistence engine have been rewritten for better performance and long-running online operation.
-
-
-I would like to thank all developers, testers and users who have contributed to this effort.
-
-
-June 2005
-
-Fred Toussi
-
-Maintainer, HSQLDB Project
-http://hsqldb.sourceforge.net
-
-
-SQL ENHANCEMENTS
-
-----------------
-
-SCHEMAS
-
-Support for SQL schemas. Each database can contain multiple schemas. The following commands have been introduced:
-
-CREATE SCHMEA <schema name> AUTHORIZATION DBA
-DROP SCHEMA <schema name> {CASCADE | RESTRICT}
-ALTER SCHEMA <schema name> RENAME TO <new name>
-SET SCHEMA <schema name>
-
-Initially, the default user schema will be created with the name PUBLIC. This schema can be renamed or dropped. When the last user schema has been dropped, an empty default schema with the name PUBLIC is created.
-
-System tables all belong to INFORMATION_SCHEMA. To access system tables, either SET SCHEMA INFORMATION_SCHEMA should be used once or they should be referred to by fully specified names, e.g. INFORMATION_SCHEMA.SYSTEM_TABLES
-
-Similarly all database objects apart from columns can be referenced with fully qualified schema names.
-
-The CREATE SCHEMA command can be followed by other CREATE and GRANT commands without an intervening semicolon. All such commands are executed in the context of the newly created schema. A semicolon terminates an extended CREATE SCHEMA command.
-
-----------------
-
-ROLES
-
-Support for SQL standard roles.
-
-CREATE ROLE <role name>
-GRANT ... TO <role name>
-REVOKE ... FROM <role name>
-GRANT <role name> TO <user name>
-DROP ROLE <role name>
-
-The GRANT and REVOKE commands are similar to those used for granting permissions on different objects to USER objects. A role can then be granted to or revoked from different users, simplifying permission management.
-
-----------------
-
-GLOBAL TEMPORARY TABLES
-
-The implementation of temporary tables has changed to conform to SQL standards.
-
-The definition of a GLOBAL TEMPORARY table persists with the database. When a session (JDBC Connection) is started, an empty instance of the table is created. Temporary tables can be created with (the default) ON COMMIT DELETE ROWS or ON COMMIT PRESERVE ROWS added to table definition. With ON COMMIT PRESERVE ROWS, the table contents are not cleared when the session commits. In both cases, the contents are cleared when the session is closed.
-
-----------------
-
-SCHEMA MANIPULATION COMMANDS
-
-Several schema manipulation commands have been enhanced. 
-
-Tables, views and sequences can be dropped with the CASCADE option. This silently drops all tables and views that reference the given database object.
-
-DROP TABLE <table name> [IF EXISTS] [CASCADE];
-DROP VIEW <view name> [IF EXISTS] [CASCADE];
-DROP SEQUENCE <sequence name> [IF EXISTS] [CASCADE];
-
-ALTER TABLE <table name> DROP [COLUMN] now silently drops any primary key or unique constraint declared on the column (excluding multi-column constraints).
-
-ALTER TABLE <table name> ADD [COLUMN] now accepts primary key and identity attributes.
-
-----------------
-
-COLUMN MANIPULATION
-
-Support for converting type, nullability and identity attributes of a column
-
-ALTER TABLE <table name> ALTER [COLUMN] <column name> <column definition>
-
-<column definition> has the same syntax as normal column definition. The new column definition replaces the old one, so it is possible to add/remove a DEFAULT expression, a NOT NULL constraint, or an IDENTITY definition. No change to the primary key is allowed with this command. 
-
-- The column must already be a PK column to accept an IDENTITY definition.
-- If the column is already an IDENTITY column and there is no IDENTITY definition, the existing IDENTITY attribute is removed.
-- The default expression will be that of the new definition, meaning an existing default can be dropped by omission, or a new default added.
-- The NOT NULL attribute will be that of the new definition, similar to above.
-- Depending on the conversion type, the table may have to be empty for the command to work. It always works when the conversion is possible in general and the individual existing values can all be converted.
-
-A different syntax can be used to change the next value from an IDENTITY column:
-
-ALTER TABLE <table name> ALTER [COLUMN] <column name> RESTART WITH <n>
-
-----------------
-
-ADDING AND DROPPING PRIMARY KEYS
-
-It is now possible to add or drop a primary key.
-
-An existing primary key that is to be removed should not be referenced in a FOREIGN KEY constraint. If a table has an IDENTITY column, removing a primary key will remove the identity attribute of the column but leave the actual data.
-
-When adding a primary key, a NOT NULL constraint is automatically added to the column definitions. The table data for the columns of a newly declared primary key should not contain null values. 
-
-ALTER TABLE <name> ADD CONSTRAINT <cname> PRIMARY KEY(collist);
-ALTER TABLE <name> DROP CONSTRAINT <cname>;
-ALTER TABLE <name> DROP PRIMARY KEY; // alternative syntax
-
-----------------
-
-SIZE ENFORCEMENT
-
-
-The database property sql.enforce_strict_size=true has now a wider effect.
-
-Previously CHAR /VARCHAR lengths could be checked and padding performed only when inserting / updating rows. Added support for CHAR(n), VARCHAR(n), NUMERIC(p,s) and DECIMAL(p,s) including SQL standard cast and convert semantics. CHAR and VARCHAR declarations now require a size parameter. A CHAR declaration without a size parameter is interpreted as CHAR(1). TIMESTAMP(0) and TIMESTAMP(6) are also supported, with the precision representing the sub-second resolution.
-
-Explicit CAST(c AS VARCHAR(2)) will always truncate the string. Explicit CAST(n AS NUMERIC(p)) will always perform the conversion or throw if n is out of bounds. All other implicit and explicit conversions to CHAR(n) and VARCHAR(n) are subject to SQL standard rules.
-
-----------------
-
-ALL and ANY expressions
-
-Full support for ALL(SELECT ....) and ANY(SELECT ....) with comparison operators: =, >, <, <>, >=, <=
-Example:
-
-SELECT ... WHERE <value expression> >= ALL(SELECT ...)
-
-LIMIT and OFFSET
-
-New alternative syntax for LIMIT at the end of the query:
-
-LIMIT L [OFFSET O]
-
-It is now possible to use LIMIT combined with ORDER BY in subqueries and SELECT statements in brackets that are terms of UNION or other set operations.
-
-An ORDER BY or LIMIT clause applies to the complete result of the UNION and other set operations or alternatively to one of its components depending on how parentheses are used. In the first example the scope is the second SELECT, while in the second query, the scope is the result of the UNION.
-
-SELECT ... FROM ... UNION 
-(SELECT ... FROM ... ORDER BY .. LIMIT)
-
-SELECT ... FROM ... UNION 
-SELECT ... FROM ... ORDER BY .. LIMIT
-
-
-Support for ORDER BY, LIMIT and OFFSET in CREATE VIEW statements
-
-----------------
-
-COLLATIONS
-
-Each database can have its own collation. The SQL command below sets the collation from the set of collations in the source for org.hsqldb.Collation:
-
-SET DATABASE COLLATION <double quoted collation name>
-
-The command has an effect only on an empty database. Once it has been issued, the database can be opened in any JVM locale and will retain its collation.
-
-The property sql.compare_in_locale=true is no longer supported. If the line exists in a .properties file, it will switch the database to the collation for the current default.  
-
-----------------
-
-NAME RESOLUTION IN QUERIES
-
-Parsing enhancements allow all reserved SQL words to be used as identifiers when double-quoted and then used in queries. E.g. CREATE TABLE "TABLE" ("INTEGER" INTEGER)
-
-Enhancements to resolve column and table aliases used in query conditions.
-
-----------------
-
-ENHANCEMENTS
-
-Since 1.7.3, the evaluation of BOOLEAN expressions has changed to conform to SQL standards. Any such expression can be TRUE, FALSE, or UNDEFINED. The UNDEFINED result is equivalent to NULL.
-
-Optional changed behaviour of transactions in the default READ UNCOMMITTED mode. When a database property, sql.tx_no_multi_write=true has been set, a transaction is no longer allowed to delete or update a row that has already been updated or added by another uncommitted transaction.
-
-Support for correct casting of TIME into TIMESTAMP, using CURRENT_DATE 
-
-
-----------------
-
-BUG FIXES
-
-Fixed reported bug with NOT LIKE and null values
-
-Fixed bug with OR conditions in OUTER JOIN
-
-Fixed bug with duplicated closing of prepared statements
-
-Fixed various parsing anomalies where SQL commands were accepted when quoted, double-quoted or prefixed with an identifier, or identifiers were accepted in single quotes. Example of a command that is no-longer tolerated: 
-
-Malformed query: MY. "SELECT" ID FROM 'CUSTOMER' IF.WHERE ID=0;   
-Actual query: SELECT ID FROM CUSTOMER WHERE ID=0;
-
-Fixed issue with illegal user names
-
-Fixed TEXT table implementation to maintain the commit status of rows during recovery from an abrupt shutdown. Uncommitted changes will not appear in TEXT tables.
-
-----------------
-
-STORAGE AND PERSISTENCE IMPROVEMENTS
-
-New connection property for setting the default table type when CREATE TABLE is used. The connection property, hsqldb.default_table_type=cached will set the default to CACHED tables, or the SET PROPERTY command can be used. Values, "cached" and "memory" are allowed.
- 
-
-Improved support for text tables. Newline support in quoted fields is now complete. It is now possible to save and restore the first line header of a CSV file when ignore_first=true is specified. When a text table is created with a new source (CSV) file, and ignore_first=true has been specified the following command can be used to set a user defined string as the first line:
-SET TABLE <table name> SOURCE HEADER <double quoted string>.
-
-A new application log has been introduced as an optional feature. The property/value pair "hsqldb.applog=1" can be used in the first connection string to log some important messages. The default is "hsqldb.applog=0", meaning no logging. A file with the ending ".app.log" is generated alongside the rest of the database files for this purpose. 
-
-In the current version, only the classes used for file persistence, plus any error encountered while processing the .log file after an abnormal end, are logged.
-
-Note that the JDBC driver and the engine for 1.8.0 cannot be mixed with those of earlier versions in client/server setup. Check your classpaths and use the same version of the engine for both client and server.
-
-New property for larger data file limits is introduced. Once set, the limit will go up to 8GB. The property can be set with the following SQL command only when the database has no tables (new database).
-
-SET PROPERTY "hsqldb.cache_file_scale" 8
-
-To apply the change to an existing database, SHUTDOWN SCRIPT should be performed first, then the property=value line below should be added to the .properties file before reopening the database:
-
-hsqldb.cache_file_scale=8
-
-
-New property allows a CHECKPOINT DEFRAG to be performed automatically whenever CHECKPOINT is performed internally or via a user command.
-
-SET CHECKPOINT DEFRAG n
-
-The parameter n is the megabytes of abandoned space in the .data file. When a CHECKPOINT is performed either as a result of the .log file reaching the limit set by "SET LOGSIZE m", or by the user issuing a CHECKPOINT command, the amount of space abandoned during the session is checked and if it is larger than n, a CHECKPOINT DEFRAG is performed instead of a checkpoint.
-
-Rewrite of log and cache handling classes, including:
-New deleted block manager with more efficient deleted block reuse.
-Faster log processing after an abnormal termination.
-Better checks when maximum data file size is reached.
-Better recovery when maximum data file size is reached.
-
-Support for the res: connection protocol (database files in a jar) has been
-extended to allow CACHED tables.
-
-----------------
-
-JDBC AND OTHER ENHANCEMENTS
-
-ResultSetMetaData reports identical precision/scale in embedded and client/server modes
-
-When PreparedStatement.setTimestamp() and ResultSet.getTimestamp() are used with a Calendar parameter, the result is symmetrical if the time zones are equal.
-
-Added public shutdown() method to Server.
-
-Enhancements to DatabaseManagerSwing and SqlTool
-
-----------------
-
-BUG FIX
-
-Fixed bug where two indexes where switched, causing wrong results in some queries in the following circumstances:
-
-CREATE TABLE is executed.
-ALTER TABLE ADD FORIEGN KEY is used to create an FK on a different table that was already present when the first command was issued.
-CREATE INDEX is used to add an index.
-Data is added to the table.
-Database is shutdown.
-Database is restarted.
-At this point the indexes are switched and queries that use either of the indexes will not return the correct set of rows. If data is not added prior to the first shutdown, the database will works as normal.
-
-----------------
-
-UPGRADING DATABASES
-
-Databases that do not contain CACHED tables can be opened with the new version. For databases with CACHED tables, if they are created with versions 1.7.2 or 1.7.3, the SHUTDOWN SCRIPT command should be run once on the database prior to opening with the new version. For databases created with earlier versions, the instructions in the Advanced Topics section of The Guide should be followed.
-
-----------------
-
-OPEN OFFICE INTEGRATION
-
-When used in OpenOffice.org as the default database, several defaults and properties are set automatically:
-
-CREATE TABLE ... defaults to CREATE CACHED TABLE ...
-hsqldb.cache_scale=13
-hsqldb.cache_size_scale=8
-hsqldb.log_size=10
-SET WRITE DELAY 2
-sql.enforce_strict_size=true
-
-
-
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/databaseinjar.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/databaseinjar.txt
deleted file mode 100644
index 3383501955..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/databaseinjar.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-A patch for storing a readonly hsqldb database in a Jar was contributed by Brendan Ryan
-and has been incorporated into the code base. Additional work on connection URL
-allow more uniform access to this feature.
-
-The steps required are as follows:
-
-Ensure the database does not contain CACHED or TEXT tables.
-Make the database radonly after a SHUTDOWN.
-Include the two database files *.properties and *.script in a directory in your Jar
-Access the database with the jdbc:hsqldb:res: protocol
-
-The relative location of the database as taken from the jdbc url is used.
-For example, if the url is specified as "jdbc:hsqldb:res:/testdata/felder"
-then the database is loaded from the "/testdata/" directory in the jar
-and the database file names are "felder.properties" and
-felder.script" in that directory.
-
-Brendan Ryan wrote (text and sample changed):
-
-I have made a small change to allow a readonly hsqldb database (.script and
-.properties) to be stored in a JAR file so that it can be used with JWS.
-
-A sample jnlp file is given below.
-
-I hope the code is useful for someone.
-
-Regards
-Brendan Ryan
--->
-
-<jnlp spec="1.0+" codebase="file:///c:/ERM/internet/build/pass/">
-<information>
-  <title>Mask Builder</title>
-  <vendor>PUI</vendor>
-  <homepage href="http://www.pi-ag.com" />
-  <description>Demonstration of JNLP</description>
-  <icon href="raptor.gif"/>
-</information>
-<offline-allowed/>
-<security>
-  <all-permissions/>
-</security>
-<resources>
-  <j2se version="1.4+" />
-  <jar href="pass-maskbuilder.jar"/>
-  <jar href="jaxb-rt-1.0-ea.jar"/>
-  <jar href="hsqldb.jar"/>
-  <jar href="testdb.jar"/>
-  <property name="jdbc.drivers" value="org.hsqldb.jdbcDriver"/>
-  <property name="jdbc.url" value="jdbc:hsqldb:res:/testdata/felder"/>
-  <property name="jdbc.user" value="sa"/>
-  <property name="jdbc.password" value="" />
-</resources>
-<application-desc />
-</jnlp>
-
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlFindFile.html b/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlFindFile.html
deleted file mode 100644
index 55f34afc55..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlFindFile.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
-<title>HSQLDB Find File Sample Application</title>
-</head>
-<body bgcolor=#FFFFFF lang=EN-GB class="Normal">
-<h2>HSQLDB  Find File Sample Application</h2>
-<p>This application builds a database of a directory tree and allows you to search 
-  the database.</p>
-<p>This example application is designed for programmers who are new to the JDBC. 
-  The functionality is kept low, so it should be easy to understand what is going 
-  on. It connects, execute queries and inserts data into the database. </p>
-<p>First, the database must be initialized with a path. All the file names in 
-  this directory and all its subdirectories will be stored in the database. After 
-  this is done, the database can be searched for files that match a specific pattern. 
-</p>
-<p>This sample application is not compiled as part of the hsqldb jar. You should 
-  compile it yourself. You should modify the following examples to include the 
-  correct location of the hsqldb.jar in the commands. </p>
-<h4>Usage</h4>
-<p>Re-create database from directory '.': </p>
-<p><code><span style='font-size:10.0pt;font-family:"Courier New"'>java -classpath 
-  hsqldb.jar org.hsqldb.sample.FindFile -init .</span></code> </p>
-<p>Find files like 'name': </p>
-<p><code><span style='font-size:10.0pt;font-family:"Courier New"'>java -classpath 
-  hsqldb.jar org.hsqldb.sample.FindFile name</span></code> </p>
-<p><font size="-1">This text is based on HypersonicSQL documentation, updated to reflect the latest version of HSQLDB</font></p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlSoftwareLinks.html b/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlSoftwareLinks.html
deleted file mode 100644
index f545bfb5fa..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlSoftwareLinks.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<HTML>

-<h3>ANNOUNCEMENTS OF SOME ADDITIONAL SOFTWARE THAT CAN POSSIBLY BE USED WITH HSQLDB</h3>

-<p>&nbsp;</p>

-<p>This document is a compilation of some information that has been submitted to HSQLDB mailing lists or forums.  The HSQLDB project or its developers are not responsible for the software mentioned in this document, its suitability for any purpose, or the accuracy of the information provided in this document.</p>

-<hr>

-<p>LightCrypto is a set of Open Source Java<br>

-  classes with basic cryptographic routines using the BouncyCastle lightweight API.</p>

-<p>It uses a minimal amount of memory so it can be used with J2ME, browser applets, on small Java devices such as PDA's or Java enabled mobile phones or in any other situation where Sun's JCE (Java Cryptographic<br>

-  Extensions) is too heavy for the job.</p>

-<p>Hsqldb-ready functions are also included.</p>

-<p>Feature list:</p>

-<p># Create digest from strings and files with MD5 (default), SHA-1, SHA-256 , SHA-512 or RIPEMD160 hash algorithms<br>

-  # Encrypt/Decrypt strings and files using the AES (lightweight implementation) algorithm with any keylength (default 128 bits) in CBC mode with PKCS12 padding.<br>

-  # Encrypts the symmetric keystore and protects it with a passphrase (PBE)<br>

-  # Functions to hash/encrypt/decrypt data in HSQLDB embeddable database engine using SQL statements.<br>

-  # Open Source<br>

-  # 100% Java<br>

-  # Uses the BouncyCastle.org lightweight API instead of Sun's JCE (Java Cryptographic Extensions)</p>

-<p>Homepage: <a href="http://jcetaglib.sourceforge.net/lightcrypto/">http://jcetaglib.sourceforge.net/lightcrypto/</a></p>

-<p>Beta 1 (including HSqldb routines + examples) has been released and can be downloaded on<br>

-  <a href="http://sourceforge.net/project/showfiles.php?group_id=60642">http://sourceforge.net/project/showfiles.php?group_id=60642</a></p>

-<hr>

-<p>Open source, lightweight cryptography extensions to Java for use with LightCrypto or HSQLDB for SSL access can be found here:</p>

-<p><a href="http://www.bouncycastle.org/">http://www.bouncycastle.org/</a></p>

-<hr>

-<p>The open-source FormattedDataSet may be the easiest way to generate dynamic text such as HTML, and XML. </p>

-<p>I just deployed a demo WAR that allows developers to enter any hsqldb join and render the results as an HTML table that can be sorted by clicking on the column headers. I picked hsqldb for my database as I didn't want anyone that installed the war to have to worry about installing a database. </p>

-<p>The demo also times opening/closing Connections, ResultSets and Statements. This WAR would be useful for you guys to give out to demonstrate your database.</p>

-<p>The demo works with any RDBMS. </p>

-<p>Check it out at <a href="http://www.fdsapi.com">http://www.fdsapi.com</a> and select the live demo link.</p>

-<p>&nbsp;</p>

-<p>&nbsp;</p>

-

-

-</HTML>

-

diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqldb_lic.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqldb_lic.txt
deleted file mode 100644
index 953bfa0a29..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqldb_lic.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (c) 2001-2005, The HSQL Development Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, 
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/hypersonic_lic.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/hypersonic_lic.txt
deleted file mode 100644
index 014bf60eb9..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/hypersonic_lic.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright (c) 1995-2000, The Hypersonic SQL Group.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the Hypersonic SQL Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, 
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals 
- * on behalf of the Hypersonic SQL Group.
- *
- *
- * For work added by the HSQL Development Group:
- * 
- * Copyright (c) 2001-2004, The HSQL Development Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, 
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme-docauthors.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/readme-docauthors.txt
deleted file mode 100644
index a3418bdc14..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme-docauthors.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-HOW TO CREATE AND WORK WITH DOCBOOK DOCUMENTS FOR HSQLDB
-
-At some point, this document itself should be converted to DocBook format.
-
-
-Our DocBook strategy is still subject to change.  For now...
-
-
-TO CREATE A NEW DOCBOOK BOOK
-
-Think up a base filename for your document.
-It should be nice and short, without funny characters (but hyphens, other
-than leading hypends, are ok).  Example:  sqltool.
-Hereafter, I'll refer to this as your "book name".
-
-Create a subdirectory of "docsrc" with name of your book name.
-I'll refer to this directory (docsrc + book name) as "your book directory".
-
-Inside your book directory, create your main DocBook source file with name
-of your book name + ".xml", e.g. "sqltool.xml".
-
-Your DocBook document may reference or include shared files in the
-main 'docsrc' directory as well as any files which you put into your
-book directory.
-You may want to include sample .java files, screen shots, or component
-DocBook source files.
-Usually you will just copy these files right into your book directory.
-
-For examples of just about everything, see .../docsrc/sqltool/sqltool.xml.
-Notice that sqltool.xml pulls in a document section from the main docsrc
-directory.
-
-Add your book name to the .cvsignore file in the doc directory.
-
-Until all of the CVS artifacts are moved out of the "doc" directory,
-you will need to edit the clean-doc target in the build.xml file in
-the build directory so that it will remove the derived files for
-your book from under the doc directory.
-
-
-HOW TO REFERENCE OR INCLUDE OTHER FILES IN YOUR DOCBOOK SOURCE FILE(s).
-
-To link to outside documents (which you supply or not), you'll usually
-use the DocBook <ulink> element.
-
-To "import" other documents, just use the general external parsed entity 
-mechanism.
-This is a basic DTD-style XML feature where you use macros like
-&entityname;.  Either find an XML reference or look around our existing
-DocBook source files for an example to follow.
-
-One tricky point is how to include external files verbatim.
-If you just read in external files as parsed entities, they will be parsed
-as DocBook source (and therefore they must consist of, at least, legal
-XML)*.
-But often you will want to import a real, working file (like a 
-configuration file, sql file, Java source file), and you won't want to
-hack it up just so you can import it.
-(For one thing, you shouldn't have to; for another, you may want to 
-provide a link to the file for download, so you wouldn't want people
-to download a hacked-up version).
-It would be nice if you could CDATA, then include the entity, but that
-won't work since the &...; inclusion directive would thereby be escaped.
-If you don't know what the hell CDATA is, just follow the instructions
-in the next paragraph.
-
-To import a document verbatim, define an external parsed entity for 
-the file ../../docwork/BOOKNAME/cdata/file.name, where BOOKNAME is 
-your book name and file.name is the name of the file to be imported
-(which resides in the current directory).
-If you want to know, what will happen is, the Ant build will copy the 
-file-to-be-imported to the directory .../docwork/BOOKNAME/cdata and will 
-sandwich it in a CDATA directive.
-If you want to provide a link to the document, you just ulink to 
-the document in the current directory, not to the one in the cdata
-
-POSTNOTE:  The long-term way to do this is with XInclude, or some
-other generic XML inclusion mechanism.  Unfortunately, none of the
-good methods work with the Java ports of DocBook!
-
-
-=======================================================================
-
-CONVENTIONS
-
-Please use <remark> elements to mark up notes for yourself or for
-other developers.
-All <remark>s should be removed before the doc goes public!
-
-Please capitalize HSQLDB like "Hsqldb" in titles, and capitalize like
-"HSQLDB" elsewhere.  (In filepaths and package names you code as
-required for the filepath or package name, of course).
-
-=======================================================================
-
-TIPS
-
-When closing DocBook <screen> and <programlisting> elements, make
-sure that there is no line break after the text to display and before
-the closing </screen> or </programlisting> tag.
-Otherwise the resultant display will not look right.
-
-Don't capitalize words or phrases to emphasize them (including in
-section titles or headings).
-If you want to emphasize something a certain way, then use a DocBook
-emphasis role, and leave the presentation decisions to the style sheets.
-It is very easy to set a CSS style to capitalize headings if you want
-them to appear that way.
-
-
-
-* Theoretically it would be better and SHOULD be simpler to use
-unparsed entities for this purpose, but unparsed entities are a 
-messy legacy feature of DTD which is more convoluted than the 
-strategy described here.
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/readme.txt
deleted file mode 100644
index 87f934c8fd..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Readme FileAugust 2007
-
This package contains HSQLDB 1.8.0.8
-
-HSQLDB is a relational database engine and a set of tools written in Java.The file index.html in this directory contains the list of directories with their contents.Documentation and license information can be found in the /doc directory.Project home page: http://hsqldb.orgPlease check the site periodically for updated versions.
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme_linux.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/readme_linux.txt
deleted file mode 100644
index 6a435d98f3..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme_linux.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Readme Linux
-
-$Id$
-Query CVS for revision history.
-
-It is recommended to run the shell scripts(from /bin and /demo) from the 
-console, as you will not to be able see any messages from the desktop.
-You should set the env variable $JAVA_HOME before running any of the sripts,
-or you can use the -jdkhome switch instead to specify the JDK.
-
-See the UNIX Quick Start chapter of the Hsqldb User Guide about how to use
-the UNIX init script 'hsqldb'.
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/license.html b/plugins/org.eclipse.net4j.db.hsqldb/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/plugin.properties b/plugins/org.eclipse.net4j.db.hsqldb/plugin.properties
deleted file mode 100644
index 75b083ee3d..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j DB HSQLDB (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/plugin.xml b/plugins/org.eclipse.net4j.db.hsqldb/plugin.xml
deleted file mode 100644
index da4c6c9046..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.net4j.db.dbAdapters">
-      <dbAdapter
-            class="org.eclipse.net4j.db.internal.hsqldb.HSQLDBAdapter"
-            name="hsqldb"
-            version="1.8.0.8">
-      </dbAdapter>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/HSQLDBDataSource.java b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/HSQLDBDataSource.java
deleted file mode 100644
index 54abfcd512..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/HSQLDBDataSource.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.hsqldb;
-
-import org.hsqldb.jdbc.jdbcDataSource;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class HSQLDBDataSource extends jdbcDataSource
-{
-  private static final long serialVersionUID = 1L;
-
-  public HSQLDBDataSource()
-  {
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("HSQLDBDataSource[database={0}, user={1}]", getDatabase(), getUser());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/HSQLDBAdapter.java b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/HSQLDBAdapter.java
deleted file mode 100644
index 1d0faecfa9..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/HSQLDBAdapter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.internal.hsqldb;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.internal.db.DBAdapter;
-import org.eclipse.net4j.internal.db.ddl.DBField;
-
-import org.hsqldb.jdbcDriver;
-import org.hsqldb.jdbc.jdbcDataSource;
-
-import javax.sql.DataSource;
-
-import java.sql.Driver;
-
-/**
- * @author Eike Stepper
- */
-public class HSQLDBAdapter extends DBAdapter
-{
-  private static final String NAME = "hsqldb";
-
-  public static final String VERSION = "1.8.0.8";
-
-  public HSQLDBAdapter()
-  {
-    super(NAME, VERSION);
-  }
-
-  public Driver getJDBCDriver()
-  {
-    return new jdbcDriver();
-  }
-
-  public DataSource createJDBCDataSource()
-  {
-    return new jdbcDataSource();
-  }
-
-  @Override
-  protected String getTypeName(DBField field)
-  {
-    DBType type = field.getType();
-    switch (type)
-    {
-    case BOOLEAN:
-    case BIT:
-    case TINYINT:
-    case SMALLINT:
-    case INTEGER:
-    case BIGINT:
-    case FLOAT:
-    case REAL:
-    case DOUBLE:
-    case DATE:
-    case TIME:
-    case TIMESTAMP:
-      return type.toString();
-
-    case LONGVARCHAR:
-      return "LONGVARCHAR";
-
-    case LONGVARBINARY:
-      return "LONGVARBINARY";
-
-    case BLOB:
-      return "LONGVARBINARY";
-
-    case CLOB:
-      return "LONGVARCHAR";
-
-    case CHAR:
-    case VARCHAR:
-    case BINARY:
-    case VARBINARY:
-      return type.toString() + field.formatPrecision();
-
-    case NUMERIC:
-    case DECIMAL:
-      return type.toString() + field.formatPrecisionAndScale();
-    }
-
-    return super.getTypeName(field);
-  }
-
-  public String[] getReservedWords()
-  {
-    return getSQL92ReservedWords();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/bundle/OM.java b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/bundle/OM.java
deleted file mode 100644
index debc451aaf..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/bundle/OM.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.internal.hsqldb.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.db.hsqldb"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_SQL = DEBUG.tracer("sql"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.mysql/.classpath b/plugins/org.eclipse.net4j.db.mysql/.classpath
deleted file mode 100644
index 600710b4fa..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/.classpath
+++ /dev/null
@@ -1,8 +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 exported="true" kind="lib" path="lib/mysql-connector-java-5.1.5-bin.jar" sourcepath="org.eclipse.net4j.db.mysqlsrc.zip"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.net4j.db.mysql/.cvsignore b/plugins/org.eclipse.net4j.db.mysql/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.net4j.db.mysql/.options b/plugins/org.eclipse.net4j.db.mysql/.options
deleted file mode 100644
index f51f13b930..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/.options
+++ /dev/null
@@ -1,4 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.db.mysql/debug = true
-org.eclipse.net4j.db.mysql/debug.sql = true
diff --git a/plugins/org.eclipse.net4j.db.mysql/.project b/plugins/org.eclipse.net4j.db.mysql/.project
deleted file mode 100644
index 306afc02c4..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.db.mysql</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b03bd9c174..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:43:31 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 50975d333f..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:43:31 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
deleted file mode 100644
index 5324223030..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.db.mysql;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .,
- lib/mysql-connector-java-5.1.5-bin.jar
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.db;visibility:=reexport
-Export-Package: com.mysql.jdbc,
- com.mysql.jdbc.exceptions,
- com.mysql.jdbc.exceptions.jdbc4,
- com.mysql.jdbc.integration.c3p0,
- com.mysql.jdbc.integration.jboss,
- com.mysql.jdbc.interceptors,
- com.mysql.jdbc.jdbc2.optional,
- com.mysql.jdbc.log,
- com.mysql.jdbc.profiler,
- com.mysql.jdbc.util,
- org.eclipse.net4j.db.internal.mysql;version="0.8.0",
- org.gjt.mm.mysql
-Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.mysql/about.html b/plugins/org.eclipse.net4j.db.mysql/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/about.html
+++ /dev/null
@@ -1,28 +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.db.mysql/build.properties b/plugins/org.eclipse.net4j.db.mysql/build.properties
deleted file mode 100644
index 8d14192ae0..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               .options,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               plugin.xml,\
-               lib/,\
-               lib/mysql-connector-java-5.1.5-bin.jar
diff --git a/plugins/org.eclipse.net4j.db.mysql/copyright.txt b/plugins/org.eclipse.net4j.db.mysql/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.mysql/epl-v10.html b/plugins/org.eclipse.net4j.db.mysql/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/.cvsignore b/plugins/org.eclipse.net4j.db.mysql/lib/.cvsignore
deleted file mode 100644
index d392f0e82c..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/CHANGES b/plugins/org.eclipse.net4j.db.mysql/lib/CHANGES
deleted file mode 100644
index c0cbc52238..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/CHANGES
+++ /dev/null
@@ -1,3753 +0,0 @@
-# Changelog
-# $Id$
-10-09-07 - Version 5.1.5
-
-    - Released instead of 5.1.4 to pickup patch for BUG#31053
-      from 5.0.8.
-      
-10-09-07 - Version 5.1.4 
-
-    - Added "autoSlowLog" configuration property, overrides 
-      "slowQueryThreshold*" properties, driver determines slow
-      queries by those that are slower than 5 * stddev of the mean
-      query time (outside the 96% percentile).
-      
-    - Fixed BUG#28256 - When connection is in read-only mode, 
-      queries that are wrapped in parentheses incorrectly identified 
-      as DML.
-       
-09-07-07 - Version 5.1.3 RC
-
-	- Setting "useBlobToStoreUTF8OutsideBMP" to "true" tells the
-	  driver to treat [MEDIUM/LONG/TINY]BLOB columns as [LONG]VARCHAR
-	  columns holding text encoded in UTF-8 that has characters
-	  outside the BMP (4-byte encodings), which MySQL server
-	  can't handle natively.
-
-	  Set "utf8OutsideBmpExcludedColumnNamePattern" to a regex so that
-	  column names matching the given regex will still be treated
-	  as BLOBs The regex must follow the patterns used for the
-	  java.util.regex package. The default is to exclude no columns,
-	  and include all columns.
-
-	  Set "utf8OutsideBmpIncludedColumnNamePattern" to specify exclusion
-	  rules to "utf8OutsideBmpExcludedColumnNamePattern". The regex must
-	  follow the patterns used for the java.util.regex package.
-
-	- New methods on com.mysql.jdbc.Statement: setLocalInfileInputStream()
-	  and getLocalInfileInputStream().
-
-	  setLocalInfileInputStream() sets an InputStream instance that will be used to send data
-      to the MySQL server for a "LOAD DATA LOCAL INFILE" statement
-      rather than a FileInputStream or URLInputStream that represents
-      the path given as an argument to the statement.
-
-      This stream will be read to completion upon execution of a
-      "LOAD DATA LOCAL INFILE" statement, and will automatically
-      be closed by the driver, so it needs to be reset
-      before each call to execute*() that would cause the MySQL
-      server to request data to fulfill the request for
-      "LOAD DATA LOCAL INFILE".
-
-      If this value is set to NULL, the driver will revert to using
-      a FileInputStream or URLInputStream as required.
-
-      getLocalInfileInputStream() returns the InputStream instance that will be used to send
-      data in response to a "LOAD DATA LOCAL INFILE" statement.
-
-      This method returns NULL if no such stream has been set
-      via setLocalInfileInputStream().
-
-    - The driver now connects with an initial character set
-      of "utf-8" solely for the purposes of authentication to
-      allow usernames and database names in any character set to
-      be used in the JDBC URL.
-
-    - Errors encountered during Statement/PreparedStatement/CallableStatement.executeBatch()
-      when "rewriteBatchStatements" has been set to "true" now return
-      BatchUpdateExceptions according to the setting of "continueBatchOnError".
-      
-      If "continueBatchOnError" is set to "true", the update counts for the
-      "chunk" that were sent as one unit will all be set to EXECUTE_FAILED, but
-      the driver will attempt to process the remainder of the batch. You can determine which
-      "chunk" failed by looking at the update counts returned in the BatchUpdateException.
-      
-      If "continueBatchOnError" is set to "false", the update counts returned
-      will contain the failed "chunk", and stop with the failed chunk, with all 
-      counts for the failed "chunk" set to EXECUTE_FAILED.
-      
-      Since MySQL doesn't return multiple error codes for multiple-statements, or
-      for multi-value INSERT/REPLACE, it is the application's responsibility to handle 
-      determining which item(s) in the "chunk" actually failed.
-      
-    - Statement.setQueryTimeout()s now affect the entire batch for batched 
-      statements, rather than the individual statements that make up the batch.
-      
-06-29-07 - Version 5.1.2 Beta
-
-    - Setting the configuration property "rewriteBatchedStatements"
-      to "true" will now cause the driver to rewrite batched prepared
-      statements with more than 3 parameter sets in a batch into
-      multi-statements (separated by ";") if they are not plain
-      (i.e. without SELECT or ON DUPLICATE KEY UPDATE clauses) INSERT
-      or REPLACE statements.
-
-06-22-07 - Version 5.1.1 Alpha
-
-    - Pulled vendor-extension methods of Connection implementation out
-      into an interface to support java.sql.Wrapper functionality from
-      ConnectionPoolDataSource. The vendor extensions are javadoc'd in
-      the com.mysql.jdbc.Connection interface.
-
-      For those looking further into the driver implementation, it is not
-      an API that is used for plugability of implementations inside our driver
-      (which is why there are still references to ConnectionImpl throughout the
-      code).
-
-      Incompatible change: Connection.serverPrepare(String) has been re-named
-      to Connection.serverPrepareStatement() for consistency with
-      Connection.clientPrepareStatement().
-
-      We've also added server and client prepareStatement() methods that cover
-      all of the variants in the JDBC API.
-
-    - Similar to Connection, we pulled out vendor extensions to Statement
-      into an interface named "com.mysql.Statement", and moved the Statement
-      class into com.mysql.StatementImpl. The two methods (javadoc'd in
-      "com.mysql.Statement" are enableStreamingResults(), which already existed,
-      and disableStreamingResults() which sets the statement instance back to
-      the fetch size and result set type it had before enableStreamingResults()
-      was called.
-
-    - Added experimental support for statement "interceptors" via the
-      com.mysql.jdbc.StatementInterceptor interface, examples are
-      in com/mysql/jdbc/interceptors.
-
-      Implement this interface to be placed "in between" query execution, so that
-      you can influence it. (currently experimental).
-
-      StatementInterceptors are "chainable" when configured by the user, the
-      results returned by the "current" interceptor will be passed on to the next
-      on in the chain, from left-to-right order, as specified by the user in the
-      JDBC configuration property "statementInterceptors".
-
-      See the sources (fully javadoc'd) for com.mysql.jdbc.StatementInterceptor
-      for more details until we iron out the API and get it documented in the
-      manual.
-
-    - Externalized the descriptions of connection properties.
-
-    - The data (and how it's stored) for ResultSet rows are now behind an
-      interface which allows us (in some cases) to allocate less memory
-      per row, in that for "streaming" result sets, we re-use the packet
-      used to read rows, since only one row at a time is ever active.
-
-    - Made it possible to retrieve prepared statement parameter bindings
-      (to be used in StatementInterceptors, primarily).
-
-    - Row navigation now causes any streams/readers open on the result set
-      to be closed, as in some cases we're reading directly from a shared network
-      packet and it will be overwritten by the "next" row.
-
-    - Setting "rewriteBatchedStatements" to "true" now causes CallableStatements
-      with batched arguments to be re-written in the form "CALL (...); CALL (...); ..."
-      to send the batch in as few client-server round trips as possible.
-
-    - Driver now picks appropriate internal row representation (whole row in one
-      buffer, or individual byte[]s for each column value) depending on heuristics,
-      including whether or not the row has BLOB or TEXT types and the overall
-      row-size. The threshold for row size that will cause the driver to
-      use a buffer rather than individual byte[]s is configured by the
-      configuration property "largeRowSizeThreshold", which has a default
-      value of 2KB.
-
-04-11-07 - Version 5.1.0 Alpha
-
-	- Bumped JDBC Specification version number in jar-file manifest.
-
-	- Re-worked Ant buildfile to build JDBC-4.0 classes separately, as well
-	  as support building under Eclipse (since Eclipse can't mix/match JDKs).
-
-	  To build, you must set JAVA_HOME to J2SDK-1.4.2 or Java-5, and set
-	  the following properties on your Ant commandline:
-
-	  com.mysql.jdbc.java6.javac - full path to your Java-6 javac executable
-	  com.mysql.jdbc.java6.rtjar - full path to your Java-6 rt.jar file
-
-	- New feature - driver will automatically adjust session variable
-	  "net_write_timeout" when it determines its been asked for a "streaming"
-	  result, and resets it to the previous value when the result set
-	  has been consumed. (configuration property is named
-	  "netTimeoutForStreamingResults", value has unit of seconds,
-	  the value '0' means the driver will not try and adjust this value).
-
-    - Added support for JDBC-4.0 categorized SQLExceptions.
-
-	- Refactored CommunicationsException into a JDBC3 version, and a JDBC4
-	  version (which extends SQLRecoverableException, now that it exists).
-
-	  This change means that if you were catching
-	  com.mysql.jdbc.CommunicationsException in your applications instead
-	  of looking at the SQLState class of "08", and are moving to Java 6
-	  (or newer), you need to change your imports to that exception
-	  to be com.mysql.jdbc.exceptions.jdbc4.CommunicationsException, as
-	  the old class will not be instantiated for communications link-related
-	  errors under Java 6.
-
-	- Added support for JDBC-4.0's client information. The backend storage
-	  of information provided via Connection.setClientInfo() and retrieved
-	  by Connection.getClientInfo() is pluggable by any class that implements
-	  the com.mysql.jdbc.JDBC4ClientInfoProvider interface and has a no-args
-	  constructor.
-
-	  The implementation used by the driver is configured using the
-	  "clientInfoProvider" configuration property (with a default of value
-	  of "com.mysql.jdbc.JDBC4CommentClientInfoProvider", an implementation
-	  which lists the client info as a comment prepended to every query
-	  sent to the server).
-
-	  This functionality is only available when using Java-6 or newer.
-
-	- Added support for JDBC-4.0's SQLXML interfaces.
-
-	- Added support for JDBC-4.0's Wrapper interface.
-
-	- Added support for JDBC-4.0's NCLOB, and NCHAR/NVARCHAR types.
-
-10-09-07 - Version 5.0.8
-
-    - Fixed BUG#30550, executeBatch() would fail with an ArithmeticException
-      and/or NullPointerException when the batch had zero members and
-      "rewriteBatchedStatements" was set to "true" for the connection.
-    
-    - Added two configuration parameters (both default to "false")
-    
-            * blobsAreStrings  - Should the driver always treat BLOBs as Strings 
-                                 specifically to work around dubious metadata returned 
-                                 by the server for GROUP BY clauses?
-            
-            * functionsNeverReturnBlobs - Should the driver always treat data from 
-                                          functions returning BLOBs as Strings - 
-                                          specifically to work around dubious metadata 
-                                          returned by the server for GROUP BY clauses?
-
-    - Fixed BUG#29106 - Connection checker for JBoss didn't use same method parameters
-      via reflection, causing connections to always seem "bad".
-      
-    - Fixed BUG#30664 - Note that this fix only works for MySQL server 
-      versions 5.0.25 and newer, since earlier versions didn't consistently 
-      return correct metadata for functions, and thus results from 
-      subqueries and functions were indistinguishable from each other, 
-      leading to type-related bugs.
-
-    - Fixed BUG#28972 - DatabaseMetaData.getTypeInfo() for the types DECIMAL
-      and NUMERIC will return a precision of 254 for server versions older than
-      5.0.3, 64 for versions 5.0.3-5.0.5 and 65 for versions newer than 5.0.5.
-    
-    - Fixed BUG#29852 - Closing a load-balanced connection would cause a
-      ClassCastException.
-    
-    - Fixed BUG#27867 - Schema objects with identifiers other than
-      the connection character aren't retrieved correctly in 
-      ResultSetMetadata.
-      
-    - Fixed BUG#28689 - CallableStatement.executeBatch() doesn't work when 
-      connection property "noAccessToProcedureBodies" has been set to "true".
-     
-      The fix involves changing the behavior of "noAccessToProcedureBodies",in 
-      that the driver will now report all paramters as "IN" paramters
-      but allow callers to call registerOutParameter() on them without throwing
-      an exception.
-      
-    - Fixed BUG#27182 - Connection.getServerCharacterEncoding() doesn't work
-      for servers with version >= 4.1.
-
-    - Fixed BUG#27915 - DatabaseMetaData.getColumns() doesn't
-      contain SCOPE_* or IS_AUTOINCREMENT columns.
-
-    - Fixed BUG#30851, NPE with null column values when
-      "padCharsWithSpace" is set to "true".
-    
-    - Specifying a "validation query" in your connection pool 
-      that starts with "/* ping */" _exactly_ will cause the driver to 
-      instead send a ping to the server and return a fake result set (much 
-      lighter weight), and when using a ReplicationConnection or a LoadBalancedConnection, 
-      will send the ping across all active connections.
-      
-    - Fixed Bug#30892 setObject(int, Object, int, int) delegate in
-      PreparedStatmentWrapper delegates to wrong method.
-      
-    - XAConnections now start in auto-commit mode (as per JDBC-4.0 specification
-      clarification).
-     
-    - Fixed Bug#27412 - cached metadata with PreparedStatement.execute()
-      throws NullPointerException.
-      
-    - Driver will now fall back to sane defaults for max_allowed_packet and
-      net_buffer_length if the server reports them incorrectly (and will log
-      this situation at WARN level, since it's actually an error condition).
-    
-    - Fixed BUG#27916 - UNSIGNED types not reported via DBMD.getTypeInfo(), and 
-      capitalization of type names is not consistent between DBMD.getColumns(), 
-      RSMD.getColumnTypeName() and DBMD.getTypeInfo().
-
-      This fix also ensures that the precision of UNSIGNED MEDIUMINT
-      and UNSIGNED BIGINT is reported correctly via DBMD.getColumns().
-
-    - Fixed BUG#31053 - Connections established using URLs of the form
-      "jdbc:mysql:loadbalance://" weren't doing failover if they tried to 
-      connect to a MySQL server that was down. The driver now attempts
-      connections to the next "best" (depending on the load balance strategy
-      in use) server, and continues to attempt connecting to the next "best"
-      server every 250 milliseconds until one is found that is up and running 
-      or 5 minutes has passed.
-      
-      If the driver gives up, it will throw the last-received SQLException.
-      
-07-19-07 - Version 5.0.7
-
-    - Setting the configuration parameter "useCursorFetch" to "true" for
-      MySQL-5.0+ enables the use of cursors that allow Connector/J to save
-      memory by fetching result set rows in chunks (where the chunk size
-      is set by calling setFetchSize() on a Statement or ResultSet) by
-      using fully-materialized cursors on the server.
-
-      The driver will will now automatically set "useServerPrepStmts" to
-      "true" when "useCursorFetch" has been set to "true", since the feature
-      requires server-side prepared statements in order to function.
-
-	- Fixed BUG#28469 - PreparedStatement.getMetaData() for statements
-	  containing leading one-line comments is not returned correctly.
-
-	  As part of this fix, we also overhauled detection of DML for
-	  executeQuery() and SELECTs for executeUpdate() in plain and
-	  prepared statements to be aware of the same  types of comments.
-
-    - Added configuration property "useNanosForElapsedTime" - for
-      profiling/debugging functionality that measures elapsed time,
-      should the driver try to use nanoseconds resolution if available
-      (requires JDK >= 1.5)?
-
-    - Added configuration property "slowQueryThresholdNanos" - if
-      "useNanosForElapsedTime" is set to "true", and this property
-      is set to a non-zero value the driver will use this threshold
-      (in nanosecond units) to determine if a query was slow, instead
-      of using millisecond units.
-
-      Note, that if "useNanosForElapsedTime" is set to "true", and this
-      property is set to "0" (or left default), then elapsed times will
-      still be measured in nanoseconds (if possible), but the slow query
-      threshold will be converted from milliseconds to nanoseconds, and thus
-      have an upper bound of approximately 2000 millesconds (as that threshold
-      is represented as an integer, not a long).
-
-	- Added configuration properties to allow tuning of TCP/IP socket
-	  parameters:
-
-	  	"tcpNoDelay" - Should the driver set SO_TCP_NODELAY (disabling the
-	  	               Nagle Algorithm, default "true")?
-
-		"tcpKeepAlive" - Should the driver set SO_KEEPALIVE (default "true")?
-
-		"tcpRcvBuf" - Should the driver set SO_RCV_BUF to the given value?
-		              The default value of '0', means use the platform default
-		              value for this property.
-
-		"tcpSndBuf" - Should the driver set SO_SND_BUF to the given value?
-		              The default value of '0', means use the platform default
-		              value for this property.
-
-		"tcpTrafficClass" - Should the driver set traffic class or
-		                    type-of-service fields? See the documentation
-		                    for java.net.Socket.setTrafficClass() for more
-		                    information.
-
-	- Give more information in EOFExceptions thrown out of MysqlIO (how many
-	  bytes the driver expected to read, how many it actually read, say that
-	  communications with the server were unexpectedly lost).
-
-	- Setting "useDynamicCharsetInfo" to "false" now causes driver to use
-	  static lookups for collations as well (makes
-	  ResultSetMetadata.isCaseSensitive() much more efficient, which leads
-	  to performance increase for ColdFusion, which calls this method for
-	  every column on every table it sees, it appears).
-
-	- Driver detects when it is running in a ColdFusion MX server (tested
-	  with version 7), and uses the configuration bundle "coldFusion",
-	  which sets useDynamicCharsetInfo to "false" (see previous entry), and
-	  sets useLocalSessionState and autoReconnect to "true".
-
-	- Fixed BUG#28851 - parser in client-side prepared statements
-	  eats character following '/' if it's not a multi-line comment.
-
-	- Fixed BUG#28956 - parser in client-side prepared statements
-	  runs to end of statement, rather than end-of-line for '#' comments.
-
-	  Also added support for '--' single-line comments.
-
-	- Don't send any file data in response to LOAD DATA LOCAL INFILE
-	  if the feature is disabled at the client side. This is to prevent
-	  a malicious server or man-in-the-middle from asking the client for
-	  data that the client is not expecting. Thanks to Jan Kneschke for
-	  discovering the exploit and Andrey "Poohie" Hristov, Konstantin Osipov
-	  and Sergei Golubchik for discussions about implications and possible
-	  fixes. This fixes BUG 29605 for JDBC.
-
-	- Added new debugging functionality - Setting configuration property
-	  "includeInnodbStatusInDeadlockExceptions" to "true" will cause the driver
-	  to append the output of "SHOW ENGINE INNODB STATUS" to deadlock-related
-	  exceptions, which will enumerate the current locks held inside InnoDB.
-
-05-15-07 - Version 5.0.6
-
-	- Fixed BUG#25545 - Client options not sent correctly when using SSL,
-	  leading to stored procedures not being able to return results. Thanks
-	  to Don Cohen for the bug report, testcase and patch.
-
-	- Fixed BUG#26592 - PreparedStatement is not closed in
-	  BlobFromLocator.getBytes().
-
-	- Fixed BUG#25624 - Whitespace surrounding storage/size specifiers in
-	  stored procedure parameters declaration causes NumberFormatException to
-	  be thrown when calling stored procedure on JDK-1.5 or newer, as the Number
-	  classes in JDK-1.5+ are whitespace intolerant.
-
-	- Fixed BUG#26173 - When useCursorFetch=true, sometimes server would return
-	  new, more exact metadata during the execution of the server-side prepared
-	  statement that enables this functionality, which the driver ignored (using
-	  the original metadata returned during prepare()), causing corrupt reading
-	  of data due to type mismatch when the actual rows were returned.
-
-	- Fixed BUG#26959 - comments in DDL of stored procedures/functions confuse
-	  procedure parser, and thus metadata about them can not be created, leading to
-	  inability to retrieve said metadata, or execute procedures that have certain
-	  comments in them.
-
-	- Give better error message when "streaming" result sets, and the connection
-	  gets clobbered because of exceeding net_write_timeout on the server. (which is
-	  basically what the error message says too).
-
-	- Fixed BUG#26789 - fast date/time parsing doesn't take into
-	  account 00:00:00 as a legal value.
-
-	- Fixed BUG#27317 - ResultSet.get*() with a column index < 1 returns
-	  misleading error message.
-
-	- Fixed BUG#25517 - Statement.setMaxRows() is not effective on result
-	  sets materialized from cursors.
-
-	- New configuration property, "enableQueryTimeouts" (default "true").
-	  When enabled, query timeouts set via Statement.setQueryTimeout() use a
-	  shared java.util.Timer instance for scheduling. Even if the timeout
-	  doesn't expire before the query is processed, there will be
-	  memory used by the TimerTask for the given timeout which won't be
-	  reclaimed until the time the timeout would have expired if it
-	  hadn't been cancelled by the driver. High-load environments
-	  might want to consider disabling this functionality. (this configuration
-	  property is part of the "maxPerformance" configuration bundle).
-
-	- Fixed BUG#27400 - CALL /* ... */ some_proc() doesn't work. As a side effect
-	  of this fix, you can now use /* */ and # comments when preparing statements using
-	  client-side prepared statement emulation.
-
-	  If the comments happen to contain parameter markers '?', they will be treated
-	  as belonging to the comment (i.e. not recognized) rather than being a parameter
-	  of the statement.
-
-	  Note that the statement when sent to the server will contain the comments
-	  as-is, they're not stripped during the process of preparing the PreparedStatement
-	  or CallableStatement.
-
-	- Fixed BUG#25328 - BIT(> 1) is returned as java.lang.String from ResultSet.getObject()
-	  rather than byte[].
-
-	- Fixed BUG#25715 - CallableStatements with OUT/INOUT parameters that
-	  are "binary" (blobs, bits, (var)binary, java_object) have extra 7 bytes
-	  (which happens to be the _binary introducer!)
-
-	- Added configuration property "padCharsWithSpace" (defaults to "false"). If set
-	  to "true", and a result set column has the CHAR type and the value does not
-	  fill the amount of characters specified in the DDL for the column, the driver
-	  will pad the remaining characters with space (for ANSI compliance).
-
-	- Fixed BUG#27655 - Connection.getTransactionIsolation() uses
-	  "SHOW VARIABLES LIKE" which is very inefficient on MySQL-5.0+
-
-	- Added configuration property "useDynamicCharsetInfo". If set to "false"
-	  (the default), the driver will use a per-connection cache of character set
-	  information queried from the server when necessary, or when set to "true",
-	  use a built-in static mapping that is more efficient, but isn't aware of
-	  custom character sets or character sets implemented after the release of
-	  the JDBC driver.
-
-	  Note: this only affects the "padCharsWithSpace" configuration property and the
-            ResultSetMetaData.getColumnDisplayWidth() method.
-
-	- More intelligent initial packet sizes for the "shared" packets are used
-	  (512 bytes, rather than 16K), and initial packets used during handshake are
-	  now sized appropriately as to not require reallocation.
-
-	- Fixed issue where calling getGeneratedKeys() on a prepared statement after
-	  calling execute() didn't always return the generated keys (executeUpdate()
-	  worked fine however).
-
-	- Fixed issue where a failed-over connection would let an application call
-	  setReadOnly(false), when that call should be ignored until the connection
-	  is reconnected to a writable master unless "failoverReadOnly" had been set
-	  to "false".
-
-	- Fixed BUG#28085 - Generate more useful error messages for diagnostics
-	  when the driver thinks a result set isn't updatable. (Thanks to Ashley Martens
-	  for the patch).
-
-	- Driver will now use INSERT INTO ... VALUES (DEFAULT) form of statement
-	  for updatable result sets for ResultSet.insertRow(), rather than
-	  pre-populating the insert row with values from DatabaseMetaData.getColumns()
-	  (which results in a "SHOW FULL COLUMNS" on the server for every result
-	  set). If an application requires access to the default values before
-	  insertRow() has been called, the JDBC URL should be configured with
-	  "populateInsertRowWithDefaultValues" set to "true".
-
-	  This fix specifically targets performance issues with ColdFusion and the
-	  fact that it seems to ask for updatable result sets no matter what the
-	  application does with them.
-
-	- com.mysql.jdbc.[NonRegistering]Driver now understands URLs of the format
-	  "jdbc:mysql:replication://" and "jdbc:mysql:loadbalance://" which will
-	  create a ReplicationConnection (exactly like when
-	  using [NonRegistering]ReplicationDriver) and an experimenal load-balanced
-	  connection designed for use with SQL nodes in a MySQL Cluster/NDB environment,
-	  respectively.
-
-	  In an effort to simplify things, we're working on deprecating multiple
-	  drivers, and instead specifying different core behavior based upon JDBC URL
-	  prefixes, so watch for [NonRegistering]ReplicationDriver to eventually
-	  disappear, to be replaced with com.mysql.jdbc[NonRegistering]Driver with
-	  the new URL prefix.
-
-	- Added an experimental load-balanced connection designed for use with SQL nodes
-      in a MySQL Cluster/NDB environment (This is not for master-slave replication.
-      For that, we suggest you look at ReplicationConnection or "lbpool").
-
-	  If the JDBC URL starts with "jdbc:mysql:loadbalance://host-1,host-2,...host-n",
-	  the driver will create an implementation of java.sql.Connection that load
-	  balances requests across a series of MySQL JDBC connections to the given hosts,
-	  where the balancing takes place after transaction commit.
-
-      Therefore, for this to work (at all), you must use transactions, even if only
-      reading data.
-
-      Physical connections to the given hosts will not be created until needed.
-
-      The driver will invalidate connections that it detects have had
-      communication errors when processing a request. A new connection to the
-      problematic host will be attempted the next time it is selected by the load
-      balancing algorithm.
-
-      There are two choices for load balancing algorithms, which may be specified
-      by the "loadBalanceStrategy" JDBC URL configuration property:
-
-      * "random" - the driver will pick a random host for each request. This tends
-        to work better than round-robin, as the randomness will somewhat account for
-        spreading loads where requests vary in response time, while round-robin
-        can sometimes lead to overloaded nodes if there are variations in response times
-        across the workload.
-
-      * "bestResponseTime" - the driver will route the request to the host that had
-        the best response time for the previous transaction.
-
-    - When "useLocalSessionState" is set to "true" and connected to a MySQL-5.0 or
-      later server, the JDBC driver will now determine whether an actual "commit" or
-      "rollback" statement needs to be sent to the database when Connection.commit()
-      or Connection.rollback() is called.
-
-      This is especially helpful for high-load situations with connection pools that
-      always call Connection.rollback() on connection check-in/check-out because it
-      avoids a round-trip to the server.
-
-03-01-07 - Version 5.0.5
-
-    - Fixed BUG#23645 - Some collations/character sets reported as "unknown"
-	  (specifically cias variants of existing character sets), and inability to override
-	  the detected server character set.
-
-	- Performance enhancement of initial character set configuration, driver
-      will only send commands required to configure connection character set
-      session variables if the current values on the server do not match
-      what is required.
-
-    - Fixed BUG#24360 .setFetchSize() breaks prepared SHOW and other commands.
-
-    - Fixed BUG#24344 - useJDBCCompliantTimezoneShift with server-side prepared
-	  statements gives different behavior than when using client-side prepared
-	  statements. (this is now fixed if moving from server-side prepared statements
-	  to client-side prepared statements by setting "useSSPSCompatibleTimezoneShift" to
-	  true", as the driver can't tell if this is a new deployment that never used
-	  server-side prepared statements, or if it is an existing deployment that is
-	  switching to client-side prepared statements from server-side prepared statements.
-
-    - Fixed BUG#23304 - DBMD using "show" and DBMD using information_schema do
-      not return results consistent with each other. (note this fix only
-      addresses the inconsistencies, not the issue that the driver is
-      treating schemas differently than some users expect. We will revisit
-      this behavior when there is full support for schemas in MySQL).
-
-    - Fixed BUG#25073 - rewriting batched statements leaks internal statement
-	  instances, and causes a memory leak.
-
-	- Fixed issue where field-level for metadata from DatabaseMetaData when using
-	  INFORMATION_SCHEMA didn't have references to current connections,
-	  sometimes leading to NullPointerExceptions when intropsecting them via
-	  ResultSetMetaData.
-
-	- Fixed BUG#25025 - Client-side prepared statement parser gets confused by
-	  in-line (/* ... */) comments and therefore can't rewrite batched statements
-	  or reliably detect type of statements when they're used.
-
-	- Fixed BUG#24065 - Better error message when server doesn't return enough
-	  information to determine stored procedure/function parameter types.
-
-	- Fixed BUG#21438 - Driver sending nanoseconds to server for timestamps when
-	  using server-side prepared statements, when server expects microseconds.
-
-	- Fixed BUG#25514 - Timer instance used for Statement.setQueryTimeout()
-	  created per-connection, rather than per-VM, causing memory leak
-
-	- Fixed BUG#25009 - Results from updates not handled correctly in
-	  multi-statement queries, leading to erroneous "Result is from UPDATE"
-	  exceptions.
-
-	- Fixed BUG#25047 - StringUtils.indexOfIgnoreCaseRespectQuotes() isn't
-	  case-insensitive on the first character of the target. This bug broke
-	  rewriteBatchedStatements functionality when prepared statements don't
-	  use upper-case for the VALUES clause in their statements.
-
-	- Fixed BUG#21480 - Some exceptions thrown out of StandardSocketFactory
-	  were needlessly wrapped, obscurring their true cause, especially when
-	  using socket timeouts.
-
-	- Fixed BUG#23303 - DatabaseMetaData.getSchemas() doesn't return a
-	  TABLE_CATALOG column.
-
-    - Fixed BUG#25399 - EscapeProcessor gets confused by multiple
-      backslashes. We now push the responsibility of syntax errors back
-      on to the server for most escape sequences.
-
-	- Fixed BUG#25379 - INOUT parameters in CallableStatements get
-	  doubly-escaped.
-
-	- Removed non-short-circuited logical ORs from "if" statements.
-
-	- Re-worked stored procedure parameter parser to be more robust. Driver no
-	  longer requires "BEGIN" in stored procedure definition, but does have
-	  requirement that if a stored function begins with a label directly after the
-	  "returns" clause, that the label is not a quoted identifier.
-    - Reverted back to internal character conversion routines for single-byte
-      character sets, as the ones internal to the JVM are using much more CPU
-      time than our internal implementation.
-
-	- Changed cached result set metadata (when using
-	  "cacheResultSetMetadata=true") to be cached per-connection rather
-	  than per-statement as previously implemented.
-
-	- Use a java.util.TreeMap to map column names to ordinal indexes for
-	  ResultSet.findColumn() instead of a HashMap. This allows us to have
-	  case-insensitive lookups (required by the JDBC specification) without
-	  resorting to the many transient object instances needed to support this
-	  requirement with a normal HashMap with either case-adjusted keys, or
-	  case-insensitive keys. (In the worst case scenario for lookups of a 1000
-	  column result set, TreeMaps are about half as fast wall-clock time as
-	  a HashMap, however in normal applications their use gives many orders
-	  of magnitude reduction in transient object instance creation which pays
-	  off later for CPU usage in garbage collection).
-
-	- Avoid static synchronized code in JVM class libraries for dealing with
-	  default timezones.
-
-	- Fixed cases where ServerPreparedStatements weren't using cached metadata
-	  when "cacheResultSetMetadata=true" was configured.
-
-	- Use faster datetime parsing for ResultSets that come from plain or
-	  non-server-side prepared statements. (Enable old implementation with
-	  "useFastDateParsing=false" as a configuration parameter).
-
-	- Fixed BUG#24794 - DatabaseMetaData.getSQLKeywords() doesn't return
-	  all reserved words for current MySQL version. The current fix/implementation
-	  returns keywords for MySQL-5.1, and doesn't distinguish between different
-	  versions of the server.
-
-	- When using cached metadata, skip field-level metadata packets coming from
-	  the server, rather than reading them and discarding them without creating
-	  com.mysql.jdbc.Field instances.
-
-	- Fixed BUG#25836 - Statement execution which timed out doesn't always
-	  throw MySQLTimeoutException.
-
-	- Throw exceptions encountered during timeout to thread
-	  calling Statement.execute*(), rather than RuntimeException.
-
-	- Added configuration property "localSocketAddress",which is the hostname or
-	  IP address given to explicitly configure the interface that the driver will
-	  bind the client side of the TCP/IP connection to when connecting.
-
-	- Take "localSocketAddress" property into account when creating instances
-	  of CommunicationsException when the underyling exception is a
-	  java.net.BindException, so that a friendlier error message is given with
-	  a little internal diagnostics.
-
-	- Fixed some NPEs when cached metadata was used with UpdatableResultSets.
-
-	- The "rewriteBatchedStatements" feature can now be used with server-side
-	  prepared statements.
-
-	- Fixed BUG#26326 - Connection property "socketFactory" wasn't exposed via
-	  correctly named mutator/accessor, causing data source implementations that
-	  use JavaBean naming conventions to set properties to fail to set the property
-	  (and in the case of SJAS, fail silently when trying to set this parameter).
-
-	- Fixed BUG#25787 - java.util.Date should be serialized for
-	  PreparedStatement.setObject().
-
-	  We've added a new configuration option "treatUtilDateAsTimestamp", which is
-	  false by default, as (1) We already had specific behavior to treat
-	  java.util.Date as a java.sql.Timestamp because it's useful to many folks,
-	  and (2) that behavior will very likely be required for drivers JDBC-post-4.0.
-
-    - Fixed BUG#22628 - Driver.getPropertyInfo() throws NullPointerException for
-      URL that only specifies host and/or port.
-
-	- Fixed BUG#21267, ParameterMetaData throws NullPointerException when
-	  prepared SQL actually has a syntax error. Added
-	  "generateSimpleParameterMetadata" configuration property, which when set
-	  to "true" will generate metadata reflecting VARCHAR for every parameter
-	  (the default is "false", which will cause an exception to be thrown if no
-	  parameter metadata for the statement is actually available).
-
-	- When extracting foreign key information from "SHOW CREATE TABLE " in
-	  DatabaseMetaData, ignore exceptions relating to tables being missing
-	  (which could happen for cross-reference or imported-key requests, as
-	  the list of tables is generated first, then iterated).
-
-	- Fixed logging of XA commands sent to server, it's now configurable
-	  via "logXaCommands" property (defaults to "false").
-
-	- Fixed issue where XADataSources couldn't be bound into JNDI,
-	  as the DataSourceFactory didn't know how to create instances
-	  of them.
-
-	- Fixed issue where XADataSources couldn't be bound into JNDI,
-	  as the DataSourceFactory didn't know how to create instances
-	  of them.
-
-	- Usage advisor will now issue warnings for result sets with large numbers
-	  of rows (size configured by "resultSetSizeThreshold" property, default
-	  value is 100).
-
-10-20-06 - Version 5.0.4
-
-    - Fixed BUG#21379 - column names don't match metadata in cases
-      where server doesn't return original column names (column functions)
-	  thus breaking compatibility with applications that expect 1-1 mappings
-	  between findColumn() and rsmd.getColumnName(), usually manifests itself
-	  as "Can't find column ('')" exceptions.
-
-    - Fixed BUG#21544 - When using information_schema for metadata,
-	  COLUMN_SIZE for getColumns() is not clamped to range of
-	  java.lang.Integer as is the case when not using
-	  information_schema, thus leading to a truncation exception that
-	  isn't present when not using information_schema.
-
-    - Fixed configuration property "jdbcCompliantTruncation" was not
-      being used for reads of result set values.
-
-    - Fixed BUG#22024 - Newlines causing whitespace to span confuse
-	  procedure parser when getting parameter metadata for stored
-	  procedures.
-
-	- Driver now supports {call sp} (without "()" if procedure has no
-	  arguments).
-
-	- Fixed BUG#22359 - Driver was using milliseconds for
-	  Statement.setQueryTimeout() when specification says argument is
-	  to be in seconds.
-
-	- Workaround for server crash when calling stored procedures
-	  via a server-side prepared statement (driver now detects
-	  prepare(stored procedure) and substitutes client-side prepared
-	  statement), addresses BUG#22297.
-
-	- Added new _ci collations to CharsetMapping, fixing
-	  Bug#22456 - utf8_unicode_ci not working.
-
-	- Fixed BUG#22290 - Driver issues truncation on write exception when
-	  it shouldn't (due to sending big decimal incorrectly to server with
-	  server-side prepared statement).
-
-	- Fixed BUG#22613 - DBMD.getColumns() does not return expected
-	  COLUMN_SIZE for the SET type, now returns length of largest possible
-	  set disregarding whitespace or the "," delimitters to be consistent
-	  with the ODBC driver.
-
-	- Driver now sends numeric 1 or 0 for client-prepared statement
-	  setBoolean() calls instead of '1' or '0'.
-
-	- DatabaseMetaData correctly reports true for supportsCatalog*()
-	  methods.
-
-07-26-06 - Version 5.0.3
-
-    - Fixed BUG#20650 - Statement.cancel() causes NullPointerException
-      if underlying connection has been closed due to server failure.
-
-    - Added configuration option "noAccessToProcedureBodies" which will
-      cause the driver to create basic parameter metadata for
-      CallableStatements when the user does not have access to procedure
-      bodies via "SHOW CREATE PROCEDURE" or selecting from mysql.proc
-      instead of throwing an exception. The default value for this option
-      is "false".
-
-07-11-06 - Version 5.0.2-beta (5.0.1 not released due to packaging error)
-
-    - Fixed BUG#17401 - Can't use XAConnection for local transactions when
-      no global transaction is in progress.
-
-    - Fixed BUG#18086 - Driver fails on non-ASCII platforms. The driver
-      was assuming that the platform character set would be a superset
-      of MySQL's "latin1" when doing the handshake for authentication,
-      and when reading error messages. We now use Cp1252 for all strings
-      sent to the server during the handshake phase, and a hard-coded mapping
-      of the "language" server variable to the character set that
-      is used for error messages.
-
-    - Fixed BUG#19169 - ConnectionProperties (and thus some
-	  subclasses) are not serializable, even though some J2EE containers
-	  expect them to be.
-
-	- Fixed BUG#20242 - MysqlValidConnectionChecker for JBoss doesn't
-	  work with MySQLXADataSources.
-
-	- Better caching of character set converters (per-connection)
-	  to remove a bottleneck for multibyte character sets.
-
-	- Added connection/datasource property  "pinGlobalTxToPhysicalConnection"
-	  (defaults to "false"). When set to "true", when using XAConnections, the
-	  driver ensures that operations on a given XID are always routed to the
-	  same physical connection. This allows the XAConnection to support
-	  "XA START ... JOIN" after "XA END" has been called, and is also a
-	  workaround for transaction managers that don't maintain thread affinity
-	  for a global transaction (most either always maintain thread affinity,
-	  or have it as a configuration option).
-
-	- MysqlXaConnection.recover(int flags) now allows combinations of
-	  XAResource.TMSTARTRSCAN and TMENDRSCAN. To simulate the "scanning"
-	  nature of the interface, we return all prepared XIDs for TMSTARTRSCAN,
-	  and no new XIDs for calls with TMNOFLAGS, or TMENDRSCAN when not in
-	  combination with TMSTARTRSCAN. This change was made for API compliance,
-	  as well as integration with IBM WebSphere's transaction manager.
-
-12-23-05 - Version 5.0.0-beta
-
-    - XADataSource implemented (ported from 3.2 branch which won't be
-      released as a product). Use
-      "com.mysql.jdbc.jdbc2.optional.MysqlXADataSource" as your datasource
-      class name in your application server to utilize XA transactions
-      in MySQL-5.0.10 and newer.
-
-    - PreparedStatement.setString() didn't work correctly when
-      sql_mode on server contained NO_BACKSLASH_ESCAPES, and no characters
-      that needed escaping were present in the string.
-
-    - Attempt detection of the MySQL type "BINARY" (it's an alias, so this isn't
-      always reliable), and use the java.sql.Types.BINARY type mapping for it.
-
-    - Moved -bin-g.jar file into separate "debug" subdirectory to avoid confusion.
-
-    - Don't allow .setAutoCommit(true), or .commit() or .rollback() on an XA-managed
-      connection as-per the JDBC specification.
-
-    - If the connection "useTimezone" is set to "true", then also respect timezone
-      conversions in escape-processed string literals (e.g. "{ts ...}" and
-      "{t ...}").
-
-    - Return original column name for RSMD.getColumnName() if the column was aliased,
-      alias name for .getColumnLabel() (if aliased), and original table name
-      for .getTableName(). Note this only works for MySQL-4.1 and newer, as
-      older servers don't make this information available to clients.
-
-    - Setting "useJDBCCompliantTimezoneShift=true" (it's not the default)
-      causes the driver to use GMT for _all_ TIMESTAMP/DATETIME timezones,
-      and the current VM timezone for any other type that refers to timezones.
-      This feature can not be used when "useTimezone=true" to convert between
-      server and client timezones.
-
-    - Add one level of indirection of internal representation of CallableStatement
-      parameter metadata to avoid class not found issues on JDK-1.3 for
-      ParameterMetadata interface (which doesn't exist prior to JDBC-3.0).
-
-    - Added unit tests for XADatasource, as well as friendlier exceptions
-      for XA failures compared to the "stock" XAException (which has no
-      messages).
-
-    - Fixed BUG#14279 - Idle timeouts cause XAConnections to whine about rolling
-      themselves back
-
-    - Added support for Connector/MXJ integration via url subprotocol
-      "jdbc:mysql:mxj://....".
-
-    - Moved all SQLException constructor usage to a factory in SQLError
-      (ground-work for JDBC-4.0 SQLState-based exception classes).
-
-    - Removed Java5-specific calls to BigDecimal constructor (when
-      result set value is '', (int)0 was being used as an argument
-      in-directly via method return value. This signature doesn't exist
-      prior to Java5.)
-
-    - Moved all SQLException creation to a factory method in SQLError,
-      groundwork for JDBC-4.0 SQLState class-based exceptions.
-
-    - Added service-provider entry to META-INF/services/java.sql.Driver
-      for JDBC-4.0 support.
-
-    - Return "[VAR]BINARY" for RSMD.getColumnTypeName() when that is actually
-      the type, and it can be distinguished (MySQL-4.1 and newer).
-
-    - When fix for BUG#14562 was merged from 3.1.12, added functionality
-      for CallableStatement's parameter metadata to return correct
-      information for .getParameterClassName().
-
-    - Fuller synchronization of Connection to avoid deadlocks when
-      using multithreaded frameworks that multithread a single connection
-      (usually not recommended, but the JDBC spec allows it anyways),
-      part of fix to BUG#14972).
-
-    - Implementation of Statement.cancel() and Statement.setQueryTimeout().
-      Both require MySQL-5.0.0 or newer server, require a separate connection
-      to issue the "KILL QUERY" command, and in the case of setQueryTimeout()
-      creates an additional thread to handle the timeout functionality.
-
-      Note: Failures to cancel the statement for setQueryTimeout() may manifest
-      themselves as RuntimeExceptions rather than failing silently, as there
-      is currently no way to unblock the thread that is executing the query being
-      cancelled due to timeout expiration and have it throw the exception
-      instead.
-
-    - Removed dead code in com.mysql.jdbc.Connection.
-
-    - Made construction of com.mysql.jdbc.Field (result set metadata)
-      instances more efficient for non-string types by not doing
-      character set initialization, or detection of type changes due to
-      temporary tables.
-
-    - Removed redundant code in com.mysql.jdbc.MysqlIO.
-
-    - Removed work done for BUG#14652, and instead loosened synchronization
-      to solve a number of deadlock issues in BUG#18719, BUG#18367, BUG#17709
-      and BUG#15067. New strategy basically makes Connection instances threadsafe
-      and thus shareable across threads, and anything else threadsafe, but not
-      necessarily shareable across threads due to JDBC API interactions that
-      can cause non-obvious behavior and/or deadlock scenarios to occur since
-      the API is not designed to be used from multiple threads at once.
-
-      Therefore, unless external synchronization is provided, clients should
-      not allow multiple threads to share a given statement or result set. Examples
-      of issues with the API itself not being multi-thread suitable include,
-      but are not limited to race conditions between modifiers and execution and
-      retrieval methods on statements and result sets that are not synchronizable
-      such as ResultSet.get*() and traversal methods, or Statement.execute*() closing
-      result sets without effectively making the driver itself serializable across the
-      board.
-
-      These changes should not have any effect on "normal" J(2)EE use cases
-      where only one thread ever uses a connection instance and the objects created by
-      it.
-
-    - Use a java.util.Timer to schedule cancellation of queries via
-      Statement.setQueryTimeout() rather than one thread per potential cancellation.
-
-      A new thread will be used to actually cancel a running query, as there's potential
-      for a cancel request to block other cancel requests if all run from the
-      same thread.
-
-nn-nn-07 - Version 3.1.15
-
-	- Fixed BUG#23281 - Downed slave caused round-robin load balance to
-	  not cycle back to first host in list.
-
-	- Disabled use of server-side prepared statements by default.
-
-	- Handle YYYY-MM-DD hh:mm:ss format of timestamp in
-	  ResultSet.getTimeFromString().
-
-	- Fixed BUG#24840 - character encoding of "US-ASCII" doesn't map correctly
-	  for 4.1 or newer
-
-	- Added Implementation-Vendor-Id attribute to jar manifest per request
-	  in BUG#15641.
-
-	- C3P0 >= version 0.9.1 passes non-proxied connections to
-	  MysqlConnectionTester,  thus it began throwing ClassCastExceptions.
-	  MysqlConnectionTester now checks if it has a plain Connection and uses
-	  that if possible. Thanks to Brian Skrab for the fix.
-
-10-19-06 - Version 3.1.14
-
-    - Fixed BUG#20479 - Updatable result set throws ClassCastException
-	  when there is row data and moveToInsertRow() is called.
-
-	- Fixed BUG#20485 - Updatable result set that contains
-	  a BIT column fails when server-side prepared statements are used.
-
-	- Fixed BUG#16987 - Memory leak with profileSQL=true.
-
-	- Fixed BUG#19726 - Connection fails to localhost when using
-	  timeout and IPv6 is configured.
-
-	- Fixed BUG#16791 - NullPointerException in MysqlDataSourceFactory
-	  due to Reference containing RefAddrs with null content.
-
-	- Fixed BUG#20306 - ResultSet.getShort() for UNSIGNED TINYINT
-	  returns incorrect values when using server-side prepared statements.
-
-	- Fixed BUG#20687 - Can't pool server-side prepared statements, exception
-	  raised when re-using them.
-
-	- Fixed BUG#21062 - ResultSet.getSomeInteger() doesn't work for BIT(>1).
-
-	- Fixed BUG#18880 - ResultSet.getFloatFromString() can't retrieve
-	  values near Float.MIN/MAX_VALUE.
-
-	- Fixed BUG#20888 - escape of quotes in client-side prepared
-	  statements parsing not respected. Patch covers more than bug report,
-	  including NO_BACKSLASH_ESCAPES being set, and stacked quote characters
-	  forms of escaping (i.e. '' or "").
-
-	- Fixed BUG#19993 - ReplicationDriver does not always round-robin load
-	  balance depending on URL used for slaves list.
-
-	- Fixed calling toString() on ResultSetMetaData for driver-generated
-	  (i.e. from DatabaseMetaData method calls, or from getGeneratedKeys())
-	  result sets would raise a NullPointerException.
-
-	- Fixed Bug#21207 - Driver throws NPE when tracing prepared statements that
-	  have been closed (in asSQL()).
-
-	- Removed logger autodectection altogether, must now specify logger
-	  explitly if you want to use a logger other than one that logs
-	  to STDERR.
-
-	- Fixed BUG#22290 - Driver issues truncation on write exception when
-	  it shouldn't (due to sending big decimal incorrectly to server with
-	  server-side prepared statement).
-
-	- Driver now sends numeric 1 or 0 for client-prepared statement
-	  setBoolean() calls instead of '1' or '0'.
-
-	- Fixed bug where driver would not advance to next host if
-	  roundRobinLoadBalance=true and the last host in the list is down.
-
-	- Fixed BUG#18258 - DatabaseMetaData.getTables(), columns() with bad
-	  catalog parameter threw exception rather than return empty result
-	  set (as required by spec).
-
-	- Check and store value for continueBatchOnError property in constructor
-      of Statements, rather than when executing batches, so that Connections
-      closed out from underneath statements don't cause NullPointerExceptions
-      when it's required to check this property.
-
-    - Fixed bug when calling stored functions, where parameters weren't
-      numbered correctly (first parameter is now the return value, subsequent
-      parameters if specified start at index "2").
-
-	- Fixed BUG#21814 - time values outside valid range silently wrap.
-
-05-26-06 - Version 3.1.13
-
-    - Fixed BUG#15464 - INOUT parameter does not store IN value.
-
-    - Fixed BUG#14609 - Exception thrown for new decimal type when
-      using updatable result sets.
-
-    - Fixed BUG#15544, no "dos" character set in MySQL > 4.1.0
-
-    - Fixed BUG#15383 - PreparedStatement.setObject() serializes
-      BigInteger as object, rather than sending as numeric value
-      (and is thus not complementary to .getObject() on an UNSIGNED
-      LONG type).
-
-    - Fixed BUG#11874 - ResultSet.getShort() for UNSIGNED TINYINT
-      returned wrong values.
-
-    - Fixed BUG#15676 - lib-nodist directory missing from
-      package breaks out-of-box build
-
-    - Fixed BUG#15854 - DBMD.getColumns() returns wrong type for BIT.
-
-    - Fixed BUG#16169 - ResultSet.getNativeShort() causes stack overflow error
-      via recurisve calls.
-
-    - Fixed BUG#14938 - Unable to initialize character set mapping tables.
-      Removed reliance on .properties files to hold this information, as it
-      turns out to be too problematic to code around class loader hierarchies
-      that change depending on how an application is deployed. Moved information
-      back into the CharsetMapping class.
-
-    - Fixed BUG#16841 - updatable result set doesn't return AUTO_INCREMENT
-      values for insertRow() when multiple column primary keys are used. (the
-      driver was checking for the existence of single-column primary keys and
-      an autoincrement value > 0 instead of a straightforward isAutoIncrement()
-      check).
-
-    - Fixed BUG#17099 - Statement.getGeneratedKeys() throws NullPointerException
-      when no query has been processed.
-
-    - Fixed BUG#13469 - Driver tries to call methods that don't exist on older and
-      newer versions of Log4j. The fix is not trying to auto-detect presense of log4j,
-      too many different incompatible versions out there in the wild to do this reliably.
-
-      If you relied on autodetection before, you will need to add
-      "logger=com.mysql.jdbc.log.Log4JLogger" to your JDBC URL to enable Log4J usage,
-      or alternatively use the new "CommonsLogger" class to take care of this.
-
-    - Added support for Apache Commons logging, use "com.mysql.jdbc.log.CommonsLogger"
-      as the value for the "logger" configuration property.
-
-    - LogFactory now prepends "com.mysql.jdbc.log" to log class name if it can't be
-      found as-specified. This allows you to use "short names" for the built-in log
-      factories, for example "logger=CommonsLogger" instead of
-      "logger=com.mysql.jdbc.log.CommonsLogger".
-
-    - Fixed BUG#15570 - ReplicationConnection incorrectly copies state,
-	  doesn't transfer connection context correctly when transitioning between
-	  the same read-only states.
-
-	- Fixed BUG#18041 - Server-side prepared statements don't cause
-	  truncation exceptions to be thrown when truncation happens.
-
-	- Added performance feature, re-writing of batched executes for
-	  Statement.executeBatch() (for all DML statements) and
-	  PreparedStatement.executeBatch() (for INSERTs with VALUE clauses
-	  only). Enable by using "rewriteBatchedStatements=true" in your JDBC URL.
-
-	- Fixed BUG#17898 - registerOutParameter not working when some
-	  parameters pre-populated. Still waiting for feedback from JDBC experts
-	  group to determine what correct parameter count from getMetaData()
-	  should be, however.
-
-	- Fixed BUG#17587 - clearParameters() on a closed prepared statement
-	  causes NPE.
-
-	- Map "latin1" on MySQL server to CP1252 for MySQL > 4.1.0.
-
-	- Added additional accessor and mutator methods on ConnectionProperties
-	  so that DataSource users can use same naming as regular URL properties.
-
-	- Fixed BUG#18740 - Data truncation and getWarnings() only returns last
-	  warning in set.
-
-	- Improved performance of retrieving BigDecimal, Time, Timestamp and Date
-	  values from server-side prepared statements by creating fewer short-lived
-	  instances of Strings when the native type is not an exact match for
-	  the requested type. Fixes BUG#18496 for BigDecimals.
-
-	- Fixed BUG#18554 - Aliased column names where length of name > 251
-	  are corrupted.
-
-	- Fixed BUG#17450 - ResultSet.wasNull() not always reset
-	  correctly for booleans when done via conversion for server-side
-	  prepared statements.
-
-	- Fixed BUG#16277 - Invalid classname returned for
-	  RSMD.getColumnClassName() for BIGINT type.
-
-	- Fixed case where driver wasn't reading server status correctly when
-	  fetching server-side prepared statement rows, which in some cases
-	  could cause warning counts to be off, or multiple result sets to not
-	  be read off the wire.
-
-	- Driver now aware of fix for BIT type metadata that went into
-	  MySQL-5.0.21 for server not reporting length consistently (bug
-	  number 13601).
-
-	- Fixed BUG#19282 - ResultSet.wasNull() returns incorrect value
-	  when extracting native string from server-side prepared statement
-	  generated result set.
-
-11-30-05 - Version 3.1.12
-
-    - Fixed client-side prepared statement bug with embedded ? inside
-      quoted identifiers (it was recognized as a placeholder, when it
-      was not).
-
-    - Don't allow executeBatch() for CallableStatements with registered
-      OUT/INOUT parameters (JDBC compliance).
-
-    - Fall back to platform-encoding for URLDecoder.decode() when
-      parsing driver URL properties if the platform doesn't have a
-      two-argument version of this method.
-
-    - Fixed BUG#14562 - Java type conversion may be incorrect for
-      mediumint.
-
-    - Added configuration property "useGmtMillisForDatetimes" which
-      when set to true causes ResultSet.getDate(), .getTimestamp() to
-      return correct millis-since GMT when .getTime() is called on
-      the return value (currently default is "false" for legacy
-      behavior).
-
-    - Fixed DatabaseMetaData.stores*Identifiers():
-
-        * if lower_case_table_names=0 (on server):
-
-            storesLowerCaseIdentifiers() returns false
-            storesLowerCaseQuotedIdentifiers() returns false
-            storesMixedCaseIdentifiers() returns true
-            storesMixedCaseQuotedIdentifiers() returns true
-            storesUpperCaseIdentifiers() returns false
-            storesUpperCaseQuotedIdentifiers() returns true
-
-        * if lower_case_table_names=1 (on server):
-
-            storesLowerCaseIdentifiers() returns true
-            storesLowerCaseQuotedIdentifiers() returns true
-            storesMixedCaseIdentifiers() returns false
-            storesMixedCaseQuotedIdentifiers() returns false
-            storesUpperCaseIdentifiers() returns false
-            storesUpperCaseQuotedIdentifiers() returns true
-
-    - Fixed BUG#14815 - DatabaseMetaData.getColumns() doesn't
-      return TABLE_NAME correctly.
-
-    - Fixed BUG#14909 - escape processor replaces quote character
-      in quoted string with string delimiter.
-
-    - Fixed BUG#12975 - OpenOffice expects
-      DBMD.supportsIntegrityEnhancementFacility() to return "true"
-      if foreign keys are supported by the datasource, even though
-      this method also covers support for check constraints,
-	  which MySQL _doesn't_ have. Setting the configuration property
-	  "overrideSupportsIntegrityEnhancementFacility" to "true" causes
-	  the driver to return "true" for this method.
-
-    - Added "com.mysql.jdbc.testsuite.url.default" system property to
-	  set default JDBC url for testsuite (to speed up bug resolution
-	  when I'm working in Eclipse).
-
-	- Fixed BUG#14938 - Unable to initialize character set mapping
-	  tables (due to J2EE classloader differences).
-
-	- Fixed BUG#14972 - Deadlock while closing server-side prepared
-	  statements from multiple threads sharing one connection.
-
-	- Fixed BUG#12230 -	logSlowQueries should give better info.
-
-	- Fixed BUG#13775 - Extraneous sleep on autoReconnect.
-
-	- Fixed BUG#15024 - Driver incorrectly closes streams passed as
-	  arguments to PreparedStatements. Reverts to legacy behavior by
-	  setting the JDBC configuration property "autoClosePStmtStreams"
-	  to "true" (also included in the 3-0-Compat configuration "bundle").
-
-	- Fixed BUG#13048 - maxQuerySizeToLog is not respected. Added logging of
-	  bound values for execute() phase of server-side prepared statements
-	  when profileSQL=true as well.
-
-	- Fixed BUG#15065 - Usage advisor complains about unreferenced
-	  columns, even though they've been referenced.
-
-	- Don't increase timeout for failover/reconnect (BUG#6577)
-
-	- Process escape tokens in Connection.prepareStatement(...), fix
-	  for BUG#15141. You can disable this behavior by setting
-	  the JDBC URL configuration property "processEscapeCodesForPrepStmts"
-	  to "false".
-
-	- Fixed BUG#13255 - Reconnect during middle of executeBatch()
-	  should not occur if autoReconnect is enabled.
-
-10-07-05 - Version 3.1.11
-
-    - Fixed BUG#11629 - Spurious "!" on console when character
-      encoding is "utf8".
-
-    - Fixed statements generated for testcases missing ";" for
-      "plain" statements.
-
-    - Fixed BUG#11663 - Incorrect generation of testcase scripts
-      for server-side prepared statements.
-
-    - Fixed regression caused by fix for BUG#11552 that caused driver
-      to return incorrect values for unsigned integers when those
-      integers where within the range of the positive signed type.
-
-    - Moved source code to svn repo.
-
-    - Fixed BUG#11797 - Escape tokenizer doesn't respect stacked single quotes
-	  for escapes.
-
-	- GEOMETRY type not recognized when using server-side prepared statements.
-
-    - Fixed BUG#11879 -- ReplicationConnection won't switch to slave, throws
-      "Catalog can't be null" exception.
-
-    - Fixed BUG#12218, properties shared between master and slave with
-      replication connection.
-
-    - Fixed BUG#10630, Statement.getWarnings() fails with NPE if statement
-      has been closed.
-
-    - Only get char[] from SQL in PreparedStatement.ParseInfo() when needed.
-
-    - Fixed BUG#12104 - Geometry types not handled with server-side prepared
-      statements.
-
-    - Fixed BUG#11614 - StringUtils.getBytes() doesn't work when using
-      multibyte character encodings and a length in  _characters_ is
-      specified.
-
-    - Fixed BUG#11798 - Pstmt.setObject(...., Types.BOOLEAN) throws exception.
-
-    - Fixed BUG#11976 - maxPerformance.properties mis-spells
-	  "elideSetAutoCommits".
-
-	- Fixed BUG#11575 -- DBMD.storesLower/Mixed/UpperIdentifiers()
-	  reports incorrect values for servers deployed on Windows.
-
-	- Fixed BUG#11190 - ResultSet.moveToCurrentRow() fails to work when
-	  preceeded by a call to ResultSet.moveToInsertRow().
-
-	- Fixed BUG#11115, VARBINARY data corrupted when using server-side
-	  prepared statements and .setBytes().
-
-	- Fixed BUG#12229 - explainSlowQueries hangs with server-side
-	  prepared statements.
-
-	- Fixed BUG#11498 - Escape processor didn't honor strings demarcated
-	  with double quotes.
-
-	- Lifted restriction of changing streaming parameters with server-side
-	  prepared statements. As long as _all_ streaming parameters were set
-	  before execution, .clearParameters() does not have to be called.
-	  (due to limitation of client/server protocol, prepared statements
-	   can not reset _individual_ stream data on the server side).
-
-	- Reworked Field class, *Buffer, and MysqlIO to be aware of field
-	  lengths > Integer.MAX_VALUE.
-
-	- Updated DBMD.supportsCorrelatedQueries() to return true for versions >
-	  4.1, supportsGroupByUnrelated() to return true and
-	  getResultSetHoldability() to return HOLD_CURSORS_OVER_COMMIT.
-
-	- Fixed BUG#12541 - Handling of catalog argument in
-	  DatabaseMetaData.getIndexInfo(), which also means changes to the following
-	  methods in DatabaseMetaData:
-
-	    - getBestRowIdentifier()
-	    - getColumns()
-	    - getCrossReference()
-	    - getExportedKeys()
-	    - getImportedKeys()
-	    - getIndexInfo()
-	    - getPrimaryKeys()
-	    - getProcedures() (and thus indirectly getProcedureColumns())
-	    - getTables()
-
-	  The "catalog" argument in all of these methods now behaves in the following
-	  way:
-
-	    - Specifying NULL means that catalog will not be used to filter the
-	      results (thus all databases will be searched), unless you've
-	      set "nullCatalogMeansCurrent=true" in your JDBC URL properties.
-
-	    - Specifying "" means "current" catalog, even though this isn't quite
-	      JDBC spec compliant, it's there for legacy users.
-
-	    - Specifying a catalog works as stated in the API docs.
-
-	- Made Connection.clientPrepare() available from "wrapped" connections
-	  in the jdbc2.optional package (connections built by
-	  ConnectionPoolDataSource instances).
-
-    - Added Connection.isMasterConnection() for clients to be able to determine
-      if a multi-host master/slave connection is connected to the first host
-      in the list.
-
-    - Fixed BUG#12753 - Tokenizer for "=" in URL properties was causing
-      sessionVariables=.... to be parameterized incorrectly.
-
-    - Fixed BUG#11781, foreign key information that is quoted is
-      parsed incorrectly when DatabaseMetaData methods use that
-      information.
-
-    - The "sendBlobChunkSize" property is now clamped to "max_allowed_packet"
-      with consideration of stream buffer size and packet headers to avoid
-      PacketTooBigExceptions when "max_allowed_packet" is similar in size
-      to the default "sendBlobChunkSize" which is 1M.
-
-    - CallableStatement.clearParameters() now clears resources associated
-      with INOUT/OUTPUT parameters as well as INPUT parameters.
-
-    - Fixed BUG#12417 - Connection.prepareCall() is database name
-      case-sensitive (on Windows systems).
-
-    - Fixed BUG#12752 - Cp1251 incorrectly mapped to win1251 for
-      servers newer than 4.0.x.
-
-    - Fixed BUG#12970 - java.sql.Types.OTHER returned for
-	  BINARY and VARBINARY columns when using
-	  DatabaseMetaData.getColumns().
-
-	- ServerPreparedStatement.getBinding() now checks if the statement
-	  is closed before attempting to reference the list of parameter
-	  bindings, to avoid throwing a NullPointerException.
-
-    - Fixed BUG#13277 - ResultSetMetaData from
-      Statement.getGeneratedKeys() caused NullPointerExceptions to be
-      thrown whenever a method that required a connection reference
-      was called.
-
-    - Removed support for java.nio I/O. Too many implementations
-      turned out to be buggy, and there was no performance difference
-      since MySQL is a blocking protocol anyway.
-
-06-23-05 - Version 3.1.10-stable
-
-	- Fixed connecting without a database specified raised an exception
-	  in MysqlIO.changeDatabaseTo().
-
-	- Initial implemention of ParameterMetadata for
-	  PreparedStatement.getParameterMetadata(). Only works fully
-	  for CallableStatements, as current server-side prepared statements
-	  return every parameter as a VARCHAR type.
-
-	- Fixed BUG#11552 - Server-side prepared statements return incorrect
-	  values for unsigned TINYINT, SMALLINT, INT and Long.
-
-	- Fixed BUG#11540 - Incorrect year conversion in setDate(..) for
-	  system that use B.E. year in default locale.
-
-06-22-05 - Version 3.1.9-stable
-
-	- Overhaul of character set configuration, everything now
-	  lives in a properties file.
-
-	- Driver now correctly uses CP932 if available on the server
-	  for Windows-31J, CP932 and MS932 java encoding names,
-	  otherwise it resorts to SJIS, which is only a close
-	  approximation. Currently only MySQL-5.0.3 and newer (and
-	  MySQL-4.1.12 or .13, depending on when the character set
-	  gets backported) can reliably support any variant of CP932.
-
-	- Fixed BUG#9064 - com.mysql.jdbc.PreparedStatement.ParseInfo
-	  does unnecessary call to toCharArray().
-
-	- Fixed Bug#10144 - Memory leak in ServerPreparedStatement if
-	  serverPrepare() fails.
-
-	- Actually write manifest file to correct place so it ends up
-	  in the binary jar file.
-
-	- Added "createDatabaseIfNotExist" property (default is "false"),
-	  which will cause the driver to ask the server to create the
-	  database specified in the URL if it doesn't exist. You must have
-	  the appropriate privileges for database creation for this to
-	  work.
-
-	- Fixed BUG#10156 - Unsigned SMALLINT treated as signed for ResultSet.getInt(),
-	  fixed all cases for UNSIGNED integer values and server-side prepared statements,
-	  as well as ResultSet.getObject() for UNSIGNED TINYINT.
-
-	- Fixed BUG#10155, double quotes not recognized when parsing
-	  client-side prepared statements.
-
-	- Made enableStreamingResults() visible on
-	  com.mysql.jdbc.jdbc2.optional.StatementWrapper.
-
-	- Made ServerPreparedStatement.asSql() work correctly so auto-explain
-	  functionality would work with server-side prepared statements.
-
-	- Made JDBC2-compliant wrappers public in order to allow access to
-	  vendor extensions.
-
-	- Cleaned up logging of profiler events, moved code to dump a profiler
-	  event as a string to com.mysql.jdbc.log.LogUtils so that third
-	  parties can use it.
-
-	- DatabaseMetaData.supportsMultipleOpenResults() now returns true. The
-	  driver has supported this for some time, DBMD just missed that fact.
-
-	- Fixed BUG#10310 - Driver doesn't support {?=CALL(...)} for calling
-	  stored functions. This involved adding support for function retrieval
-	  to DatabaseMetaData.getProcedures() and getProcedureColumns() as well.
-
-	- Fixed BUG#10485, SQLException thrown when retrieving YEAR(2)
-	  with ResultSet.getString(). The driver will now always treat YEAR types
-	  as java.sql.Dates and return the correct values for getString().
-	  Alternatively, the "yearIsDateType" connection property can be set to
-	  "false" and the values will be treated as SHORTs.
-
-	- The datatype returned for TINYINT(1) columns when "tinyInt1isBit=true"
-	  (the default) can be switched between Types.BOOLEAN and Types.BIT
-	  using the new configuration property "transformedBitIsBoolean", which
-	  defaults to "false". If set to "false" (the default),
-	  DatabaseMetaData.getColumns() and ResultSetMetaData.getColumnType()
-	  will return Types.BOOLEAN for TINYINT(1) columns. If "true",
-	  Types.BOOLEAN will be returned instead. Irregardless of this configuration
-	  property, if "tinyInt1isBit" is enabled, columns with the type TINYINT(1)
-	  will be returned as java.lang.Boolean instances from
-	  ResultSet.getObject(..), and ResultSetMetaData.getColumnClassName()
-	  will return "java.lang.Boolean".
-
-	- Fixed BUG#10496 - SQLException is thrown when using property
-	  "characterSetResults" with cp932 or eucjpms.
-
-	- Reorganized directory layout, sources now in "src" folder,
-	  don't pollute parent directory when building, now output goes
-	  to "./build", distribution goes to "./dist".
-
-	- Added support/bug hunting feature that generates .sql test
-	  scripts to STDERR when "autoGenerateTestcaseScript" is set
-	  to "true".
-
-	- Fixed BUG#10850 - 0-length streams not sent to server when
-	  using server-side prepared statements.
-
-	- Setting "cachePrepStmts=true" now causes the Connection to also
-	  cache the check the driver performs to determine if a prepared
-	  statement can be server-side or not, as well as caches server-side
-	  prepared statements for the lifetime of a connection. As before,
-	  the "prepStmtCacheSize" parameter controls the size of these
-	  caches.
-
-	- Try to handle OutOfMemoryErrors more gracefully. Although not
-	  much can be done, they will in most cases close the connection
-	  they happened on so that further operations don't run into
-	  a connection in some unknown state. When an OOM has happened,
-	  any further operations on the connection will fail with a
-	  "Connection closed" exception that will also list the OOM exception
-	  as the reason for the implicit connection close event.
-
-	- Don't send COM_RESET_STMT for each execution of a server-side
-	  prepared statement if it isn't required.
-
-	- Driver detects if you're running MySQL-5.0.7 or later, and does
-	  not scan for "LIMIT ?[,?]" in statements being prepared, as the
-	  server supports those types of queries now.
-
-	- Fixed BUG#11115, Varbinary data corrupted when using server-side
-	  prepared statements and ResultSet.getBytes().
-
-	- Connection.setCatalog() is now aware of the "useLocalSessionState"
-	  configuration property, which when set to true will prevent
-	  the driver from sending "USE ..." to the server if the requested
-	  catalog is the same as the current catalog.
-
-	- Added the following configuration bundles, use one or many via
-	  the "useConfigs" configuration property:
-
-	    * maxPerformance -- maximum performance without being reckless
-	    * solarisMaxPerformance -- maximum performance for Solaris,
-	                               avoids syscalls where it can
-	    * 3-0-Compat -- Compatibility with Connector/J 3.0.x functionality
-
-	- Added "maintainTimeStats" configuration property (defaults to "true"),
-	  which tells the driver whether or not to keep track of the last query time
-	  and the last successful packet sent to the server's time. If set to
-	  false, removes two syscalls per query.
-
-	- Fixed BUG#11259, autoReconnect ping causes exception on connection
-	  startup.
-
-	- Fixed BUG#11360 Connector/J dumping query into SQLException twice
-
-	- Fixed PreparedStatement.setClob() not accepting null as a parameter.
-
-	- Fixed BUG#11411 - Production package doesn't include JBoss integration
-	  classes.
-
-	- Removed nonsensical "costly type conversion" warnings when using
-	  usage advisor.
-
-04-14-05 - Version 3.1.8-stable
-
-	- Fixed DatabaseMetaData.getTables() returning views when they were
-	  not asked for as one of the requested table types.
-
-	- Added support for new precision-math DECIMAL type in MySQL >= 5.0.3.
-
-	- Fixed ResultSet.getTime() on a NULL value for server-side prepared
-	  statements throws NPE.
-
-	- Made Connection.ping() a public method.
-
-	- Fixed Bug#8868, DATE_FORMAT() queries returned as BLOBs from getObject().
-
-	- ServerPreparedStatements now correctly 'stream' BLOB/CLOB data to the
-	  server. You can configure the threshold chunk size using the
-	  JDBC URL property 'blobSendChunkSize' (the default is one megabyte).
-
-    - BlobFromLocator now uses correct identifier quoting when generating
-      prepared statements.
-
-    - Server-side session variables can be preset at connection time by
-      passing them as a comma-delimited list for the connection property
-      'sessionVariables'.
-
-	- Fixed regression in ping() for users using autoReconnect=true.
-
-	- Fixed BUG#9040 - PreparedStatement.addBatch() doesn't work with server-side
-	  prepared statements and streaming BINARY data.
-
-	- Fixed BUG#8800 - DBMD.supportsMixedCase*Identifiers() returns wrong
-	  value on servers running on case-sensitive filesystems.
-
-	- Fixed BUG#9206, can not use 'UTF-8' for characterSetResults
-      configuration property.
-
-    - Fixed BUG#9236, a continuation of BUG#8868, where functions used in queries
-      that should return non-string types when resolved by temporary tables suddenly
-      become opaque binary strings (work-around for server limitation). Also fixed
-      fields with type of CHAR(n) CHARACTER SET BINARY to return correct/matching
-      classes for RSMD.getColumnClassName() and ResultSet.getObject().
-
-    - Fixed BUG#8792 - DBMD.supportsResultSetConcurrency() not returning
-	  true for forward-only/read-only result sets (we obviously support this).
-
-	- Fixed BUG#8803, 'DATA_TYPE' column from DBMD.getBestRowIdentifier()
-	  causes ArrayIndexOutOfBoundsException when accessed (and in fact, didn't
-	  return any value).
-
-	- Check for empty strings ('') when converting char/varchar column data to numbers,
-	  throw exception if 'emptyStringsConvertToZero' configuration property is set
-	  to 'false' (for backwards-compatibility with 3.0, it is now set to 'true'
-	  by default, but will most likely default to 'false' in 3.2).
-
-	- Fixed BUG#9320 - PreparedStatement.getMetaData() inserts blank row in database
-	  under certain conditions when not using server-side prepared statements.
-
-	- Connection.canHandleAsPreparedStatement() now makes 'best effort' to distinguish
-	  LIMIT clauses with placeholders in them from ones without in order to have fewer
-	  false positives when generating work-arounds for statements the server cannot
-	  currently handle as server-side prepared statements.
-
-	- Fixed build.xml to not compile log4j logging if log4j not available.
-
-	- Added support for the c3p0 connection pool's (http://c3p0.sf.net/)
-	  validation/connection checker interface which uses the lightweight
-	  'COM_PING' call to the server if available. To use it, configure your
-	  c3p0 connection pool's 'connectionTesterClassName' property to use
-	  'com.mysql.jdbc.integration.c3p0.MysqlConnectionTester'.
-
-	- Better detection of LIMIT inside/outside of quoted strings so that
-	  the driver can more correctly determine whether a prepared statement
-	  can be prepared on the server or not.
-
-	- Fixed BUG#9319 - Stored procedures with same name in
-	  different databases confuse the driver when it tries to determine
-	  parameter counts/types.
-
-    - Added finalizers to ResultSet and Statement implementations to be JDBC
-      spec-compliant, which requires that if not explicitly closed, these
-      resources should be closed upon garbage collection.
-
-    - Fixed BUG#9682 - Stored procedures with DECIMAL parameters with
-	  storage specifications that contained "," in them would fail.
-
-	- PreparedStatement.setObject(int, Object, int type, int scale) now
-	  uses scale value for BigDecimal instances.
-
-	- Fixed BUG#9704 - Statement.getMoreResults() could throw NPE when
-	  existing result set was .close()d.
-
-	- The performance metrics feature now gathers information about
-	  number of tables referenced in a SELECT.
-
-	- The logging system is now automatically configured. If the value has
-	  been set by the user, via the URL property "logger" or the system
-	  property "com.mysql.jdbc.logger", then use that, otherwise, autodetect
-	  it using the following steps:
-
-    	 Log4j, if it's available,
-    	 Then JDK1.4 logging,
-    	 Then fallback to our STDERR logging.
-
-   	- Fixed BUG#9778, DBMD.getTables() shouldn't return tables if views
-	  are asked for, even if the database version doesn't support views.
-
-	- Fixed driver not returning 'true' for '-1' when ResultSet.getBoolean()
-	  was called on result sets returned from server-side prepared statements.
-
-	- Added a Manifest.MF file with implementation information to the .jar
-	  file.
-
-	- More tests in Field.isOpaqueBinary() to distinguish opaque binary (i.e.
-	  fields with type CHAR(n) and CHARACTER SET BINARY) from output of
-	  various scalar and aggregate functions that return strings.
-
-	- Fixed BUG#9917 - Should accept null for catalog (meaning use current)
-	  in DBMD methods, even though it's not JDBC-compliant for legacy's sake.
-	  Disable by setting connection property "nullCatalogMeansCurrent" to "false"
-	  (which will be the default value in C/J 3.2.x).
-
-	- Fixed BUG#9769 - Should accept null for name patterns in DBMD (meaning "%"),
-	  even though it isn't JDBC compliant, for legacy's sake. Disable by setting
-	  connection property "nullNamePatternMatchesAll" to "false" (which will be
-	  the default value in C/J 3.2.x).
-
-02-18-05 - Version 3.1.7-stable
-
-
-    - Fixed BUG#7686, Timestamp key column data needed "_binary'"
-      stripped for UpdatableResultSet.refreshRow().
-
-    - Fixed BUG#7715 - Timestamps converted incorrectly to strings
-      with Server-side prepared statements and updatable result sets.
-
-    - Detect new sql_mode variable in string form (it used to be
-      integer) and adjust quoting method for strings appropriately.
-
-    - Added 'holdResultsOpenOverStatementClose' property (default is
-      false), that keeps result sets open over statement.close() or new
-      execution on same statement (suggested by Kevin Burton).
-
-    - Fixed BUG#7952 -- Infinite recursion when 'falling back' to master
-      in failover configuration.
-
-    - Disable multi-statements (if enabled) for MySQL-4.1 versions prior
-      to version 4.1.10 if the query cache is enabled, as the server
-      returns wrong results in this configuration.
-
-    - Fixed duplicated code in configureClientCharset() that prevented
-      useOldUTF8Behavior=true from working properly.
-
-    - Removed 'dontUnpackBinaryResults' functionality, the driver now
-      always stores results from server-side prepared statements as-is
-      from the server and unpacks them on demand.
-
-    - Fixed BUG#8096 where emulated locators corrupt binary data
-      when using server-side prepared statements.
-
-    - Fixed synchronization issue with
-      ServerPreparedStatement.serverPrepare() that could cause
-      deadlocks/crashes if connection was shared between threads.
-
-    - By default, the driver now scans SQL you are preparing via all
-      variants of Connection.prepareStatement() to determine if it is a
-      supported type of statement to prepare on the server side, and if
-      it is not supported by the server, it instead prepares it as a
-      client-side emulated prepared statement (BUG#4718). You can
-      disable this by passing 'emulateUnsupportedPstmts=false' in your
-      JDBC URL.
-
-    - Remove _binary introducer from parameters used as in/out
-      parameters in CallableStatement.
-
-    - Always return byte[]s for output parameters registered as *BINARY.
-
-    - Send correct value for 'boolean' "true" to server for
-      PreparedStatement.setObject(n, "true", Types.BIT).
-
-    - Fixed bug with Connection not caching statements from
-      prepareStatement() when the statement wasn't a server-side
-      prepared statement.
-
-    - Choose correct 'direction' to apply time adjustments when both
-      client and server are in GMT timezone when using
-      ResultSet.get(..., cal) and PreparedStatement.set(...., cal).
-
-    - Added 'dontTrackOpenResources' option (default is false, to be
-      JDBC compliant), which helps with memory use for non-well-behaved
-      apps (i.e applications which don't close Statements when they
-      should).
-
-    - Fixed BUG#8428 - ResultSet.getString() doesn't maintain format
-      stored on server, bug fix only enabled when 'noDatetimeStringSync'
-      property is set to 'true' (the default is 'false').
-
-    - Fixed NPE in ResultSet.realClose() when using usage advisor and
-      result set was already closed.
-
-    - Fixed BUG#8487 - PreparedStatements not creating streaming result
-      sets.
-
-    - Don't pass NULL to String.valueOf() in
-      ResultSet.getNativeConvertToString(), as it stringifies it (i.e.
-      returns "null"), which is not correct for the method in question.
-
-    - Fixed BUG#8484 - ResultSet.getBigDecimal() throws exception
-      when rounding would need to occur to set scale. The driver now
-      chooses a rounding mode of 'half up' if non-rounding
-      BigDecimal.setScale() fails.
-
-    - Added 'useLocalSessionState' configuration property, when set to
-      'true' the JDBC driver trusts that the application is well-behaved
-      and only sets autocommit and transaction isolation levels using
-      the methods provided on java.sql.Connection, and therefore can
-      manipulate these values in many cases without incurring
-      round-trips to the database server.
-
-    - Added enableStreamingResults() to Statement for connection pool
-      implementations that check Statement.setFetchSize() for
-      specification-compliant values. Call Statement.setFetchSize(>=0)
-      to disable the streaming results for that statement.
-
-    - Added support for BIT type in MySQL-5.0.3. The driver will treat
-      BIT(1-8) as the JDBC standard BIT type (which maps to
-      java.lang.Boolean), as the server does not currently send enough
-      information to determine the size of a bitfield when < 9 bits are
-      declared. BIT(>9) will be treated as VARBINARY, and will return
-      byte[] when getObject() is called.
-
-12-23-04 - Version 3.1.6-stable
-
-    - Fixed hang on SocketInputStream.read() with Statement.setMaxRows() and
-      multiple result sets when driver has to truncate result set directly,
-      rather than tacking a 'LIMIT n' on the end of it.
-
-    - Fixed BUG#7026 - DBMD.getProcedures() doesn't respect catalog parameter.
-
-    - Respect bytes-per-character for RSMD.getPrecision().
-
-12-02-04 - Version 3.1.5-gamma
-
-	- Fix comparisons made between string constants and dynamic strings that
-	  are either toUpperCase()d or toLowerCase()d to use Locale.ENGLISH, as
-	  some locales 'override' case rules for English. Also use
-	  StringUtils.indexOfIgnoreCase() instead of .toUpperCase().indexOf(),
-	  avoids creating a very short-lived transient String instance.
-
-	- Fixed BUG#5235 - Server-side prepared statements did not honor
-      'zeroDateTimeBehavior' property, and would cause class-cast
-      exceptions when using ResultSet.getObject(), as the all-zero string
-      was always returned.
-
-    - Fixed batched updates with server prepared statements weren't looking if
-      the types had changed for a given batched set of parameters compared
-      to the previous set, causing the server to return the error
-      'Wrong arguments to mysql_stmt_execute()'.
-
-    - Handle case when string representation of timestamp contains trailing '.'
-      with no numbers following it.
-
-    - Fixed BUG#5706 - Inefficient detection of pre-existing string instances
-      in ResultSet.getNativeString().
-
-    - Don't throw exceptions for Connection.releaseSavepoint().
-
-    - Use a per-session Calendar instance by default when decoding dates
-      from ServerPreparedStatements (set to old, less performant behavior by
-      setting property 'dynamicCalendars=true').
-
-    - Added experimental configuration property 'dontUnpackBinaryResults',
-      which delays unpacking binary result set values until they're asked for,
-      and only creates object instances for non-numerical values (it is set
-      to 'false' by default). For some usecase/jvm combinations, this is
-      friendlier on the garbage collector.
-
-    - Fixed BUG#5729 - UNSIGNED BIGINT unpacked incorrectly from
-      server-side prepared statement result sets.
-
-    - Fixed BUG#6225 - ServerSidePreparedStatement allocating short-lived
-      objects un-necessarily.
-
-    - Removed un-wanted new Throwable() in ResultSet constructor due to bad
-      merge (caused a new object instance that was never used for every result
-      set created) - Found while profiling for BUG#6359.
-
-    - Fixed too-early creation of StringBuffer in EscapeProcessor.escapeSQL(),
-      also return String when escaping not needed (to avoid unnecssary object
-      allocations). Found while profiling for BUG#6359.
-
-    - Use null-safe-equals for key comparisons in updatable result sets.
-
-    - Fixed BUG#6537, SUM() on Decimal with server-side prepared statement ignores
-      scale if zero-padding is needed (this ends up being due to conversion to DOUBLE
-      by server, which when converted to a string to parse into BigDecimal, loses all
-      'padding' zeros).
-
-    - Use DatabaseMetaData.getIdentifierQuoteString() when building DBMD
-      queries.
-
-    - Use 1MB packet for sending file for LOAD DATA LOCAL INFILE if that
-      is < 'max_allowed_packet' on server.
-
-    - Fixed BUG#6399, ResultSetMetaData.getColumnDisplaySize() returns incorrect
-      values for multibyte charsets.
-
-    - Make auto-deserialization of java.lang.Objects stored in BLOBs
-      configurable via 'autoDeserialize' property (defaults to 'false').
-
-    - Re-work Field.isOpaqueBinary() to detect 'CHAR(n) CHARACTER SET BINARY'
-      to support fixed-length binary fields for ResultSet.getObject().
-
-    - Use our own implementation of buffered input streams to get around
-      blocking behavior of java.io.BufferedInputStream. Disable this with
-      'useReadAheadInput=false'.
-
-    - Fixed BUG#6348, failing to connect to the server when one of the
-      addresses for the given host name is IPV6 (which the server does
-      not yet bind on). The driver now loops through _all_ IP addresses
-      for a given host, and stops on the first one that accepts() a
-      socket.connect().
-
-09-04-04 - Version 3.1.4-beta
-
-    - Fixed BUG#4510 - connector/j 3.1.3 beta does not handle integers
-      correctly (caused by changes to support unsigned reads in
-      Buffer.readInt() -> Buffer.readShort()).
-
-    - Added support in DatabaseMetaData.getTables() and getTableTypes()
-      for VIEWs which are now available in MySQL server version 5.0.x.
-
-    - Fixed BUG#4642 -- ServerPreparedStatement.execute*() sometimes
-      threw ArrayIndexOutOfBoundsException when unpacking field metadata.
-
-    - Optimized integer number parsing, enable 'old' slower integer parsing
-      using JDK classes via 'useFastIntParsing=false' property.
-
-    - Added 'useOnlyServerErrorMessages' property, which causes message text
-      in exceptions generated by the server to only contain the text sent by
-      the server (as opposed to the SQLState's 'standard' description, followed
-      by the server's error message). This property is set to 'true' by default.
-
-    - Fixed BUG#4689 - ResultSet.wasNull() does not work for primatives if a
-      previous null was returned.
-
-    - Track packet sequence numbers if enablePacketDebug=true, and throw an
-      exception if packets received out-of-order.
-
-    - Fixed BUG#4482, ResultSet.getObject() returns wrong type for strings
-      when using prepared statements.
-
-    - Calling MysqlPooledConnection.close() twice (even though an application
-      error), caused NPE. Fixed.
-
-    - Fixed BUG#5012 -- ServerPreparedStatements dealing with return of
-	  DECIMAL type don't work.
-
-	- Fixed BUG#5032 -- ResultSet.getObject() doesn't return
-      type Boolean for pseudo-bit types from prepared statements on 4.1.x
-      (shortcut for avoiding extra type conversion when using binary-encoded
-      result sets obscurred test in getObject() for 'pseudo' bit type)
-
-    - You can now use URLs in 'LOAD DATA LOCAL INFILE' statements, and the
-      driver will use Java's built-in handlers for retreiving the data and
-      sending it to the server. This feature is not enabled by default,
-      you must set the 'allowUrlInLocalInfile' connection property to 'true'.
-
-    - The driver is more strict about truncation of numerics on
-      ResultSet.get*(), and will throw a SQLException when truncation is
-      detected. You can disable this by setting 'jdbcCompliantTruncation' to
-      false (it is enabled by default, as this functionality is required
-      for JDBC compliance).
-
-    - Added three ways to deal with all-zero datetimes when reading them from
-      a ResultSet, 'exception' (the default), which throws a SQLException
-      with a SQLState of 'S1009', 'convertToNull', which returns NULL instead of
-      the date, and 'round', which rounds the date to the nearest closest value
-      which is '0001-01-01'.
-
-    - Fixed ServerPreparedStatement to read prepared statement metadata off
-      the wire, even though it's currently a placeholder instead of using
-      MysqlIO.clearInputStream() which didn't work at various times because
-      data wasn't available to read from the server yet. This fixes sporadic
-      errors users were having with ServerPreparedStatements throwing
-      ArrayIndexOutOfBoundExceptions.
-
-    - Use com.mysql.jdbc.Message's classloader when loading resource bundle,
-      should fix sporadic issues when the caller's classloader can't locate
-      the resource bundle.
-
-07-07-04 - Version 3.1.3-beta
-
-	- Mangle output parameter names for CallableStatements so they
-	  will not clash with user variable names.
-
-	- Added support for INOUT parameters in CallableStatements.
-
-	- Fix for BUG#4119, null bitmask sent for server-side prepared
-	  statements was incorrect.
-
-	- Use SQL Standard SQL states by default, unless 'useSqlStateCodes'
-	  property is set to 'false'.
-
-	- Added packet debuging code (see the 'enablePacketDebug' property
-	  documentation).
-
-	- Added constants for MySQL error numbers (publicly-accessible,
-	  see com.mysql.jdbc.MysqlErrorNumbers), and the ability to
-	  generate the mappings of vendor error codes to SQLStates
-	  that the driver uses (for documentation purposes).
-
-	- Externalized more messages (on-going effort).
-
-	- Fix for BUG#4311 - Error in retrieval of mediumint column with
-	  prepared statements and binary protocol.
-
-	- Support new timezone variables in MySQL-4.1.3 when
-	  'useTimezone=true'
-
-	- Support for unsigned numerics as return types from prepared statements.
-	  This also causes a change in ResultSet.getObject() for the 'bigint unsigned'
-	  type, which used to return BigDecimal instances, it now returns instances
-	  of java.lang.BigInteger.
-
-06-09-04 - Version 3.1.2-alpha
-
-	- Fixed stored procedure parameter parsing info when size was
-	  specified for a parameter (i.e. char(), varchar()).
-
-	- Enabled callable statement caching via 'cacheCallableStmts'
-	  property.
-
-	- Fixed case when no output parameters specified for a
-	  stored procedure caused a bogus query to be issued
-	  to retrieve out parameters, leading to a syntax error
-	  from the server.
-
-	- Fixed case when no parameters could cause a NullPointerException
-	  in CallableStatement.setOutputParameters().
-
-	- Removed wrapping of exceptions in MysqlIO.changeUser().
-
-	- Fixed sending of split packets for large queries, enabled nio
-	  ability to send large packets as well.
-
-	- Added .toString() functionality to ServerPreparedStatement,
-	  which should help if you're trying to debug a query that is
-	  a prepared statement (it shows SQL as the server would process).
-
-	- Added 'gatherPerformanceMetrics' property, along with properties
-	  to control when/where this info gets logged (see docs for more
-	  info).
-
-	- ServerPreparedStatements weren't actually de-allocating
-	  server-side resources when .close() was called.
-
-	- Added 'logSlowQueries' property, along with property
-	  'slowQueriesThresholdMillis' to control when a query should
-	  be considered 'slow'.
-
-	- Correctly map output parameters to position given in
-	  prepareCall() vs. order implied during registerOutParameter() -
-	  fixes BUG#3146.
-
-	- Correctly detect initial character set for servers >= 4.1.0
-
-	- Cleaned up detection of server properties.
-
-	- Support placeholder for parameter metadata for server >= 4.1.2
-
-	- Fix for BUG#3539 getProcedures() does not return any procedures in
-	  result set
-
-	- Fix for BUG#3540 getProcedureColumns() doesn't work with wildcards
-	  for procedure name
-
-	- Fixed BUG#3520 -- DBMD.getSQLStateType() returns incorrect value.
-
-	- Added 'connectionCollation' property to cause driver to issue
-	  'set collation_connection=...' query on connection init if default
-	  collation for given charset is not appropriate.
-
-	- Fixed DatabaseMetaData.getProcedures() when run on MySQL-5.0.0 (output of
-	'show procedure status' changed between 5.0.1 and 5.0.0.
-
-	- Fixed BUG#3804 -- getWarnings() returns SQLWarning instead of DataTruncation
-
-	- Don't enable server-side prepared statements for server version 5.0.0 or 5.0.1,
-	as they aren't compatible with the '4.1.2+' style that the driver uses (the driver
-	expects information to come back that isn't there, so it hangs).
-
-
-02-14-04 - Version 3.1.1-alpha
-
-    - Fixed bug with UpdatableResultSets not using client-side
-	  prepared statements.
-
-	- Fixed character encoding issues when converting bytes to
-	  ASCII when MySQL doesn't provide the character set, and
-	  the JVM is set to a multibyte encoding (usually affecting
-	  retrieval of numeric values).
-
-	- Unpack 'unknown' data types from server prepared statements
-	  as Strings.
-
-	- Implemented long data (Blobs, Clobs, InputStreams, Readers)
-	  for server prepared statements.
-
-	- Implemented Statement.getWarnings() for MySQL-4.1 and newer
-	  (using 'SHOW WARNINGS').
-
-	- Default result set type changed to TYPE_FORWARD_ONLY
-	  (JDBC compliance).
-
-	- Centralized setting of result set type and concurrency.
-
-	- Re-factored how connection properties are set and exposed
-	  as DriverPropertyInfo as well as Connection and DataSource
-	  properties.
-
-	- Support for NIO. Use 'useNIO=true' on platforms that support
-	  NIO.
-
-	- Support for SAVEPOINTs (MySQL >= 4.0.14 or 4.1.1).
-
-	- Support for mysql_change_user()...See the changeUser() method
-	  in com.mysql.jdbc.Connection.
-
-	- Reduced number of methods called in average query to be more
-	  efficient.
-
-	- Prepared Statements will be re-prepared on auto-reconnect. Any errors
-	  encountered are postponed until first attempt to re-execute the
-	  re-prepared statement.
-
-	- Ensure that warnings are cleared before executing queries
-	  on prepared statements, as-per JDBC spec (now that we support
-	  warnings).
-
-	- Support 'old' profileSql capitalization in ConnectionProperties.
-	  This property is deprecated, you should use 'profileSQL' if possible.
-
-	- Optimized Buffer.readLenByteArray() to return shared empty byte array
-	  when length is 0.
-
-	- Allow contents of PreparedStatement.setBlob() to be retained
-	  between calls to .execute*().
-
-	- Deal with 0-length tokens in EscapeProcessor (caused by callable
-	  statement escape syntax).
-
-	- Check for closed connection on delete/update/insert row operations in
-	  UpdatableResultSet.
-
-	- Fix support for table aliases when checking for all primary keys in
-	  UpdatableResultSet.
-
-	- Removed useFastDates connection property.
-
-	- Correctly initialize datasource properties from JNDI Refs, including
-	  explicitly specified URLs.
-
-	- DatabaseMetaData now reports supportsStoredProcedures() for
-	  MySQL versions >= 5.0.0
-
-	- Fixed stack overflow in Connection.prepareCall() (bad merge).
-
-	- Fixed IllegalAccessError to Calendar.getTimeInMillis() in DateTimeValue
-	  (for JDK < 1.4).
-
-	- Fix for BUG#1673, where DatabaseMetaData.getColumns() is not
-      returning correct column ordinal info for non '%' column name patterns.
-
-    - Merged fix of datatype mapping from MySQL type 'FLOAT' to
-      java.sql.Types.REAL from 3.0 branch.
-
-    - Detect collation of column for RSMD.isCaseSensitive().
-
-    - Fixed sending of queries > 16M.
-
-    - Added named and indexed input/output parameter support to CallableStatement.
-      MySQL-5.0.x or newer.
-
-    - Fixed NullPointerException in ServerPreparedStatement.setTimestamp(),
-      as well as year and month descrepencies in
-      ServerPreparedStatement.setTimestamp(), setDate().
-
-    - Added ability to have multiple database/JVM targets for compliance
-      and regression/unit tests in build.xml.
-
-    - Fixed NPE and year/month bad conversions when accessing some
-      datetime functionality in ServerPreparedStatements and their
-      resultant result sets.
-
-    - Display where/why a connection was implicitly closed (to
-      aid debugging).
-
-    - CommunicationsException implemented, that tries to determine
-      why communications was lost with a server, and displays
-      possible reasons when .getMessage() is called.
-
-    - Fixed BUG#2359, NULL values for numeric types in binary
-      encoded result sets causing NullPointerExceptions.
-
-    - Implemented Connection.prepareCall(), and DatabaseMetaData.
-      getProcedures() and getProcedureColumns().
-
-    - Reset 'long binary' parameters in ServerPreparedStatement when
-      clearParameters() is called, by sending COM_RESET_STMT to the
-      server.
-
-    - Merged prepared statement caching, and .getMetaData() support
-      from 3.0 branch.
-
-    - Fixed off-by-1900 error in some cases for
-      years in TimeUtil.fastDate/TimeCreate() when unpacking results
-      from server-side prepared statements.
-
-    - Fixed BUG#2502 -- charset conversion issue in getTables().
-
-    - Implemented multiple result sets returned from a statement
-      or stored procedure.
-
-    - Fixed BUG#2606 -- Server side prepared statements not returning
-      datatype 'YEAR' correctly.
-
-    - Enabled streaming of result sets from server-side prepared
-      statements.
-
-    - Fixed BUG#2623 -- Class-cast exception when using
-      scrolling result sets and server-side prepared statements.
-
-	- Merged unbuffered input code from 3.0.
-
-	- Fixed ConnectionProperties that weren't properly exposed
-	  via accessors, cleaned up ConnectionProperties code.
-
-	- Fixed BUG#2671, NULL fields not being encoded correctly in
-	  all cases in server side prepared statements.
-
-	- Fixed rare buffer underflow when writing numbers into buffers
-	  for sending prepared statement execution requests.
-
-	- Use DocBook version of docs for shipped versions of drivers.
-
-
-02-18-03 - Version 3.1.0-alpha
-
-    - Added 'requireSSL' property.
-
-    - Added 'useServerPrepStmts' property (default 'false'). The
-      driver will use server-side prepared statements when the
-      server version supports them (4.1 and newer) when this
-      property is set to 'true'. It is currently set to 'false'
-      by default until all bind/fetch functionality has been
-      implemented. Currently only DML prepared statements are
-      implemented for 4.1 server-side prepared statements.
-
-    - Track open Statements, close all when Connection.close()
-      is called (JDBC compliance).
-
-06-22-05 - Version 3.0.17-ga
-
-    - Fixed BUG#5874, Timestamp/Time conversion goes in the wrong 'direction'
-      when useTimeZone='true' and server timezone differs from client timezone.
-
-	- Fixed BUG#7081, DatabaseMetaData.getIndexInfo() ignoring 'unique'
-	  parameter.
-
-	- Support new protocol type 'MYSQL_TYPE_VARCHAR'.
-
-	- Added 'useOldUTF8Behavoior' configuration property, which causes
-	  JDBC driver to act like it did with MySQL-4.0.x and earlier when
-	  the character encoding is 'utf-8' when connected to MySQL-4.1 or
-	  newer.
-
-	- Fixed BUG#7316 - Statements created from a pooled connection were
-	  returning physical connection instead of logical connection when
-	  getConnection() was called.
-
-	- Fixed BUG#7033 - PreparedStatements don't encode Big5 (and other
-	  multibyte) character sets correctly in static SQL strings.
-
-	- Fixed BUG#6966, connections starting up failed-over (due to down master)
-      never retry master.
-
-    - Fixed BUG#7061, PreparedStatement.fixDecimalExponent() adding extra
-      '+', making number unparseable by MySQL server.
-
-    - Fixed BUG#7686, Timestamp key column data needed "_binary'" stripped for
-      UpdatableResultSet.refreshRow().
-
-    - Backported SQLState codes mapping from Connector/J 3.1, enable with
-      'useSqlStateCodes=true' as a connection property, it defaults to
-      'false' in this release, so that we don't break legacy applications (it
-      defaults to 'true' starting with Connector/J 3.1).
-
-    - Fixed BUG#7601, PreparedStatement.fixDecimalExponent() adding extra
-      '+', making number unparseable by MySQL server.
-
-    - Escape sequence {fn convert(..., type)} now supports ODBC-style types
-      that are prepended by 'SQL_'.
-
-    - Fixed duplicated code in configureClientCharset() that prevented
-      useOldUTF8Behavior=true from working properly.
-
-    - Handle streaming result sets with > 2 billion rows properly by fixing
-      wraparound of row number counter.
-
-    - Fixed BUG#7607 - MS932, SHIFT_JIS and Windows_31J not recog. as
-      aliases for sjis.
-
-    - Fixed BUG#6549 (while fixing #7607), adding 'CP943' to aliases for
-      sjis.
-
-    - Fixed BUG#8064, which requires hex escaping of binary data when using
-      multibyte charsets with prepared statements.
-
-    - Fixed BUG#8812, NON_UNIQUE column from DBMD.getIndexInfo() returned
-      inverted value.
-
-    - Workaround for server BUG#9098 - default values of CURRENT_* for
-      DATE/TIME/TIMESTAMP/TIMESTAMP columns can't be distinguished from
-      'string' values, so UpdatableResultSet.moveToInsertRow() generates
-      bad SQL for inserting default values.
-
-    - Fixed BUG#8629 - 'EUCKR' charset is sent as 'SET NAMES euc_kr' which
-      MySQL-4.1 and newer doesn't understand.
-
-    - DatabaseMetaData.supportsSelectForUpdate() returns correct value based
-      on server version.
-
-    - Use hex escapes for PreparedStatement.setBytes() for double-byte charsets
-      including 'aliases' Windows-31J, CP934, MS932.
-
-    - Added support for the "EUC_JP_Solaris" character encoding, which maps
-      to a MySQL encoding of "eucjpms" (backported from 3.1 branch). This only
-      works on servers that support eucjpms, namely 5.0.3 or later.
-
-11-15-04 - Version 3.0.16-ga
-
-	- Re-issue character set configuration commands when re-using pooled
-	  connections and/or Connection.changeUser() when connected to MySQL-4.1
-	  or newer.
-
-	- Fixed ResultSetMetaData.isReadOnly() to detect non-writable columns
-	  when connected to MySQL-4.1 or newer, based on existence of 'original'
-	  table and column names.
-
-	- Fixed BUG#5664, ResultSet.updateByte() when on insert row
-      throws ArrayOutOfBoundsException.
-
-    - Fixed DatabaseMetaData.getTypes() returning incorrect (i.e. non-negative)
-      scale for the 'NUMERIC' type.
-
-    - Fixed BUG#6198, off-by-one bug in Buffer.readString(string).
-
-    - Made TINYINT(1) -> BIT/Boolean conversion configurable via 'tinyInt1isBit'
-      property (default 'true' to be JDBC compliant out of the box).
-
-    - Only set 'character_set_results' during connection establishment if
-      server version >= 4.1.1.
-
-    - Fixed regression where useUnbufferedInput was defaulting to 'false'.
-
-    - Fixed BUG#6231, ResultSet.getTimestamp() on a column with TIME in it
-      fails.
-
-09-04-04 - Version 3.0.15-ga
-
-	- Fixed BUG#4010 - StringUtils.escapeEasternUnicodeByteStream is still
-	  broken for GBK
-
-	- Fixed BUG#4334 - Failover for autoReconnect not using port #'s for any
-	  hosts, and not retrying all hosts. (WARN: This required a change to
-	  the SocketFactory connect() method signature, which is now
-
-	    public Socket connect(String host, int portNumber, Properties props),
-
-	  therefore any third-party socket factories will have to be changed
-	  to support this signature.
-
-	- Logical connections created by MysqlConnectionPoolDataSource will
-	  now issue a rollback() when they are closed and sent back to the pool.
-	  If your application server/connection pool already does this for you, you
-	  can set the 'rollbackOnPooledClose' property to false to avoid the
-	  overhead of an extra rollback().
-
-	- Removed redundant calls to checkRowPos() in ResultSet.
-
-	- Fixed BUG#4742, 'DOUBLE' mapped twice in DBMD.getTypeInfo().
-
-	- Added FLOSS license exemption.
-
-	- Fixed BUG#4808, calling .close() twice on a PooledConnection causes NPE.
-
-	- Fixed BUG#4138 and BUG#4860, DBMD.getColumns() returns incorrect JDBC
-	  type for unsigned columns. This affects type mappings for all numeric
-	  types in the RSMD.getColumnType() and RSMD.getColumnTypeNames() methods
-	  as well, to ensure that 'like' types from DBMD.getColumns() match up
-	  with what RSMD.getColumnType() and getColumnTypeNames() return.
-
-	- 'Production' - 'GA' in naming scheme of distributions.
-
-	- Fix for BUG#4880, RSMD.getPrecision() returning 0 for non-numeric types
-	  (should return max length in chars for non-binary types, max length
-	  in bytes for binary types). This fix also fixes mapping of
-	  RSMD.getColumnType() and RSMD.getColumnTypeName() for the BLOB types based
-	  on the length sent from the server (the server doesn't distinguish between
-	  TINYBLOB, BLOB, MEDIUMBLOB or LONGBLOB at the network protocol level).
-
-	- Fixed BUG#5022 - ResultSet should release Field[] instance in .close().
-
-    - Fixed BUG#5069 -- ResultSet.getMetaData() should not return
-	  incorrectly-initialized metadata if the result set has been closed, but
-	  should instead throw a SQLException. Also fixed for getRow() and
-	  getWarnings() and traversal methods by calling checkClosed() before
-	  operating on instance-level fields that are nullified during .close().
-
-	- Parse new timezone variables from 4.1.x servers.
-
-	- Use _binary introducer for PreparedStatement.setBytes() and
-	  set*Stream() when connected to MySQL-4.1.x or newer to avoid
-	  misinterpretation during character conversion.
-
-05-28-04 - Version 3.0.14-production
-
-	- Fixed URL parsing error
-
-05-27-04 - Version 3.0.13-production
-
-	- Fixed BUG#3848 - Using a MySQLDatasource without server name fails
-
-	- Fixed BUG#3920 - "No Database Selected" when using
-	  MysqlConnectionPoolDataSource.
-
-	- Fixed BUG#3873 - PreparedStatement.getGeneratedKeys() method returns only
-	  1 result for batched insertions
-
-05-18-04 - Version 3.0.12-production
-
-	- Add unsigned attribute to DatabaseMetaData.getColumns() output
-	  in the TYPE_NAME column.
-
-	- Added 'failOverReadOnly' property, to allow end-user to configure
-	  state of connection (read-only/writable) when failed over.
-
-	- Backported 'change user' and 'reset server state' functionality
-      from 3.1 branch, to allow clients of MysqlConnectionPoolDataSource
-      to reset server state on getConnection() on a pooled connection.
-
-    - Don't escape SJIS/GBK/BIG5 when using MySQL-4.1 or newer.
-
-    - Allow 'url' parameter for MysqlDataSource and MysqlConnectionPool
-      DataSource so that passing of other properties is possible from
-      inside appservers.
-
-    - Map duplicate key and foreign key errors to SQLState of
-      '23000'.
-
-    - Backport documentation tooling from 3.1 branch.
-
-    - Return creating statement for ResultSets created by
-      getGeneratedKeys() (BUG#2957)
-
-    - Allow java.util.Date to be sent in as parameter to
-      PreparedStatement.setObject(), converting it to a Timestamp
-      to maintain full precision (BUG#3103).
-
-    - Don't truncate BLOBs/CLOBs when using setBytes() and/or
-      setBinary/CharacterStream() (BUG#2670).
-
-    - Dynamically configure character set mappings for field-level
-      character sets on MySQL-4.1.0 and newer using 'SHOW COLLATION'
-      when connecting.
-
-    - Map 'binary' character set to 'US-ASCII' to support DATETIME
-      charset recognition for servers >= 4.1.2
-
-    - Use 'SET character_set_results" during initialization to allow any
-      charset to be returned to the driver for result sets.
-
-    - Use charsetnr returned during connect to encode queries before
-      issuing 'SET NAMES' on MySQL >= 4.1.0.
-
-    - Add helper methods to ResultSetMetaData (getColumnCharacterEncoding()
-      and getColumnCharacterSet()) to allow end-users to see what charset
-      the driver thinks it should be using for the column.
-
-    - Only set character_set_results for MySQL >= 4.1.0.
-
-    - Fixed BUG#3511, StringUtils.escapeSJISByteStream() not covering all
-      eastern double-byte charsets correctly.
-
-    - Renamed StringUtils.escapeSJISByteStream() to more appropriate
-      escapeEasternUnicodeByteStream().
-
-    - Fixed BUG#3554 - Not specifying database in URL caused MalformedURL
-      exception.
-
-    - Auto-convert MySQL encoding names to Java encoding names if used
-      for characterEncoding property.
-
-    - Added encoding names that are recognized on some JVMs to fix case
-      where they were reverse-mapped to MySQL encoding names incorrectly.
-
-    - Use junit.textui.TestRunner for all unit tests (to allow them to be
-      run from the command line outside of Ant or Eclipse).
-
-    - Fixed BUG#3557 - UpdatableResultSet not picking up default values
-      for moveToInsertRow().
-
-    - Fixed BUG#3570 - inconsistent reporting of column type. The server
-      still doesn't return all types for *BLOBs *TEXT correctly, so the
-      driver won't return those correctly.
-
-    - Fixed BUG#3520 -- DBMD.getSQLStateType() returns incorrect value.
-
-    - Fixed regression in PreparedStatement.setString() and eastern character
-      encodings.
-
-    - Made StringRegressionTest 4.1-unicode aware.
-
-02-19-04 - Version 3.0.11-stable
-
-	- Trigger a 'SET NAMES utf8' when encoding is forced to 'utf8' _or_
-	  'utf-8' via the 'characterEncoding' property. Previously, only the
-	  Java-style encoding name of 'utf-8' would trigger this.
-
-	- AutoReconnect time was growing faster than exponentially (BUG#2447).
-
-	- Fixed failover always going to last host in list (BUG#2578)
-
-	- Added 'useUnbufferedInput' parameter, and now use it by default
-	  (due to JVM issue
-	  http://developer.java.sun.com/developer/bugParade/bugs/4401235.html)
-
-	- Detect 'on/off' or '1','2','3' form of lower_case_table_names on
-	  server.
-
-	- Return 'java.lang.Integer' for TINYINT and SMALLINT types from
-	  ResultSetMetaData.getColumnClassName() (fix for BUG#2852).
-
-	- Return 'java.lang.Double' for FLOAT type from ResultSetMetaData.
-	  getColumnClassName() (fix for BUG#2855).
-
-	- Return '[B' instead of java.lang.Object for BINARY, VARBINARY and
-	  LONGVARBINARY types from ResultSetMetaData.getColumnClassName()
-	  (JDBC compliance).
-
-01-13-04 - Version 3.0.10-stable
-
-    - Don't count quoted id's when inside a 'string' in PreparedStatement
-      parsing (fix for BUG#1511).
-
-    - 'Friendlier' exception message for PacketTooLargeException
-       (BUG#1534).
-
-    - Backported fix for aliased tables and UpdatableResultSets in
-      checkUpdatability() method from 3.1 branch.
-
-    - Fix for ArrayIndexOutOfBounds exception when using Statement.setMaxRows()
-      (BUG#1695).
-
-    - Fixed BUG#1576, dealing with large blobs and split packets not being
-      read correctly.
-
-    - Fixed regression of Statement.getGeneratedKeys() and REPLACE statements.
-
-    - Fixed BUG#1630, subsequent call to ResultSet.updateFoo() causes NPE if
-      result set is not updatable.
-
-    - Fix for 4.1.1-style auth with no password.
-
-    - Fix for BUG#1731, Foreign Keys column sequence is not consistent in
-      DatabaseMetaData.getImported/Exported/CrossReference().
-
-    - Fix for BUG#1775 - DatabaseMetaData.getSystemFunction() returning
-      bad function 'VResultsSion'.
-
-    - Fix for BUG#1592 -- cross-database updatable result sets
-      are not checked for updatability correctly.
-
-    - DatabaseMetaData.getColumns() should return Types.LONGVARCHAR for
-      MySQL LONGTEXT type.
-
-    - ResultSet.getObject() on TINYINT and SMALLINT columns should return
-      Java type 'Integer' (BUG#1913)
-
-    - Added 'alwaysClearStream' connection property, which causes the driver
-      to always empty any remaining data on the input stream before
-      each query.
-
-    - Added more descriptive error message 'Server Configuration Denies
-      Access to DataSource', as well as retrieval of message from server.
-
-    - Autoreconnect code didn't set catalog upon reconnect if it had been
-      changed.
-
-    - Implement ResultSet.updateClob().
-
-    - ResultSetMetaData.isCaseSensitive() returned wrong value for CHAR/VARCHAR
-      columns.
-
-    - Fix for BUG#1933 -- Connection property "maxRows" not honored.
-
-    - Fix for BUG#1925 -- Statements being created too many times in
-      DBMD.extractForeignKeyFromCreateTable().
-
-    - Fix for BUG#1914 -- Support escape sequence {fn convert ... }
-
-    - Fix for BUG#1958 -- ArrayIndexOutOfBounds when parameter number ==
-      number of parameters + 1.
-
-    - Fix for BUG#2006 -- ResultSet.findColumn() should use first matching
-      column name when there are duplicate column names in SELECT query
-      (JDBC-compliance).
-
-    - Removed static synchronization bottleneck from
-      PreparedStatement.setTimestamp().
-
-    - Removed static synchronization bottleneck from instance factory
-      method of SingleByteCharsetConverter.
-
-    - Enable caching of the parsing stage of prepared statements via
-      the 'cachePrepStmts', 'prepStmtCacheSize' and 'prepStmtCacheSqlLimit'
-      properties (disabled by default).
-
-    - Speed up parsing of PreparedStatements, try to use one-pass whenever
-      possible.
-
-    - Fixed security exception when used in Applets (applets can't
-      read the system property 'file.encoding' which is needed
-      for LOAD DATA LOCAL INFILE).
-
-    - Use constants for SQLStates.
-
-    - Map charset 'ko18_ru' to 'ko18r' when connected to MySQL-4.1.0 or
-      newer.
-
-    - Ensure that Buffer.writeString() saves room for the \0.
-
-    - Fixed exception 'Unknown character set 'danish' on connect w/ JDK-1.4.0
-
-    - Fixed mappings in SQLError to report deadlocks with SQLStates of '41000'.
-
-    - 'maxRows' property would affect internal statements, so check it for all
-      statement creation internal to the driver, and set to 0 when it is not.
-
-10-07-03 - Version 3.0.9-stable
-
-	- Faster date handling code in ResultSet and PreparedStatement (no longer
-	  uses Date methods that synchronize on static calendars).
-
-	- Fixed test for end of buffer in Buffer.readString().
-
-	- Fixed ResultSet.previous() behavior to move current
-	  position to before result set when on first row
-	  of result set (bugs.mysql.com BUG#496)
-
-	- Fixed Statement and PreparedStatement issuing bogus queries
-	  when setMaxRows() had been used and a LIMIT clause was present
-	  in the query.
-
-	- Fixed BUG#661 - refreshRow didn't work when primary key values
-	  contained values that needed to be escaped (they ended up being
-	  doubly-escaped).
-
-	- Support InnoDB contraint names when extracting foreign key info
-	  in DatabaseMetaData BUG#517 and BUG#664
-	  (impl. ideas from Parwinder Sekhon)
-
-	- Backported 4.1 protocol changes from 3.1 branch (server-side SQL
-	  states, new field info, larger client capability flags,
-	  connect-with-database, etc).
-
-	- Fix UpdatableResultSet to return values for getXXX() when on
-	  insert row (BUG#675).
-
-	- The insertRow in an UpdatableResultSet is now loaded with
-	  the default column values when moveToInsertRow() is called
-	  (BUG#688)
-
-	- DatabaseMetaData.getColumns() wasn't returning NULL for
-	  default values that are specified as NULL.
-
-	- Change default statement type/concurrency to TYPE_FORWARD_ONLY
-	  and CONCUR_READ_ONLY (spec compliance).
-
-	- Don't try and reset isolation level on reconnect if MySQL doesn't
-	  support them.
-
-	- Don't wrap SQLExceptions in RowDataDynamic.
-
-	- Don't change timestamp TZ twice if useTimezone==true (BUG#774)
-
-	- Fixed regression in large split-packet handling (BUG#848).
-
-	- Better diagnostic error messages in exceptions for 'streaming'
-	  result sets.
-
-	- Issue exception on ResultSet.getXXX() on empty result set (wasn't
-	  caught in some cases).
-
-	- Don't hide messages from exceptions thrown in I/O layers.
-
-	- Don't fire connection closed events when closing pooled connections, or
-	  on PooledConnection.getConnection() with already open connections (BUG#884).
-
-	- Clip +/- INF (to smallest and largest representative values for the type in
-	  MySQL) and NaN (to 0) for setDouble/setFloat(), and issue a warning on the
-	  statement when the server does not support +/- INF or NaN.
-
-	- Fix for BUG#879, double-escaping of '\' when charset is SJIS or GBK and '\'
-	  appears in non-escaped input.
-
-	- When emptying input stream of unused rows for 'streaming' result sets,
-	  have the current thread yield() every 100 rows in order to not monopolize
-	  CPU time.
-
-	- Fixed BUG#1099, DatabaseMetaData.getColumns() getting confused about the
-	  keyword 'set' in character columns.
-
-	- Fixed deadlock issue with Statement.setMaxRows().
-
-	- Fixed CLOB.truncate(), BUG#1130
-
-	- Optimized CLOB.setChracterStream(), BUG#1131
-
-	- Made databaseName, portNumber and serverName optional parameters
-	  for MysqlDataSourceFactory (BUG#1246)
-
-	- Fix for BUG#1247 -- ResultSet.get/setString mashing char 127
-
-	- Backported auth. changes for 4.1.1 and newer from 3.1 branch.
-
-	- Added com.mysql.jdbc.util.BaseBugReport to help creation of testcases
-	  for bug reports.
-
-	- Added property to 'clobber' streaming results, by setting the
-	  'clobberStreamingResults' property to 'true' (the default is 'false').
-	  This will cause a 'streaming' ResultSet to be automatically
-	  closed, and any oustanding data still streaming from the server to
-	  be discarded if another query is executed before all the data has been
-	  read from the server.
-
-05-23-03 - Version 3.0.8-stable
-
-	- Allow bogus URLs in Driver.getPropertyInfo().
-
-	- Return list of generated keys when using multi-value INSERTS
-	  with Statement.getGeneratedKeys().
-
-	- Use JVM charset with filenames and 'LOAD DATA [LOCAL] INFILE'
-
-	- Fix infinite loop with Connection.cleanup().
-
-	- Changed Ant target 'compile-core' to 'compile-driver', and
-	  made testsuite compilation a separate target.
-
-	- Fixed result set not getting set for Statement.executeUpdate(),
-	  which affected getGeneratedKeys() and getUpdateCount() in
-	  some cases.
-
-	- Unicode character 0xFFFF in a string would cause the driver to
-	  throw an ArrayOutOfBoundsException (Bug #378)
-
-	- Return correct amount of generated keys when using 'REPLACE'
-	  statements.
-
-	- Fix problem detecting server character set in some cases.
-
-	- Fix row data decoding error when using _very_ large packets.
-
-	- Optimized row data decoding.
-
-	- Issue exception when operating on an already-closed
-	  prepared statement.
-
-	- Fixed SJIS encoding bug, thanks to Naoto Sato.
-
-    - Optimized usage of EscapeProcessor.
-
-    - Allow multiple calls to Statement.close()
-
-04-08-03 - Version 3.0.7-stable
-
-    - Fixed MysqlPooledConnection.close() calling wrong event type.
-
-    - Fixed StringIndexOutOfBoundsException in PreparedStatement.
-      setClob().
-
-    - 4.1 Column Metadata fixes
-
-    - Remove synchronization from Driver.connect() and
-      Driver.acceptsUrl().
-
-    - IOExceptions during a transaction now cause the Connection to
-      be closed.
-
-    - Fixed missing conversion for 'YEAR' type in ResultSetMetaData.
-      getColumnTypeName().
-
-    - Don't pick up indexes that start with 'pri' as primary keys
-      for DBMD.getPrimaryKeys().
-
-    - Throw SQLExceptions when trying to do operations on a forcefully
-      closed Connection (i.e. when a communication link failure occurs).
-
-    - You can now toggle profiling on/off using
-      Connection.setProfileSql(boolean).
-
-    - Fixed charset issues with database metadata (charset was not
-      getting set correctly).
-
-    - Updatable ResultSets can now be created for aliased tables/columns
-      when connected to MySQL-4.1 or newer.
-
-    - Fixed 'LOAD DATA LOCAL INFILE' bug when file > max_allowed_packet.
-
-    - Fixed escaping of 0x5c ('\') character for GBK and Big5 charsets.
-
-    - Fixed ResultSet.getTimestamp() when underlying field is of type DATE.
-
-    - Ensure that packet size from alignPacketSize() does not
-      exceed MAX_ALLOWED_PACKET (JVM bug)
-
-    - Don't reset Connection.isReadOnly() when autoReconnecting.
-
-02-18-03 - Version 3.0.6-stable
-
-    - Fixed ResultSetMetaData to return "" when catalog not known.
-      Fixes NullPointerExceptions with Sun's CachedRowSet.
-
-    - Fixed DBMD.getTypeInfo() and DBMD.getColumns() returning
-      different value for precision in TEXT/BLOB types.
-
-    - Allow ignoring of warning for 'non transactional tables' during
-      rollback (compliance/usability) by setting 'ignoreNonTxTables'
-      property to 'true'.
-
-    - Fixed SQLExceptions getting swallowed on initial connect.
-
-    - Fixed Statement.setMaxRows() to stop sending 'LIMIT' type queries
-      when not needed (performance)
-
-    - Clean up Statement query/method mismatch tests (i.e. INSERT not
-      allowed with .executeQuery()).
-
-    - More checks added in ResultSet traversal method to catch
-      when in closed state.
-
-    - Fixed ResultSetMetaData.isWritable() to return correct value.
-
-    - Add 'window' of different NULL sorting behavior to
-      DBMD.nullsAreSortedAtStart (4.0.2 to 4.0.10, true, otherwise,
-      no).
-
-    - Implemented Blob.setBytes(). You still need to pass the
-      resultant Blob back into an updatable ResultSet or
-      PreparedStatement to persist the changes, as MySQL does
-      not support 'locators'.
-
-    - Backported 4.1 charset field info changes from Connector/J 3.1
-
-01-22-03 - Version 3.0.5-gamma
-
-    - Fixed Buffer.fastSkipLenString() causing ArrayIndexOutOfBounds
-      exceptions with some queries when unpacking fields.
-
-    - Implemented an empty TypeMap for Connection.getTypeMap() so that
-      some third-party apps work with MySQL (IBM WebSphere 5.0 Connection
-      pool).
-
-    - Added missing LONGTEXT type to DBMD.getColumns().
-
-    - Retrieve TX_ISOLATION from database for
-      Connection.getTransactionIsolation() when the MySQL version
-      supports it, instead of an instance variable.
-
-    - Quote table names in DatabaseMetaData.getColumns(),
-      getPrimaryKeys(), getIndexInfo(), getBestRowIdentifier()
-
-    - Greatly reduce memory required for setBinaryStream() in
-      PreparedStatements.
-
-    - Fixed ResultSet.isBeforeFirst() for empty result sets.
-
-    - Added update options for foreign key metadata.
-
-
-01-06-03 - Version 3.0.4-gamma
-
-    - Added quoted identifiers to database names for
-      Connection.setCatalog.
-
-    - Added support for quoted identifiers in PreparedStatement
-      parser.
-
-    - Streamlined character conversion and byte[] handling in
-      PreparedStatements for setByte().
-
-    - Reduce memory footprint of PreparedStatements by sharing
-      outbound packet with MysqlIO.
-
-    - Added 'strictUpdates' property to allow control of amount
-      of checking for 'correctness' of updatable result sets. Set this
-      to 'false' if you want faster updatable result sets and you know
-      that you create them from SELECTs on tables with primary keys and
-      that you have selected all primary keys in your query.
-
-    - Added support for 4.0.8-style large packets.
-
-    - Fixed PreparedStatement.executeBatch() parameter overwriting.
-
-12-17-02 - Version 3.0.3-dev
-
-    - Changed charsToByte in SingleByteCharConverter to be non-static
-
-    - Changed SingleByteCharConverter to use lazy initialization of each
-      converter.
-
-    - Fixed charset handling in Fields.java
-
-    - Implemented Connection.nativeSQL()
-
-    - More robust escape tokenizer -- recognize '--' comments, and allow
-      nested escape sequences (see testsuite.EscapeProcessingTest)
-
-    - DBMD.getImported/ExportedKeys() now handles multiple foreign keys
-      per table.
-
-    - Fixed ResultSetMetaData.getPrecision() returning incorrect values
-      for some floating point types.
-
-    - Fixed ResultSetMetaData.getColumnTypeName() returning BLOB for
-      TEXT and TEXT for BLOB types.
-
-    - Fixed Buffer.isLastDataPacket() for 4.1 and newer servers.
-
-    - Added CLIENT_LONG_FLAG to be able to get more column flags
-      (isAutoIncrement() being the most important)
-
-    - Because of above, implemented ResultSetMetaData.isAutoIncrement()
-      to use Field.isAutoIncrement().
-
-    - Honor 'lower_case_table_names' when enabled in the server when
-      doing table name comparisons in DatabaseMetaData methods.
-
-    - Some MySQL-4.1 protocol support (extended field info from selects)
-
-    - Use non-aliased table/column names and database names to fullly
-      qualify tables and columns in UpdatableResultSet (requires
-      MySQL-4.1 or newer)
-
-    - Allow user to alter behavior of Statement/
-      PreparedStatement.executeBatch() via 'continueBatchOnError' property
-      (defaults to 'true').
-
-    - Check for connection closed in more Connection methods
-      (createStatement, prepareStatement, setTransactionIsolation,
-      setAutoCommit).
-
-    - More robust implementation of updatable result sets. Checks that
-      _all_ primary keys of the table have been selected.
-
-    - 'LOAD DATA LOCAL INFILE ...' now works, if your server is configured
-      to allow it. Can be turned off with the 'allowLoadLocalInfile'
-      property (see the README).
-
-    - Substitute '?' for unknown character conversions in single-byte
-      character sets instead of '\0'.
-
-    - NamedPipeSocketFactory now works (only intended for Windows), see
-      README for instructions.
-
-11-08-02 - Version 3.0.2-dev
-
-    - Fixed issue with updatable result sets and PreparedStatements not
-      working
-
-    - Fixed ResultSet.setFetchDirection(FETCH_UNKNOWN)
-
-    - Fixed issue when calling Statement.setFetchSize() when using
-      arbitrary values
-
-    - Fixed incorrect conversion in ResultSet.getLong()
-
-    - Implemented ResultSet.updateBlob().
-
-    - Removed duplicate code from UpdatableResultSet (it can be inherited
-      from ResultSet, the extra code for each method to handle updatability
-      I thought might someday be necessary has not been needed).
-
-    - Fixed "UnsupportedEncodingException" thrown when "forcing" a
-      character encoding via properties.
-
-    - Fixed various non-ASCII character encoding issues.
-
-    - Added driver property 'useHostsInPrivileges'. Defaults to true.
-      Affects whether or not '@hostname' will be used in
-      DBMD.getColumn/TablePrivileges.
-
-    - All DBMD result set columns describing schemas now return NULL
-      to be more compliant with the behavior of other JDBC drivers
-      for other databases (MySQL does not support schemas).
-
-    - Added SSL support. See README for information on how to use it.
-
-    - Properly restore connection properties when autoReconnecting
-      or failing-over, including autoCommit state, and isolation level.
-
-    - Use 'SHOW CREATE TABLE' when possible for determining foreign key
-      information for DatabaseMetaData...also allows cascade options for
-      DELETE information to be returned
-
-    - Escape 0x5c character in strings for the SJIS charset.
-
-    - Fixed start position off-by-1 error in Clob.getSubString()
-
-    - Implemented Clob.truncate()
-
-    - Implemented Clob.setString()
-
-    - Implemented Clob.setAsciiStream()
-
-    - Implemented Clob.setCharacterStream()
-
-    - Added com.mysql.jdbc.MiniAdmin class, which allows you to send
-      'shutdown' command to MySQL server...Intended to be used when 'embedding'
-      Java and MySQL server together in an end-user application.
-
-    - Added 'connectTimeout' parameter that allows users of JDK-1.4 and newer
-      to specify a maxium time to wait to establish a connection.
-
-    - Failover and autoReconnect only work when the connection is in a
-      autoCommit(false) state, in order to stay transaction safe
-
-    - Added 'queriesBeforeRetryMaster' property that specifies how many
-      queries to issue when failed over before attempting to reconnect
-      to the master (defaults to 50)
-
-    - Fixed DBMD.supportsResultSetConcurrency() so that it returns true
-      for ResultSet.TYPE_SCROLL_INSENSITIVE and ResultSet.CONCUR_READ_ONLY or
-      ResultSet.CONCUR_UPDATABLE
-
-    - Fixed ResultSet.isLast() for empty result sets (should return false).
-
-    - PreparedStatement now honors stream lengths in setBinary/Ascii/Character
-      Stream() unless you set the connection property
-      'useStreamLengthsInPrepStmts' to 'false'.
-
-    - Removed some not-needed temporary object creation by using Strings
-      smarter in EscapeProcessor, Connection and DatabaseMetaData classes.
-
-09-21-02 - Version 3.0.1-dev
-
-    - Fixed ResultSet.getRow() off-by-one bug.
-
-    - Fixed RowDataStatic.getAt() off-by-one bug.
-
-    - Added limited Clob functionality (ResultSet.getClob(),
-      PreparedStatemtent.setClob(),
-      PreparedStatement.setObject(Clob).
-
-    - Added socketTimeout parameter to URL.
-
-    - Connection.isClosed() no longer "pings" the server.
-
-    - Connection.close() issues rollback() when getAutoCommit() == false
-
-    - Added "paranoid" parameter...sanitizes error messages removing
-      "sensitive" information from them (i.e. hostnames, ports,
-      usernames, etc.), as well as clearing "sensitive" data structures
-      when possible.
-
-    - Fixed ResultSetMetaData.isSigned() for TINYINT and BIGINT.
-
-    - Charsets now automatically detected. Optimized code for single-byte
-      character set conversion.
-
-    - Implemented ResultSet.getCharacterStream()
-
-    - Added "LOCAL TEMPORARY" to table types in DatabaseMetaData.getTableTypes()
-
-    - Massive code clean-up to follow Java coding conventions (the time had come)
-
-
-07-31-02 - Version 3.0.0-dev
-
-    - !!! LICENSE CHANGE !!! The driver is now GPL. If you need
-      non-GPL licenses, please contact me <mark@mysql.com>
-
-    - JDBC-3.0 functionality including
-      Statement/PreparedStatement.getGeneratedKeys() and
-      ResultSet.getURL()
-
-    - Performance enchancements - driver is now 50-100% faster
-      in most situations, and creates fewer temporary objects
-
-    - Repackaging...new driver name is "com.mysql.jdbc.Driver",
-      old name still works, though (the driver is now provided
-      by MySQL-AB)
-
-    - Better checking for closed connections in Statement
-      and PreparedStatement.
-
-    - Support for streaming (row-by-row) result sets (see README)
-      Thanks to Doron.
-
-    - Support for large packets (new addition to MySQL-4.0 protocol),
-      see README for more information.
-
-    - JDBC Compliance -- Passes all tests besides stored procedure tests
-
-
-    - Fix and sort primary key names in DBMetaData (SF bugs 582086 and 582086)
-
-    - Float types now reported as java.sql.Types.FLOAT (SF bug 579573)
-
-    - ResultSet.getTimestamp() now works for DATE types (SF bug 559134)
-
-    - ResultSet.getDate/Time/Timestamp now recognizes all forms of invalid
-      values that have been set to all zeroes by MySQL (SF bug 586058)
-
-    - Testsuite now uses Junit (which you can get from www.junit.org)
-
-    - The driver now only works with JDK-1.2 or newer.
-
-    - Added multi-host failover support (see README)
-
-    - General source-code cleanup.
-
-    - Overall speed improvements via controlling transient object
-      creation in MysqlIO class when reading packets
-
-    - Performance improvements in  string handling and field
-      metadata creation (lazily instantiated) contributed by
-      Alex Twisleton-Wykeham-Fiennes
-
-
-05-16-02 - Version 2.0.14
-
-    - More code cleanup
-
-    - PreparedStatement now releases resources on .close() (SF bug 553268)
-
-    - Quoted identifiers not used if server version does not support them. Also,
-      if server started with --ansi or --sql-mode=ANSI_QUOTES then '"' will be
-      used as an identifier quote, otherwise '`' will be used.
-
-    - ResultSet.getDouble() now uses code built into JDK to be more precise (but slower)
-
-    - LogicalHandle.isClosed() calls through to physical connection
-
-    - Added SQL profiling (to STDERR). Set "profileSql=true" in your JDBC url.
-      See README for more information.
-
-    - Fixed typo for relaxAutoCommit parameter.
-
-04-24-02 - Version 2.0.13
-
-    - More code cleanup.
-
-    - Fixed unicode chars being read incorrectly (SF bug 541088)
-
-    - Faster blob escaping for PrepStmt
-
-    - Added set/getPortNumber() to DataSource(s) (SF bug 548167)
-
-    - Added setURL() to MySQLXADataSource (SF bug 546019)
-
-    - PreparedStatement.toString() fixed (SF bug 534026)
-
-    - ResultSetMetaData.getColumnClassName() now implemented
-
-    - Rudimentary version of Statement.getGeneratedKeys() from JDBC-3.0
-      now implemented (you need to be using JDK-1.4 for this to work, I
-      believe)
-
-    - DBMetaData.getIndexInfo() - bad PAGES fixed (SF BUG 542201)
-
-04-07-02 - Version 2.0.12
-
-    - General code cleanup.
-
-    - Added getIdleFor() method to Connection and MysqlLogicalHandle.
-
-    - Relaxed synchronization in all classes, should fix 520615 and 520393.
-
-    - Added getTable/ColumnPrivileges() to DBMD (fixes 484502).
-
-    - Added new types to getTypeInfo(), fixed existing types thanks to
-      Al Davis and Kid Kalanon.
-
-    - Added support for BIT types (51870) to PreparedStatement.
-
-    - Fixed getRow() bug (527165) in ResultSet
-
-    - Fixes for ResultSet updatability in PreparedStatement.
-    - Fixed timezone off by 1-hour bug in PreparedStatement (538286, 528785).
-
-    - ResultSet: Fixed updatability (values being set to null
-      if not updated).
-
-    - DataSources - fixed setUrl bug (511614, 525565),
-      wrong datasource class name (532816, 528767)
-
-    - Added identifier quoting to all DatabaseMetaData methods
-      that need them (should fix 518108)
-
-    - Added support for YEAR type (533556)
-
-    - ResultSet.insertRow() should now detect auto_increment fields
-      in most cases and use that value in the new row. This detection
-      will not work in multi-valued keys, however, due to the fact that
-      the MySQL protocol does not return this information.
-
-    - ResultSet.refreshRow() implemented.
-
-    - Fixed testsuite.Traversal afterLast() bug, thanks to Igor Lastric.
-
-01-27-02 - Version 2.0.11
-
-    - Fixed missing DELETE_RULE value in
-      DBMD.getImported/ExportedKeys() and getCrossReference().
-
-    - Full synchronization of Statement.java.
-
-    - More changes to fix "Unexpected end of input stream"
-      errors when reading BLOBs. This should be the last fix.
-
-01-24-02 - Version 2.0.10
-
-     - Fixed spurious "Unexpected end of input stream" errors in
-       MysqlIO (bug 507456).
-
-     - Fixed null-pointer-exceptions when using
-       MysqlConnectionPoolDataSource with Websphere 4 (bug 505839).
-
-01-13-02 - Version 2.0.9
-
-     - Ant build was corrupting included jar files, fixed
-       (bug 487669).
-
-     - Fixed extra memory allocation in MysqlIO.readPacket()
-       (bug 488663).
-
-     - Implementation of DatabaseMetaData.getExported/ImportedKeys() and
-       getCrossReference().
-
-     - Full synchronization on methods modifying instance and class-shared
-       references, driver should be entirely thread-safe now (please
-       let me know if you have problems)
-
-     - DataSource implementations moved to org.gjt.mm.mysql.jdbc2.optional
-       package, and (initial) implementations of PooledConnectionDataSource
-       and XADataSource are in place (thanks to Todd Wolff for the
-       implementation and testing of PooledConnectionDataSource with
-       IBM WebSphere 4).
-
-     - Added detection of network connection being closed when reading packets
-       (thanks to Todd Lizambri).
-
-     - Fixed quoting error with escape processor (bug 486265).
-
-     - Report batch update support through DatabaseMetaData (bug 495101).
-
-     - Fixed off-by-one-hour error in PreparedStatement.setTimestamp()
-       (bug 491577).
-
-     - Removed concatenation support from driver (the '||' operator),
-       as older versions of VisualAge seem to be the only thing that
-       use it, and it conflicts with the logical '||' operator. You will
-       need to start mysqld with the "--ansi" flag to use the '||'
-       operator as concatenation (bug 491680)
-
-     - Fixed casting bug in PreparedStatement (bug 488663).
-
-11-25-01 - Version 2.0.8
-
-     - Batch updates now supported (thanks to some inspiration
-       from Daniel Rall).
-
-     - XADataSource/ConnectionPoolDataSource code (experimental)
-
-     - PreparedStatement.setAnyNumericType() now handles positive
-       exponents correctly (adds "+" so MySQL can understand it).
-
-     - DatabaseMetaData.getPrimaryKeys() and getBestRowIdentifier()
-       are now more robust in identifying primary keys (matches
-       regardless of case or abbreviation/full spelling of Primary Key
-       in Key_type column).
-
-10-24-01 - Version 2.0.7
-
-     - PreparedStatement.setCharacterStream() now implemented
-
-     - Fixed dangling socket problem when in high availability
-       (autoReconnect=true) mode, and finalizer for Connection will
-       close any dangling sockets on GC.
-
-     - Fixed ResultSetMetaData.getPrecision() returning one
-       less than actual on newer versions of MySQL.
-
-     - ResultSet.getBlob() now returns null if column value
-       was null.
-
-     - Character sets read from database if useUnicode=true
-       and characterEncoding is not set. (thanks to
-       Dmitry Vereshchagin)
-
-     - Initial transaction isolation level read from
-       database (if avaialable) (thanks to Dmitry Vereshchagin)
-
-     - Fixed DatabaseMetaData.supportsTransactions(), and
-       supportsTransactionIsolationLevel() and getTypeInfo()
-       SQL_DATETIME_SUB and SQL_DATA_TYPE fields not being
-       readable.
-
-     - Fixed PreparedStatement generating SQL that would end
-       up with syntax errors for some queries.
-
-     - Fixed ResultSet.isAfterLast() always returning false.
-
-     - Fixed timezone issue in PreparedStatement.setTimestamp()
-       (thanks to Erik Olofsson)
-
-     - Captialize type names when "captializeTypeNames=true"
-       is passed in URL or properties (for WebObjects, thanks
-       to Anjo Krank)
-
-     - Updatable result sets now correctly handle NULL
-       values in fields.
-
-     - PreparedStatement.setDouble() now uses full-precision
-       doubles (reverting a fix made earlier to truncate them).
-
-     - PreparedStatement.setBoolean() will use 1/0 for values
-       if your MySQL Version >= 3.21.23.
-
-06-16-01 - Version 2.0.6
-
-Fixed PreparedStatement parameter checking
-
-     - Fixed case-sensitive column names in ResultSet.java
-
-06-13-01 - Version 2.0.5
-
-     - Fixed ResultSet.getBlob() ArrayIndex out-of-bounds
-
-     - Fixed ResultSetMetaData.getColumnTypeName for TEXT/BLOB
-
-     - Fixed ArrayIndexOutOfBounds when sending large BLOB queries
-       (Max size packet was not being set)
-
-     - Added ISOLATION level support to Connection.setIsolationLevel()
-
-     - Fixed NPE on PreparedStatement.executeUpdate() when all columns
-       have not been set.
-
-     - Fixed data parsing of TIMESTAMPs with 2-digit years
-
-     - Added Byte to PreparedStatement.setObject()
-
-     - ResultSet.getBoolean() now recognizes '-1' as 'true'
-
-     - ResultSet has +/-Inf/inf support
-
-     - ResultSet.insertRow() works now, even if not all columns are
-       set (they will be set to "NULL")
-
-     - DataBaseMetaData.getCrossReference() no longer ArrayIndexOOB
-
-     - getObject() on ResultSet correctly does TINYINT->Byte and
-       SMALLINT->Short
-
-12-03-00 - Version 2.0.3
-
-     - Implemented getBigDecimal() without scale component
-       for JDBC2.
-
-     - Fixed composite key problem with updateable result sets.
-
-     - Added detection of -/+INF for doubles.
-
-     - Faster ASCII string operations.
-
-     - Fixed incorrect detection of MAX_ALLOWED_PACKET, so sending
-       large blobs should work now.
-
-     - Fixed off-by-one error in java.sql.Blob implementation code.
-
-     - Added "ultraDevHack" URL parameter, set to "true" to allow
-       (broken) Macromedia UltraDev to use the driver.
-
-04-06-00 - Version 2.0.1
-
-     - Fixed RSMD.isWritable() returning wrong value.
-       Thanks to Moritz Maass.
-
-     - Cleaned up exception handling when driver connects
-
-     - Columns that are of type TEXT now return as Strings
-       when you use getObject()
-
-     - DatabaseMetaData.getPrimaryKeys() now works correctly wrt
-       to key_seq. Thanks to Brian Slesinsky.
-
-     - No escape processing is done on PreparedStatements anymore
-       per JDBC spec.
-
-     - Fixed many JDBC-2.0 traversal, positioning bugs, especially
-       wrt to empty result sets. Thanks to Ron Smits, Nick Brook,
-       Cessar Garcia and Carlos Martinez.
-
-     - Fixed some issues with updatability support in ResultSet when
-       using multiple primary keys.
-
-02-21-00 - Version 2.0pre5
-
-     - Fixed Bad Handshake problem.
-
-01-10-00 - Version 2.0pre4
-
-     - Fixes to ResultSet for insertRow() - Thanks to
-       Cesar Garcia
-
-     - Fix to Driver to recognize JDBC-2.0 by loading a JDBC-2.0
-       class, instead of relying on JDK version numbers. Thanks
-       to John Baker.
-
-     - Fixed ResultSet to return correct row numbers
-
-     - Statement.getUpdateCount() now returns rows matched,
-       instead of rows actually updated, which is more SQL-92
-       like.
-
-10-29-99
-
-     - Statement/PreparedStatement.getMoreResults() bug fixed.
-       Thanks to Noel J. Bergman.
-
-     - Added Short as a type to PreparedStatement.setObject().
-       Thanks to Jeff Crowder
-
-     - Driver now automagically configures maximum/preferred packet
-       sizes by querying server.
-
-     - Autoreconnect code uses fast ping command if server supports
-       it.
-
-     - Fixed various bugs wrt. to packet sizing when reading from
-       the server and when alloc'ing to write to the server.
-
-08-17-99 - Version 2.0pre
-
-     - Now compiles under JDK-1.2. The driver supports both JDK-1.1
-       and JDK-1.2 at the same time through a core set of classes.
-       The driver will load the appropriate interface classes at
-       runtime by figuring out which JVM version you are using.
-
-     - Fixes for result sets with all nulls in the first row.
-       (Pointed out by Tim Endres)
-
-     - Fixes to column numbers in SQLExceptions in ResultSet
-       (Thanks to Blas Rodriguez Somoza)
-
-     - The database no longer needs to specified to connect.
-       (Thanks to Christian Motschke)
-
-07-04-99 - Version 1.2b
-
-     - Better Documentation (in progress), in doc/mm.doc/book1.html
-
-     - DBMD now allows null for a column name pattern (not in
-       spec), which it changes to '%'.
-
-     - DBMD now has correct types/lengths for getXXX().
-
-     - ResultSet.getDate(), getTime(), and getTimestamp() fixes.
-       (contributed by Alan Wilken)
-
-     - EscapeProcessor now handles \{ \} and { or } inside quotes
-       correctly. (thanks to Alik for some ideas on how to fix it)
-
-     - Fixes to properties handling in Connection.
-       (contributed by Juho Tikkala)
-
-     - ResultSet.getObject() now returns null for NULL columns
-       in the table, rather than bombing out.
-       (thanks to Ben Grosman)
-
-     - ResultSet.getObject() now returns Strings for types
-       from MySQL that it doesn't know about. (Suggested by
-       Chris Perdue)
-
-     - Removed DataInput/Output streams, not needed, 1/2 number
-       of method calls per IO operation.
-
-     - Use default character encoding if one is not specified. This
-       is a work-around for broken JVMs, because according to spec,
-       EVERY JVM must support "ISO8859_1", but they don't.
-
-     - Fixed Connection to use the platform character encoding
-       instead of "ISO8859_1" if one isn't explicitly set. This
-       fixes problems people were having loading the character-
-       converter classes that didn't always exist (JVM bug).
-       (thanks to Fritz Elfert for pointing out this problem)
-
-     - Changed MysqlIO to re-use packets where possible to reduce
-       memory usage.
-
-     - Fixed escape-processor bugs pertaining to {} inside
-       quotes.
-
-04-14-99 - Version 1.2a
-
-     - Fixed character-set support for non-Javasoft JVMs
-       (thanks to many people for pointing it out)
-
-     - Fixed ResultSet.getBoolean() to recognize 'y' & 'n'
-       as well as '1' & '0' as boolean flags.
-       (thanks to Tim Pizey)
-
-     - Fixed ResultSet.getTimestamp() to give better performance.
-       (thanks to Richard Swift)
-
-     - Fixed getByte() for numeric types.
-       (thanks to Ray Bellis)
-
-     - Fixed DatabaseMetaData.getTypeInfo() for DATE type.
-       (thanks to Paul Johnston)
-
-     - Fixed EscapeProcessor for "fn" calls.
-       (thanks to Piyush Shah at locomotive.org)
-
-     - Fixed EscapeProcessor to not do extraneous work if there
-       are no escape codes.
-       (thanks to Ryan Gustafson)
-
-     - Fixed Driver to parse URLs of the form "jdbc:mysql://host:port"
-       (thanks to Richard Lobb)
-
-03-24-99 - Version 1.1i
-
-     - Fixed Timestamps for PreparedStatements
-
-     - Fixed null pointer exceptions in RSMD and RS
-
-     - Re-compiled with jikes for valid class files (thanks ms!)
-
-03-08-99 - Version 1.1h
-
-     - Fixed escape processor to deal with un-matched { and }
-       (thanks to Craig Coles)
-
-     - Fixed escape processor to create more portable (between
-       DATETIME and TIMESTAMP types) representations so that
-       it will work with BETWEEN clauses.
-       (thanks to Craig Longman)
-
-     - MysqlIO.quit() now closes the socket connection. Before,
-       after many failed connections some OS's would run out
-       of file descriptors. (thanks to Michael Brinkman)
-
-     - Fixed NullPointerException in Driver.getPropertyInfo.
-       (thanks to Dave Potts)
-
-     - Fixes to MysqlDefs to allow all *text fields to be
-       retrieved as Strings.
-       (thanks to Chris at Leverage)
-
-     - Fixed setDouble in PreparedStatement for large numbers
-       to avoid sending scientific notation to the database.
-       (thanks to J.S. Ferguson)
-
-     - Fixed getScale() and getPrecision() in RSMD.
-       (contrib'd by James Klicman)
-
-     - Fixed getObject() when field was DECIMAL or NUMERIC
-       (thanks to Bert Hobbs)
-
-     - DBMD.getTables() bombed when passed a null table-name
-       pattern. Fixed. (thanks to Richard Lobb)
-
-     - Added check for "client not authorized" errors during
-       connect. (thanks to Hannes Wallnoefer)
-
-02-19-99 - Version 1.1g
-
-     - Result set rows are now byte arrays. Blobs and Unicode
-       work bidriectonally now. The useUnicode and encoding
-       options are implemented now.
-
-     - Fixes to PreparedStatement to send binary set by
-       setXXXStream to be sent un-touched to the MySQL server.
-
-     - Fixes to getDriverPropertyInfo().
-
-12-31-98 - Version 1.1f
-
-     - Changed all ResultSet fields to Strings, this should allow
-       Unicode to work, but your JVM must be able to convert
-       between the character sets. This should also make reading
-       data from the server be a bit quicker, because there is now
-       no conversion from StringBuffer to String.
-
-     - Changed PreparedStatement.streamToString() to be more
-       efficient (code from Uwe Schaefer).
-
-     - URL parsing is more robust (throws SQL exceptions on errors
-       rather than NullPointerExceptions)
-
-     - PreparedStatement now can convert Strings to Time/Date values
-       via setObject() (code from Robert Currey).
-
-     - IO no longer hangs in Buffer.readInt(), that bug was
-       introduced in 1.1d when changing to all byte-arrays for
-       result sets. (Pointed out by Samo Login)
-
-11-03-98 - Version 1.1b
-
-     - Fixes to DatabaseMetaData to allow both IBM VA and J-Builder
-       to work. Let me know how it goes. (thanks to Jac Kersing)
-
-     - Fix to ResultSet.getBoolean() for NULL strings
-       (thanks to Barry Lagerweij)
-
-     - Beginning of code cleanup, and formatting. Getting ready
-       to branch this off to a parallel JDBC-2.0 source tree.
-
-     - Added "final" modifier to critical sections in MysqlIO and
-       Buffer to allow compiler to inline methods for speed.
-
-9-29-98
-
-     - If object references passed to setXXX() in PreparedStatement are
-       null, setNull() is automatically called for you. (Thanks for the
-       suggestion goes to Erik Ostrom)
-
-     - setObject() in PreparedStatement will now attempt to write a
-       serialized  representation of the object to the database for
-       objects of Types.OTHER and objects of unknown type.
-
-     - Util now has a static method readObject() which given a ResultSet
-       and a column index will re-instantiate an object serialized in
-       the above manner.
-
-9-02-98 - Vesion 1.1
-
-     - Got rid of "ugly hack" in MysqlIO.nextRow(). Rather than
-       catch an exception, Buffer.isLastDataPacket() was fixed.
-
-     - Connection.getCatalog() and Connection.setCatalog()
-       should work now.
-
-     - Statement.setMaxRows() works, as well as setting
-       by property maxRows. Statement.setMaxRows() overrides
-       maxRows set via properties or url parameters.
-
-     - Automatic re-connection is available. Because it has
-       to "ping" the database before each query, it is
-       turned off by default. To use it, pass in "autoReconnect=true"
-       in the connection URL. You may also change the number of
-       reconnect tries, and the initial timeout value via
-       "maxReconnects=n" (default 3) and "initialTimeout=n"
-       (seconds, default 2) parameters. The timeout is an
-       exponential backoff type of timeout, e.g. if you have initial
-       timeout of 2 seconds, and maxReconnects of 3, then the driver
-       will timeout 2 seconds, 4 seconds, then 16 seconds between each
-       re-connection attempt.
-
-8-24-98 - Version 1.0
-
-     - Fixed handling of blob data in Buffer.java
-
-     - Fixed bug with authentication packet being
-       sized too small.
-
-     - The JDBC Driver is now under the LPGL
-
-8-14-98 -
-
-     - Fixed Buffer.readLenString() to correctly
-          read data for BLOBS.
-
-     - Fixed PreparedStatement.stringToStream to
-          correctly read data for BLOBS.
-
-     - Fixed PreparedStatement.setDate() to not
-       add a day.
-       (above fixes thanks to Vincent Partington)
-
-     - Added URL parameter parsing (?user=... etc).
-
-
-8-04-98 - Version 0.9d
-
-     - Big news! New package name. Tim Endres from ICE
-       Engineering is starting a new source tree for
-       GNU GPL'd Java software. He's graciously given
-       me the org.gjt.mm package directory to use, so now
-       the driver is in the org.gjt.mm.mysql package scheme.
-       I'm "legal" now. Look for more information on Tim's
-       project soon.
-
-     - Now using dynamically sized packets to reduce
-       memory usage when sending commands to the DB.
-
-     - Small fixes to getTypeInfo() for parameters, etc.
-
-     - DatabaseMetaData is now fully implemented. Let me
-       know if these drivers work with the various IDEs
-       out there. I've heard that they're working with
-       JBuilder right now.
-
-     - Added JavaDoc documentation to the package.
-
-     - Package now available in .zip or .tar.gz.
-
-7-28-98 - Version 0.9
-
-     - Implemented getTypeInfo().
-       Connection.rollback() now throws an SQLException
-       per the JDBC spec.
-
-     - Added PreparedStatement that supports all JDBC API
-       methods for PreparedStatement including InputStreams.
-       Please check this out and let me know if anything is
-       broken.
-
-     - Fixed a bug in ResultSet that would break some
-       queries that only returned 1 row.
-
-     - Fixed bugs in DatabaseMetaData.getTables(),
-       DatabaseMetaData.getColumns() and
-       DatabaseMetaData.getCatalogs().
-
-     - Added functionality to Statement that allows
-       executeUpdate() to store values for IDs that are
-       automatically generated for AUTO_INCREMENT fields.
-       Basically, after an executeUpdate(), look at the
-       SQLWarnings for warnings like "LAST_INSERTED_ID =
-       'some number', COMMAND = 'your SQL query'".
-
-       If you are using AUTO_INCREMENT fields in your
-       tables and are executing a lot of executeUpdate()s
-       on one Statement, be sure to clearWarnings() every
-       so often to save memory.
-
-7-06-98 - Version 0.8
-
-     - Split MysqlIO and Buffer to separate classes. Some
-       ClassLoaders gave an IllegalAccess error for some
-       fields in those two classes. Now mm.mysql works in
-       applets and all classloaders.
-
-       Thanks to Joe Ennis <jce@mail.boone.com> for pointing
-       out the problem and working on a fix with me.
-
-7-01-98 - Version 0.7
-
-     - Fixed DatabaseMetadata problems in getColumns() and
-       bug in switch statement in the Field constructor.
-
-       Thanks to Costin Manolache <costin@tdiinc.com> for
-       pointing these out.
-
-5-21-98 - Version 0.6
-
-     - Incorporated efficiency changes from
-       Richard Swift <Richard.Swift@kanatek.ca> in
-       MysqlIO.java and ResultSet.java
-
-     - We're now 15% faster than gwe's driver.
-
-     - Started working on DatabaseMetaData.
-
-       The following methods are implemented:
-        * getTables()
-        * getTableTypes()
-        * getColumns
-        * getCatalogs()
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/COPYING b/plugins/org.eclipse.net4j.db.mysql/lib/COPYING
deleted file mode 100644
index 025ed9e7e0..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/COPYING
+++ /dev/null
@@ -1,343 +0,0 @@
-GNU General Public License
-**************************
-
-     	    GNU GENERAL PUBLIC LICENSE
-     	       Version 2, June 1991
-     
-     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     		  675 Mass Ave, Cambridge, MA 02139, USA
-     Everyone is permitted to copy and distribute verbatim copies
-     of this license document, but changing it is not allowed.
-     
-     		    Preamble
-     
-     The licenses for most software are designed to take away your
-     freedom to share and change it.  By contrast, the GNU General Public
-     License is intended to guarantee your freedom to share and change free
-     software--to make sure the software is free for all its users.  This
-     General Public License applies to most of the Free Software
-     Foundation's software and to any other program whose authors commit to
-     using it.  (Some other Free Software Foundation software is covered by
-     the GNU Library General Public License instead.)  You can apply it to
-     your programs, too.
-     
-     When we speak of free software, we are referring to freedom, not
-     price.  Our General Public Licenses are designed to make sure that you
-     have the freedom to distribute copies of free software (and charge for
-     this service if you wish), that you receive source code or can get it
-     if you want it, that you can change the software or use pieces of it
-     in new free programs; and that you know you can do these things.
-     
-     To protect your rights, we need to make restrictions that forbid
-     anyone to deny you these rights or to ask you to surrender the rights.
-     These restrictions translate to certain responsibilities for you if you
-     distribute copies of the software, or if you modify it.
-     
-     For example, if you distribute copies of such a program, whether
-     gratis or for a fee, you must give the recipients all the rights that
-     you have.  You must make sure that they, too, receive or can get the
-     source code.  And you must show them these terms so they know their
-     rights.
-     
-     We protect your rights with two steps: (1) copyright the software, and
-     (2) offer you this license which gives you legal permission to copy,
-     distribute and/or modify the software.
-     
-     Also, for each author's protection and ours, we want to make certain
-     that everyone understands that there is no warranty for this free
-     software.  If the software is modified by someone else and passed on, we
-     want its recipients to know that what they have is not the original, so
-     that any problems introduced by others will not reflect on the original
-     authors' reputations.
-     
-     Finally, any free program is threatened constantly by software
-     patents.  We wish to avoid the danger that redistributors of a free
-     program will individually obtain patent licenses, in effect making the
-     program proprietary.  To prevent this, we have made it clear that any
-     patent must be licensed for everyone's free use or not licensed at all.
-     
-     The precise terms and conditions for copying, distribution and
-     modification follow.
-     
-     	    GNU GENERAL PUBLIC LICENSE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-     
-     0. This License applies to any program or other work which contains
-     a notice placed by the copyright holder saying it may be distributed
-     under the terms of this General Public License.  The "Program", below,
-     refers to any such program or work, and a "work based on the Program"
-     means either the Program or any derivative work under copyright law:
-     that is to say, a work containing the Program or a portion of it,
-     either verbatim or with modifications and/or translated into another
-     language.  (Hereinafter, translation is included without limitation in
-     the term "modification".)  Each licensee is addressed as "you".
-     
-     Activities other than copying, distribution and modification are not
-     covered by this License; they are outside its scope.  The act of
-     running the Program is not restricted, and the output from the Program
-     is covered only if its contents constitute a work based on the
-     Program (independent of having been made by running the Program).
-     Whether that is true depends on what the Program does.
-     
-     1. You may copy and distribute verbatim copies of the Program's
-     source code as you receive it, in any medium, provided that you
-     conspicuously and appropriately publish on each copy an appropriate
-     copyright notice and disclaimer of warranty; keep intact all the
-     notices that refer to this License and to the absence of any warranty;
-     and give any other recipients of the Program a copy of this License
-     along with the Program.
-     
-     You may charge a fee for the physical act of transferring a copy, and
-     you may at your option offer warranty protection in exchange for a fee.
-     
-     2. You may modify your copy or copies of the Program or any portion
-     of it, thus forming a work based on the Program, and copy and
-     distribute such modifications or work under the terms of Section 1
-     above, provided that you also meet all of these conditions:
-     
-     a) You must cause the modified files to carry prominent notices
-     stating that you changed the files and the date of any change.
-     
-     b) You must cause any work that you distribute or publish, that in
-     whole or in part contains or is derived from the Program or any
-     part thereof, to be licensed as a whole at no charge to all third
-     parties under the terms of this License.
-     
-     c) If the modified program normally reads commands interactively
-     when run, you must cause it, when started running for such
-     interactive use in the most ordinary way, to print or display an
-     announcement including an appropriate copyright notice and a
-     notice that there is no warranty (or else, saying that you provide
-     a warranty) and that users may redistribute the program under
-     these conditions, and telling the user how to view a copy of this
-     License.  (Exception: if the Program itself is interactive but
-     does not normally print such an announcement, your work based on
-     the Program is not required to print an announcement.)
-     
-     These requirements apply to the modified work as a whole.  If
-     identifiable sections of that work are not derived from the Program,
-     and can be reasonably considered independent and separate works in
-     themselves, then this License, and its terms, do not apply to those
-     sections when you distribute them as separate works.  But when you
-     distribute the same sections as part of a whole which is a work based
-     on the Program, the distribution of the whole must be on the terms of
-     this License, whose permissions for other licensees extend to the
-     entire whole, and thus to each and every part regardless of who wrote it.
-     
-     Thus, it is not the intent of this section to claim rights or contest
-     your rights to work written entirely by you; rather, the intent is to
-     exercise the right to control the distribution of derivative or
-     collective works based on the Program.
-     
-     In addition, mere aggregation of another work not based on the Program
-     with the Program (or with a work based on the Program) on a volume of
-     a storage or distribution medium does not bring the other work under
-     the scope of this License.
-     
-     3. You may copy and distribute the Program (or a work based on it,
-     under Section 2) in object code or executable form under the terms of
-     Sections 1 and 2 above provided that you also do one of the following:
-     
-     a) Accompany it with the complete corresponding machine-readable
-     source code, which must be distributed under the terms of Sections
-     1 and 2 above on a medium customarily used for software interchange; or,
-     
-     b) Accompany it with a written offer, valid for at least three
-     years, to give any third party, for a charge no more than your
-     cost of physically performing source distribution, a complete
-     machine-readable copy of the corresponding source code, to be
-     distributed under the terms of Sections 1 and 2 above on a medium
-     customarily used for software interchange; or,
-     
-     c) Accompany it with the information you received as to the offer
-     to distribute corresponding source code.  (This alternative is
-     allowed only for noncommercial distribution and only if you
-     received the program in object code or executable form with such
-     an offer, in accord with Subsection b above.)
-     
-     The source code for a work means the preferred form of the work for
-     making modifications to it.  For an executable work, complete source
-     code means all the source code for all modules it contains, plus any
-     associated interface definition files, plus the scripts used to
-     control compilation and installation of the executable.  However, as a
-     special exception, the source code distributed need not include
-     anything that is normally distributed (in either source or binary
-     form) with the major components (compiler, kernel, and so on) of the
-     operating system on which the executable runs, unless that component
-     itself accompanies the executable.
-     
-     If distribution of executable or object code is made by offering
-     access to copy from a designated place, then offering equivalent
-     access to copy the source code from the same place counts as
-     distribution of the source code, even though third parties are not
-     compelled to copy the source along with the object code.
-     
-     4. You may not copy, modify, sublicense, or distribute the Program
-     except as expressly provided under this License.  Any attempt
-     otherwise to copy, modify, sublicense or distribute the Program is
-     void, and will automatically terminate your rights under this License.
-     However, parties who have received copies, or rights, from you under
-     this License will not have their licenses terminated so long as such
-     parties remain in full compliance.
-     
-     5. You are not required to accept this License, since you have not
-     signed it.  However, nothing else grants you permission to modify or
-     distribute the Program or its derivative works.  These actions are
-     prohibited by law if you do not accept this License.  Therefore, by
-     modifying or distributing the Program (or any work based on the
-     Program), you indicate your acceptance of this License to do so, and
-     all its terms and conditions for copying, distributing or modifying
-     the Program or works based on it.
-     
-     6. Each time you redistribute the Program (or any work based on the
-     Program), the recipient automatically receives a license from the
-     original licensor to copy, distribute or modify the Program subject to
-     these terms and conditions.  You may not impose any further
-     restrictions on the recipients' exercise of the rights granted herein.
-     You are not responsible for enforcing compliance by third parties to
-     this License.
-     
-     7. If, as a consequence of a court judgment or allegation of patent
-     infringement or for any other reason (not limited to patent issues),
-     conditions are imposed on you (whether by court order, agreement or
-     otherwise) that contradict the conditions of this License, they do not
-     excuse you from the conditions of this License.  If you cannot
-     distribute so as to satisfy simultaneously your obligations under this
-     License and any other pertinent obligations, then as a consequence you
-     may not distribute the Program at all.  For example, if a patent
-     license would not permit royalty-free redistribution of the Program by
-     all those who receive copies directly or indirectly through you, then
-     the only way you could satisfy both it and this License would be to
-     refrain entirely from distribution of the Program.
-     
-     If any portion of this section is held invalid or unenforceable under
-     any particular circumstance, the balance of the section is intended to
-     apply and the section as a whole is intended to apply in other
-     circumstances.
-     
-     It is not the purpose of this section to induce you to infringe any
-     patents or other property right claims or to contest validity of any
-     such claims; this section has the sole purpose of protecting the
-     integrity of the free software distribution system, which is
-     implemented by public license practices.  Many people have made
-     generous contributions to the wide range of software distributed
-     through that system in reliance on consistent application of that
-     system; it is up to the author/donor to decide if he or she is willing
-     to distribute software through any other system and a licensee cannot
-     impose that choice.
-     
-     This section is intended to make thoroughly clear what is believed to
-     be a consequence of the rest of this License.
-     
-     8. If the distribution and/or use of the Program is restricted in
-     certain countries either by patents or by copyrighted interfaces, the
-     original copyright holder who places the Program under this License
-     may add an explicit geographical distribution limitation excluding
-     those countries, so that distribution is permitted only in or among
-     countries not thus excluded.  In such case, this License incorporates
-     the limitation as if written in the body of this License.
-     
-     9. The Free Software Foundation may publish revised and/or new versions
-     of the General Public License from time to time.  Such new versions will
-     be similar in spirit to the present version, but may differ in detail to
-     address new problems or concerns.
-     
-     Each version is given a distinguishing version number.  If the Program
-     specifies a version number of this License which applies to it and "any
-     later version", you have the option of following the terms and conditions
-     either of that version or of any later version published by the Free
-     Software Foundation.  If the Program does not specify a version number of
-     this License, you may choose any version ever published by the Free Software
-     Foundation.
-     
-     10. If you wish to incorporate parts of the Program into other free
-     programs whose distribution conditions are different, write to the author
-     to ask for permission.  For software which is copyrighted by the Free
-     Software Foundation, write to the Free Software Foundation; we sometimes
-     make exceptions for this.  Our decision will be guided by the two goals
-     of preserving the free status of all derivatives of our free software and
-     of promoting the sharing and reuse of software generally.
-     
-     		    NO WARRANTY
-     
-     11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-     FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-     OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-     PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-     OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-     TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-     PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-     REPAIR OR CORRECTION.
-     
-     12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-     WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-     REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-     INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-     OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-     TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-     YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-     PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-     POSSIBILITY OF SUCH DAMAGES.
-     
-     	     END OF TERMS AND CONDITIONS
-     
-     Appendix: How to Apply These Terms to Your New Programs
-     
-     If you develop a new program, and you want it to be of the greatest
-     possible use to the public, the best way to achieve this is to make it
-     free software which everyone can redistribute and change under these terms.
-     
-     To do so, attach the following notices to the program.  It is safest
-     to attach them to the start of each source file to most effectively
-     convey the exclusion of warranty; and each file should have at least
-     the "copyright" line and a pointer to where the full notice is found.
-     
-     <one line to give the program's name and a brief idea of what it does.>
-     Copyright (C) 19yy  <name of author>
-     
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; either version 2 of the License, or
-     (at your option) any later version.
-     
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-     
-     You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-     
-     Also add information on how to contact you by electronic and paper mail.
-     
-     If the program is interactive, make it output a short notice like this
-     when it starts in an interactive mode:
-     
-     Gnomovision version 69, Copyright (C) 19yy name of author
-     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-     This is free software, and you are welcome to redistribute it
-     under certain conditions; type `show c' for details.
-     
-     The hypothetical commands `show w' and `show c' should show the appropriate
-     parts of the General Public License.  Of course, the commands you use may
-     be called something other than `show w' and `show c'; they could even be
-     mouse-clicks or menu items--whatever suits your program.
-     
-     You should also get your employer (if you work as a programmer) or your
-     school, if any, to sign a "copyright disclaimer" for the program, if
-     necessary.  Here is a sample; alter the names:
-     
-     Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-     `Gnomovision' (which makes passes at compilers) written by James Hacker.
-     
-     <signature of Ty Coon>, 1 April 1989
-     Ty Coon, President of Vice
-     
-     This General Public License does not permit incorporating your program into
-     proprietary programs.  If your program is a subroutine library, you may
-     consider it more useful to permit linking proprietary applications with the
-     library.  If this is what you want to do, use the GNU Library General
-     Public License instead of this License.
-
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/EXCEPTIONS-CONNECTOR-J b/plugins/org.eclipse.net4j.db.mysql/lib/EXCEPTIONS-CONNECTOR-J
deleted file mode 100644
index 7449551e87..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/EXCEPTIONS-CONNECTOR-J
+++ /dev/null
@@ -1,119 +0,0 @@
-MySQL FLOSS License Exception
-
-The MySQL AB Exception for Free/Libre and Open Source
-Software-only Applications Using MySQL Client Libraries (the
-"FLOSS Exception").
-
-Version 0.6, 7 March 2007
-
-Exception Intent
-
-We want specified Free/Libre and Open Source Software (``FLOSS'')
-applications to be able to use specified GPL-licensed MySQL client
-libraries (the ``Program'') despite the fact that not all FLOSS
-licenses are compatible with version 2 of the GNU General Public
-License (the ``GPL'').
-
-Legal Terms and Conditions
-
-As a special exception to the terms and conditions of version 2.0
-of the GPL:
-
- 1. You are free to distribute a Derivative Work that is formed
-    entirely from the Program and one or more works (each, a
-    "FLOSS Work") licensed under one or more of the licenses
-    listed below in section 1, as long as:
-      a. You obey the GPL in all respects for the Program and the
-         Derivative Work, except for identifiable sections of the
-         Derivative Work which are not derived from the Program,
-         and which can reasonably be considered independent and
-         separate works in themselves,
-      b. all identifiable sections of the Derivative Work which
-         are not derived from the Program, and which can
-         reasonably be considered independent and separate works
-         in themselves,
-           i. are distributed subject to one of the FLOSS licenses
-              listed below, and
-          ii. the object code or executable form of those sections
-              are accompanied by the complete corresponding
-              machine-readable source code for those sections on
-              the same medium and under the same FLOSS license as
-              the corresponding object code or executable forms of
-              those sections, and
-      c. any works which are aggregated with the Program or with a
-         Derivative Work on a volume of a storage or distribution
-         medium in accordance with the GPL, can reasonably be
-         considered independent and separate works in themselves
-         which are not derivatives of either the Program, a
-         Derivative Work or a FLOSS Work.
-    If the above conditions are not met, then the Program may only
-    be copied, modified, distributed or used under the terms and
-    conditions of the GPL or another valid licensing option from
-    MySQL AB.
-
- 2. FLOSS License List
-
-License name Version(s)/Copyright Date
-Academic Free License 2.0
-Apache Software License 1.0/1.1/2.0
-Apple Public Source License 2.0
-Artistic license From Perl 5.8.0
-BSD license "July 22 1999"
-Common Development and Distribution License (CDDL) 1.0
-Common Public License 1.0
-Eclipse Public License 1.0
-GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1
-Jabber Open Source License 1.0
-MIT license (As listed in file MIT-License.txt) ---
-Mozilla Public License (MPL) 1.0/1.1
-Open Software License 2.0
-OpenSSL license (with original SSLeay license) "2003" ("1998")
-PHP License 3.0
-Python license (CNRI Python License) ---
-Python Software Foundation License 2.1.1
-Sleepycat License "1999"
-University of Illinois/NCSA Open Source License ---
-W3C License "2001"
-X11 License "2001"
-Zlib/libpng License ---
-Zope Public License 2.0
-
-    Due to the many variants of some of the above licenses, we
-    require that any version follow the 2003 version of the Free
-    Software Foundation's Free Software Definition
-    (http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of
-    the Open Source Definition by the Open Source Initiative
-    (http://www.opensource.org/docs/definition.php).
-
- 3. Definitions
-
-      a. Terms used, but not defined, herein shall have the
-         meaning provided in the GPL.
-      b. Derivative Work means a derivative work under copyright
-         law.
-
- 4. Applicability: This FLOSS Exception applies to all Programs
-    that contain a notice placed by MySQL AB saying that the
-    Program may be distributed under the terms of this FLOSS
-    Exception. If you create or distribute a work which is a
-    Derivative Work of both the Program and any other work
-    licensed under the GPL, then this FLOSS Exception is not
-    available for that work; thus, you must remove the FLOSS
-    Exception notice from that work and comply with the GPL in all
-    respects, including by retaining all GPL notices. You may
-    choose to redistribute a copy of the Program exclusively under
-    the terms of the GPL by removing the FLOSS Exception notice
-    from that copy of the Program, provided that the copy has
-    never been modified by you or any third party.
-
-Appendix A. Qualified Libraries and Packages
-
-The following is a non-exhaustive list of libraries and packages
-which are covered by the FLOSS License Exception. Please note that
-this appendix is provided merely as an additional service to
-specific FLOSS projects wishing to simplify licensing information
-for their users. Compliance with one of the licenses noted under
-the "FLOSS license list" section remains a prerequisite.
-
-Package Name                  Qualifying License and Version
-Apache Portable Runtime (APR) Apache Software License 2.0
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/README b/plugins/org.eclipse.net4j.db.mysql/lib/README
deleted file mode 100644
index 2612e4c0c0..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/README
+++ /dev/null
@@ -1,45 +0,0 @@
-MySQL Connector/J @MYSQL_CJ_VERSION@ (formerly MM.MySQL)
-MySQL AB's JDBC Driver for MySQL
-Copyright (c) 2003 MySQL AB
-
-CONTENTS
-
-* License
-* Documentation Location
-
-
-LICENSE
-
-MySQL Connector/J is licensed under the GPL or a commercial license
-from MySQL AB. 
-
-If you have licensed this product under the GPL, please see the COPYING
-file for more information. 
-
-There are special exceptions to the terms and conditions of the GPL 
-as it is applied to this software. View the full text of the 
-exception in file EXCEPTIONS-CONNECTOR-J in the directory of this 
-software distribution.
-
-If you have licensed this product under a commercial license from
-MySQL AB, please see the file "MySQLEULA.txt" that comes with this 
-distribution for the terms of the license.
-
-If you need non-GPL licenses for commercial distribution please contact 
-me <mark@mysql.com> or <sales@mysql.com>.
-
-
-DOCUMENTATION LOCATION
- 
-The documentation formerly contained in this file has moved into the 
-'doc' directory, where it is available in HTML, PDF and plaintext
-forms.
-
-You may also find the latest copy of the documentation on the MySQL
-website at http://dev.mysql.com/doc/refman/5.0/en/connector-j.html
-
---
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
-
-
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/README.txt b/plugins/org.eclipse.net4j.db.mysql/lib/README.txt
deleted file mode 100644
index 2612e4c0c0..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/README.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-MySQL Connector/J @MYSQL_CJ_VERSION@ (formerly MM.MySQL)
-MySQL AB's JDBC Driver for MySQL
-Copyright (c) 2003 MySQL AB
-
-CONTENTS
-
-* License
-* Documentation Location
-
-
-LICENSE
-
-MySQL Connector/J is licensed under the GPL or a commercial license
-from MySQL AB. 
-
-If you have licensed this product under the GPL, please see the COPYING
-file for more information. 
-
-There are special exceptions to the terms and conditions of the GPL 
-as it is applied to this software. View the full text of the 
-exception in file EXCEPTIONS-CONNECTOR-J in the directory of this 
-software distribution.
-
-If you have licensed this product under a commercial license from
-MySQL AB, please see the file "MySQLEULA.txt" that comes with this 
-distribution for the terms of the license.
-
-If you need non-GPL licenses for commercial distribution please contact 
-me <mark@mysql.com> or <sales@mysql.com>.
-
-
-DOCUMENTATION LOCATION
- 
-The documentation formerly contained in this file has moved into the 
-'doc' directory, where it is available in HTML, PDF and plaintext
-forms.
-
-You may also find the latest copy of the documentation on the MySQL
-website at http://dev.mysql.com/doc/refman/5.0/en/connector-j.html
-
---
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
-
-
diff --git a/plugins/org.eclipse.net4j.db.mysql/license.html b/plugins/org.eclipse.net4j.db.mysql/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.mysql/plugin.properties b/plugins/org.eclipse.net4j.db.mysql/plugin.properties
deleted file mode 100644
index 7e11687c29..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j DB MYSQL (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.db.mysql/plugin.xml b/plugins/org.eclipse.net4j.db.mysql/plugin.xml
deleted file mode 100644
index 3dde8153a4..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.net4j.db.dbAdapters">
-      <dbAdapter
-            class="org.eclipse.net4j.db.internal.mysql.MYSQLAdapter"
-            name="mysql"
-            version="5.1.5">
-      </dbAdapter>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/MYSQLAdapter.java b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/MYSQLAdapter.java
deleted file mode 100644
index 47b03674e1..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/MYSQLAdapter.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.internal.mysql;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.internal.db.DBAdapter;
-import org.eclipse.net4j.internal.db.ddl.DBField;
-
-import com.mysql.jdbc.Driver;
-import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
-
-import javax.sql.DataSource;
-
-import java.sql.SQLException;
-
-/**
- * @author Eike Stepper
- */
-public class MYSQLAdapter extends DBAdapter
-{
-  public static final String NAME = "mysql";
-
-  public static final String VERSION = "5.1.5";
-
-  private static final String[] RESERVED_WORDS = { "ACTION", "ADD", "ALL", "ALTER", "ANALYZE", "AND", "AS", "ASC",
-      "ASENSITIVE", "BEFORE", "BETWEEN", "BIGINT", "BINARY", "BIT", "BLOB", "BOTH", "BY", "CALL", "CASCADE", "CASE",
-      "CHANGE", "CHAR", "CHARACTER", "CHECK", "COLLATE", "COLUMN", "CONDITION", "CONSTRAINT", "CONTINUE", "CONVERT",
-      "CREATE", "CROSS", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", "DATABASE",
-      "DATABASES", "DATE", "DAY_HOUR", "DAY_MICROSECOND", "DAY_MINUTE", "DAY_SECOND", "DEC", "DECIMAL", "DECLARE",
-      "DEFAULT", "DELAYED", "DELETE", "DESC", "DESCRIBE", "DETERMINISTIC", "DISTINCT", "DISTINCTROW", "DIV", "DOUBLE",
-      "DROP", "DUAL", "EACH", "ELSE", "ELSEIF", "ENCLOSED", "ENUM", "ESCAPED", "EXISTS", "EXIT", "EXPLAIN", "FALSE",
-      "FETCH", "FLOAT", "FLOAT4", "FLOAT8", "FOR", "FORCE", "FOREIGN", "FROM", "FULLTEXT", "GRANT", "GROUP", "HAVING",
-      "HIGH_PRIORITY", "HOUR_MICROSECOND", "HOUR_MINUTE", "HOUR_SECOND", "IF", "IGNORE", "IN", "INDEX", "INFILE",
-      "INNER", "INOUT", "INSENSITIVE", "INSERT", "INT", "INT1", "INT2", "INT3", "INT4", "INT8", "INTEGER", "INTERVAL",
-      "INTO", "IS", "ITERATE", "JOIN", "KEY", "KEYS", "KILL", "LEADING", "LEAVE", "LEFT", "LIKE", "LIMIT", "LINES",
-      "LOAD", "LOCALTIME", "LOCALTIMESTAMP", "LOCK", "LONG", "LONGBLOB", "LONGTEXT", "LOOP", "LOW_PRIORITY", "MATCH",
-      "MEDIUMBLOB", "MEDIUMINT", "MEDIUMTEXT", "MIDDLEINT", "MINUTE_MICROSECOND", "MINUTE_SECOND", "MOD", "MODIFIES",
-      "NATURAL", "NO", "NOT", "NO_WRITE_TO_BINLOG", "NULL", "NUMERIC", "ON", "OPTIMIZE", "OPTION", "OPTIONALLY", "OR",
-      "ORDER", "OUT", "OUTER", "OUTFILE", "PRECISION", "PRIMARY", "PROCEDURE", "PURGE", "RAID0", "READ", "READS",
-      "REAL", "REFERENCES", "REGEXP", "RELEASE", "RENAME", "REPEAT", "REPLACE", "REQUIRE", "RESTRICT", "RETURN",
-      "REVOKE", "RIGHT", "RLIKE", "SCHEMA", "SCHEMAS", "SECOND_MICROSECOND", "SELECT", "SENSITIVE", "SEPARATOR", "SET",
-      "SHOW", "SMALLINT", "SONAME", "SPATIAL", "SPECIFIC", "SQL", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING",
-      "SQL_BIG_RESULT", "SQL_CALC_FOUND_ROWS", "SQL_SMALL_RESULT", "SSL", "STARTING", "STRAIGHT_JOIN", "TABLE",
-      "TERMINATED", "TEXT", "THEN", "TIME", "TIMESTAMP", "TINYBLOB", "TINYINT", "TINYTEXT", "TO", "TRAILING",
-      "TRIGGER", "TRUE", "UNDO", "UNION", "UNIQUE", "UNLOCK", "UNSIGNED", "UPDATE", "USAGE", "USE", "USING",
-      "UTC_DATE", "UTC_TIME", "UTC_TIMESTAMP", "VALUES", "VARBINARY", "VARCHAR", "VARCHARACTER", "VARYING", "WHEN",
-      "WHERE", "WHILE", "WITH", "WRITE", "X509", "XOR", "YEAR_MONTH", "ZEROFILL" };
-
-  public MYSQLAdapter()
-  {
-    super(NAME, VERSION);
-  }
-
-  public Driver getJDBCDriver()
-  {
-    try
-    {
-      return new Driver();
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  public DataSource createJDBCDataSource()
-  {
-    return new MysqlDataSource();
-  }
-
-  @Override
-  protected String getTypeName(DBField field)
-  {
-    DBType type = field.getType();
-    switch (type)
-    {
-    case VARCHAR:
-    case CLOB:
-      return "LONGTEXT";
-    }
-
-    return super.getTypeName(field);
-  }
-
-  @Override
-  protected void addIndexField(StringBuilder builder, IDBField field)
-  {
-    super.addIndexField(builder, field);
-    if (field.getType() == DBType.VARCHAR)
-    {
-      builder.append("(");
-      builder.append(field.getPrecision());
-      builder.append(")");
-    }
-  }
-
-  public String[] getReservedWords()
-  {
-    return RESERVED_WORDS;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
deleted file mode 100644
index bea9cd44db..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.internal.mysql.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.db.mysql"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_SQL = DEBUG.tracer("sql"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.tests/.classpath b/plugins/org.eclipse.net4j.db.tests/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/.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.db.tests/.cvsignore b/plugins/org.eclipse.net4j.db.tests/.cvsignore
deleted file mode 100644
index 4824d73869..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-*.zip
-testMap.dat
diff --git a/plugins/org.eclipse.net4j.db.tests/.project b/plugins/org.eclipse.net4j.db.tests/.project
deleted file mode 100644
index f5964fa8e1..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.db.tests</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 00ca9476a2..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:44:22 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 847ae49ad6..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:44:22 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 66347c68f0..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Oct 20 11:53:34 CEST 2006
-eclipse.preferences.version=1
-pluginProject.extensions=false
diff --git a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 98cbdc86ba..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.db.tests
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.db.tests.bundle.Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.tests;visibility:=reexport,
- org.eclipse.net4j.db.derby;visibility:=reexport
-Export-Package: org.eclipse.net4j.db.tests
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.db.tests/about.html b/plugins/org.eclipse.net4j.db.tests/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/about.html
+++ /dev/null
@@ -1,28 +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.db.tests/about.ini b/plugins/org.eclipse.net4j.db.tests/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/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.db.tests/about.mappings b/plugins/org.eclipse.net4j.db.tests/about.mappings
deleted file mode 100644
index 720ca870fa..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/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.db.tests/about.properties b/plugins/org.eclipse.net4j.db.tests/about.properties
deleted file mode 100644
index 47cce04221..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 Tests(Incubation)
-featureText = Net4j Tests\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/Net4j
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.db.tests/build.properties b/plugins/org.eclipse.net4j.db.tests/build.properties
deleted file mode 100644
index e842be8eed..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               test.xml,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
diff --git a/plugins/org.eclipse.net4j.db.tests/copyright.txt b/plugins/org.eclipse.net4j.db.tests/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.tests/epl-v10.html b/plugins/org.eclipse.net4j.db.tests/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.tests/license.html b/plugins/org.eclipse.net4j.db.tests/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.tests/modeling32.png b/plugins/org.eclipse.net4j.db.tests/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.db.tests/plugin.properties b/plugins/org.eclipse.net4j.db.tests/plugin.properties
deleted file mode 100644
index 2b46fc1ebf..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Tests (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/AbstractDBTest.java b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/AbstractDBTest.java
deleted file mode 100644
index 3760e79739..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/AbstractDBTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.tests;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.IDBConnectionProvider;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBSchema;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.util.tests.AbstractOMTest;
-
-import javax.sql.DataSource;
-
-import java.sql.Connection;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractDBTest<DATA_SOURCE extends DataSource> extends AbstractOMTest
-{
-  protected IDBAdapter dbAdapter;
-
-  protected IDBConnectionProvider dbConnectionProvider;
-
-  @SuppressWarnings("unchecked")
-  @Override
-  protected void doSetUp() throws Exception
-  {
-    dbAdapter = createDBAdapter();
-    DATA_SOURCE dataSource = (DATA_SOURCE)dbAdapter.createJDBCDataSource();
-    configureDataSourcer(dataSource);
-    dbConnectionProvider = DBUtil.createConnectionProvider(dataSource);
-  }
-
-  @Override
-  protected void doTearDown() throws Exception
-  {
-  }
-
-  protected abstract IDBAdapter createDBAdapter();
-
-  protected abstract void configureDataSourcer(DATA_SOURCE dataSource);
-
-  protected Connection getConnection()
-  {
-    return dbConnectionProvider.getConnection();
-  }
-
-  public void _testDBTypes() throws Exception
-  {
-    IDBSchema schema = DBUtil.createSchema("testDBTypes");
-    DBType[] dbTypes = DBType.values();
-
-    int count = 0;
-    int i = 0;
-    for (DBType dbType : dbTypes)
-    {
-      IDBTable table = schema.addTable("table_" + i);
-      table.addField("field", dbType);
-      ++count;
-
-      if (dbAdapter.isTypeIndexable(dbType))
-      {
-        IDBTable idx_table = schema.addTable("idx_table" + i);
-        IDBField idx_field = idx_table.addField("field", dbType);
-        idx_table.addIndex(IDBIndex.Type.NON_UNIQUE, idx_field);
-        ++count;
-
-        IDBTable uni_table = schema.addTable("uni_table" + i);
-        IDBField uni_field = uni_table.addField("field", dbType);
-        uni_table.addIndex(IDBIndex.Type.UNIQUE, uni_field);
-        ++count;
-
-        IDBTable pk_table = schema.addTable("pk_table" + i);
-        IDBField pk_field = pk_table.addField("field", dbType);
-        pk_table.addIndex(IDBIndex.Type.PRIMARY_KEY, pk_field);
-        ++count;
-      }
-      ++i;
-    }
-
-    Set<IDBTable> tables = schema.create(dbAdapter, dbConnectionProvider);
-    assertEquals(count, tables.size());
-  }
-
-  public void testEscapeStrings() throws Exception
-  {
-    IDBSchema schema = DBUtil.createSchema("testEscapeStrings");
-    IDBTable table = schema.addTable("testtable");
-    IDBField strval = table.addField("strval", DBType.VARCHAR, 255);
-    schema.create(dbAdapter, dbConnectionProvider);
-
-    // StringBuilder builder = new StringBuilder("insert into testtable values(");
-    // dbAdapter.appendValue(builder, strval, "My name is \"nobody\", not body");
-    // builder.append(")");
-    String val = "My name is 'nobody', not body";
-    DBUtil.insertRow(getConnection(), dbAdapter, table, val);
-    Object[] result = DBUtil.select(getConnection(), (String)null, strval);
-    assertEquals(val, result[0]);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/AllTests.java b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/AllTests.java
deleted file mode 100644
index 82e9111932..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/AllTests.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Eike Stepper
- */
-public class AllTests
-{
-  public static Test suite()
-  {
-    TestSuite suite = new TestSuite("Tests for Net4j");
-
-    // $JUnit-BEGIN$
-    suite.addTestSuite(DerbyTest.class);
-    // $JUnit-END$
-
-    return suite;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/DerbyTest.java b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/DerbyTest.java
deleted file mode 100644
index f21407429c..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/DerbyTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.tests;
-
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.internal.derby.EmbeddedDerbyAdapter;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.io.TMPUtil;
-
-import org.apache.derby.jdbc.EmbeddedDataSource;
-
-import java.io.File;
-
-/**
- * @author Eike Stepper
- */
-public class DerbyTest extends AbstractDBTest<EmbeddedDataSource>
-{
-  private File dbFolder;
-
-  @Override
-  protected void doTearDown() throws Exception
-  {
-    deleteDBFolder();
-    super.doTearDown();
-  }
-
-  @Override
-  protected IDBAdapter createDBAdapter()
-  {
-    return new EmbeddedDerbyAdapter();
-  }
-
-  @Override
-  protected void configureDataSourcer(EmbeddedDataSource dataSource)
-  {
-    dbFolder = TMPUtil.createTempFolder("derby_", null, new File("/temp"));
-    deleteDBFolder();
-    msg("Using DB folder: " + dbFolder.getAbsolutePath());
-
-    dataSource.setDatabaseName(dbFolder.getAbsolutePath());
-    dataSource.setCreateDatabase("create");
-  }
-
-  private void deleteDBFolder()
-  {
-    if (dbFolder != null)
-    {
-      if (dbFolder.exists())
-      {
-        IOUtil.delete(dbFolder);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java
deleted file mode 100644
index 9ed3211db6..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package org.eclipse.net4j.db.tests;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
-
-public class TestSchema extends DBSchema
-{
-  public static final TestSchema INSTANCE = new TestSchema();
-
-  /**
-   * DBTable cdo_repository
-   */
-  public static final IDBTable REPOSITORY = INSTANCE.addTable("cdo_repository");
-
-  public static final IDBField REPOSITORY_NAME = //
-  REPOSITORY.addField("name", DBType.VARCHAR, 255);
-
-  public static final IDBField REPOSITORY_UUID = //
-  REPOSITORY.addField("uuid", DBType.VARCHAR, 64);
-
-  public static final IDBField REPOSITORY_STARTS = //
-  REPOSITORY.addField("starts", DBType.BIGINT);
-
-  public static final IDBField REPOSITORY_STARTED = //
-  REPOSITORY.addField("started", DBType.BIGINT);
-
-  public static final IDBField REPOSITORY_STOPPED = //
-  REPOSITORY.addField("stopped", DBType.BIGINT);
-
-  public static final IDBField REPOSITORY_NEXT_CDOID = //
-  REPOSITORY.addField("next_cdoid", DBType.BIGINT);
-
-  public static final IDBField REPOSITORY_NEXT_METAID = //
-  REPOSITORY.addField("next_metaid", DBType.BIGINT);
-
-  /**
-   * DBTable cdo_packages
-   */
-  public static final IDBTable PACKAGES = INSTANCE.addTable("cdo_packages");
-
-  public static final IDBField PACKAGES_ID = //
-  PACKAGES.addField("id", DBType.INTEGER);
-
-  public static final IDBField PACKAGES_URI = //
-  PACKAGES.addField("uri", DBType.VARCHAR, 255);
-
-  public static final IDBField PACKAGES_NAME = //
-  PACKAGES.addField("name", DBType.VARCHAR, 255);
-
-  public static final IDBField PACKAGES_ECORE = //
-  PACKAGES.addField("ecore", DBType.CLOB);
-
-  public static final IDBField PACKAGES_DYNAMIC = //
-  PACKAGES.addField("dynamic", DBType.BOOLEAN);
-
-  public static final IDBField PACKAGES_RANGE_LB = //
-  PACKAGES.addField("range_lb", DBType.BIGINT);
-
-  public static final IDBField PACKAGES_RANGE_UB = //
-  PACKAGES.addField("range_ub", DBType.BIGINT);
-
-  public static final IDBIndex INDEX_PACKAGES_PK = //
-  PACKAGES.addIndex(IDBIndex.Type.PRIMARY_KEY, PACKAGES_ID);
-
-  public static final IDBIndex INDEX_PACKAGES_URI = //
-  PACKAGES.addIndex(IDBIndex.Type.UNIQUE, PACKAGES_URI);
-
-  /**
-   * DBTable cdo_classes
-   */
-  public static final IDBTable CLASSES = INSTANCE.addTable("cdo_classes");
-
-  public static final IDBField CLASSES_ID = //
-  CLASSES.addField("id", DBType.INTEGER);
-
-  public static final IDBField CLASSES_PACKAGE = //
-  CLASSES.addField("package", DBType.INTEGER);
-
-  public static final IDBField CLASSES_CLASSIFIER = //
-  CLASSES.addField("classifier", DBType.INTEGER);
-
-  public static final IDBField CLASSES_NAME = //
-  CLASSES.addField("name", DBType.VARCHAR, 255);
-
-  public static final IDBField CLASSES_ABSTRACT = //
-  CLASSES.addField("abstract", DBType.BOOLEAN);
-
-  public static final IDBIndex INDEX_CLASSES_PK = //
-  CLASSES.addIndex(IDBIndex.Type.PRIMARY_KEY, CLASSES_ID);
-
-  /**
-   * DBTable cdo_supertypes
-   */
-  public static final IDBTable SUPERTYPES = INSTANCE.addTable("cdo_supertypes");
-
-  public static final IDBField SUPERTYPES_TYPE = //
-  SUPERTYPES.addField("type_id", DBType.INTEGER);
-
-  public static final IDBField SUPERTYPES_SUPERTYPE_PACKAGE = //
-  SUPERTYPES.addField("supertype_package", DBType.VARCHAR, 255);
-
-  public static final IDBField SUPERTYPES_SUPERTYPE_CLASSIFIER = //
-  SUPERTYPES.addField("supertype_classifier", DBType.INTEGER);
-
-  public static final IDBIndex INDEX_SUPERTYPES_PK = //
-  SUPERTYPES.addIndex(IDBIndex.Type.PRIMARY_KEY, SUPERTYPES_TYPE);
-
-  /**
-   * DBTable cdo_features
-   */
-  public static final IDBTable FEATURES = INSTANCE.addTable("cdo_features");
-
-  public static final IDBField FEATURES_ID = //
-  FEATURES.addField("id", DBType.INTEGER);
-
-  public static final IDBField FEATURES_CLASS = //
-  FEATURES.addField("class", DBType.INTEGER);
-
-  public static final IDBField FEATURES_FEATURE = //
-  FEATURES.addField("feature", DBType.INTEGER);
-
-  public static final IDBField FEATURES_NAME = //
-  FEATURES.addField("name", DBType.VARCHAR, 255);
-
-  public static final IDBField FEATURES_TYPE = //
-  FEATURES.addField("type", DBType.INTEGER);
-
-  public static final IDBField FEATURES_REFERENCE_PACKAGE = //
-  FEATURES.addField("reference_package", DBType.VARCHAR, 255);
-
-  public static final IDBField FEATURES_REFERENCE_CLASSIFIER = //
-  FEATURES.addField("reference_classifier", DBType.INTEGER);
-
-  public static final IDBField FEATURES_MANY = //
-  FEATURES.addField("many", DBType.BOOLEAN);
-
-  public static final IDBField FEATURES_CONTAINMENT = //
-  FEATURES.addField("containment", DBType.BOOLEAN);
-
-  public static final IDBField FEATURES_INDEX = //
-  FEATURES.addField("idx", DBType.INTEGER);
-
-  public static final IDBIndex INDEX_FEATURES_PK = //
-  FEATURES.addIndex(IDBIndex.Type.PRIMARY_KEY, FEATURES_ID);
-
-  /**
-   * Name of object table
-   */
-  public static final String CDO_OBJECTS = "cdo_objects";
-
-  /**
-   * Field names of attribute tables
-   */
-  public static final String ATTRIBUTES_ID = "cdo_id";
-
-  public static final String ATTRIBUTES_VERSION = "cdo_version";
-
-  public static final String ATTRIBUTES_CLASS = "cdo_class";
-
-  public static final String ATTRIBUTES_CREATED = "cdo_created";
-
-  public static final String ATTRIBUTES_REVISED = "cdo_revised";
-
-  public static final String ATTRIBUTES_RESOURCE = "cdo_resource";
-
-  public static final String ATTRIBUTES_CONTAINER = "cdo_container";
-
-  public static final String ATTRIBUTES_FEATURE = "cdo_feature";
-
-  /**
-   * Field names of reference tables
-   */
-  public static final String REFERENCES_FEATURE = "cdo_feature";
-
-  public static final String REFERENCES_SOURCE = "cdo_source";
-
-  public static final String REFERENCES_VERSION = "cdo_version";
-
-  public static final String REFERENCES_IDX = "cdo_idx";
-
-  public static final String REFERENCES_TARGET = "cdo_target";
-
-  private TestSchema()
-  {
-    super("CDO");
-  }
-
-  static
-  {
-    INSTANCE.lock();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/bundle/Activator.java b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/bundle/Activator.java
deleted file mode 100644
index c84184f4af..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/bundle/Activator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.tests.bundle;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Eike Stepper
- */
-public class Activator implements BundleActivator
-{
-  public void start(BundleContext context) throws Exception
-  {
-  }
-
-  public void stop(BundleContext context) throws Exception
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db.tests/test.xml b/plugins/org.eclipse.net4j.db.tests/test.xml
deleted file mode 100644
index ee303ae0f3..0000000000
--- a/plugins/org.eclipse.net4j.db.tests/test.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties plugin-name, and library-file -->
-  <property name="plugin-name" value="org.eclipse.net4j.tests"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="emf-folder" value="${eclipse-home}/emf_folder"/>
-    <delete dir="${emf-folder}" quiet="true"/>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${emf-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.net4j.tests.AllTests"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db/.classpath b/plugins/org.eclipse.net4j.db/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.db/.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.db/.cvsignore b/plugins/org.eclipse.net4j.db/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/plugins/org.eclipse.net4j.db/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.net4j.db/.options b/plugins/org.eclipse.net4j.db/.options
deleted file mode 100644
index 824f4c2cda..0000000000
--- a/plugins/org.eclipse.net4j.db/.options
+++ /dev/null
@@ -1,5 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.db/debug = true
-
-org.eclipse.net4j.db/debug.sql = true
diff --git a/plugins/org.eclipse.net4j.db/.project b/plugins/org.eclipse.net4j.db/.project
deleted file mode 100644
index 12bb7c285e..0000000000
--- a/plugins/org.eclipse.net4j.db/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.db</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f06bcb9815..0000000000
--- a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:42:54 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index cef5f45381..0000000000
--- a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:42:54 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.db/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.db/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
deleted file mode 100644
index 7278186d22..0000000000
--- a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.db;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.net4j.internal.db.bundle.OM$Activator
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.util;visibility:=reexport
-Export-Package: org.eclipse.net4j.db;version="0.8.0",
- org.eclipse.net4j.db.ddl;version="0.8.0",
- org.eclipse.net4j.db.dml;version="0.8.0",
- org.eclipse.net4j.internal.db;version="0.8.0",
- org.eclipse.net4j.internal.db.bundle;version="0.8.0",
- org.eclipse.net4j.internal.db.ddl;version="0.8.0",
- org.eclipse.net4j.internal.db.dml;version="0.8.0"
-Bundle-ActivationPolicy: lazy
-Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.net4j.db/about.html b/plugins/org.eclipse.net4j.db/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.db/about.html
+++ /dev/null
@@ -1,28 +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.db/about.ini b/plugins/org.eclipse.net4j.db/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.net4j.db/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.db/about.mappings b/plugins/org.eclipse.net4j.db/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.net4j.db/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.db/about.properties b/plugins/org.eclipse.net4j.db/about.properties
deleted file mode 100644
index 72165d94d6..0000000000
--- a/plugins/org.eclipse.net4j.db/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 DB (Incubation)
-featureText = Net4j DB \n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/Net4j
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.db/build.properties b/plugins/org.eclipse.net4j.db/build.properties
deleted file mode 100644
index 80623a5479..0000000000
--- a/plugins/org.eclipse.net4j.db/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               plugin.xml,\
-               schema/,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
diff --git a/plugins/org.eclipse.net4j.db/copyright.txt b/plugins/org.eclipse.net4j.db/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.db/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db/epl-v10.html b/plugins/org.eclipse.net4j.db/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db/license.html b/plugins/org.eclipse.net4j.db/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.db/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db/modeling32.png b/plugins/org.eclipse.net4j.db/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.net4j.db/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.db/plugin.properties b/plugins/org.eclipse.net4j.db/plugin.properties
deleted file mode 100644
index c45c2ead34..0000000000
--- a/plugins/org.eclipse.net4j.db/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j DB (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.db/plugin.xml b/plugins/org.eclipse.net4j.db/plugin.xml
deleted file mode 100644
index aef40a3e4e..0000000000
--- a/plugins/org.eclipse.net4j.db/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension-point id="dbAdapters" name="Net4j DB Adapters" schema="schema/dbAdapters.exsd"/>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.db/reserved_words/ansi.txt b/plugins/org.eclipse.net4j.db/reserved_words/ansi.txt
deleted file mode 100644
index 00a4009f9b..0000000000
--- a/plugins/org.eclipse.net4j.db/reserved_words/ansi.txt
+++ /dev/null
@@ -1,337 +0,0 @@
-ABSOLUTE
-ACTION
-ADD
-AFTER
-ALL
-ALLOCATE
-ALTER
-AND
-ANY
-ARE
-ARRAY
-AS
-ASC
-ASENSITIVE
-ASSERTION
-ASYMMETRIC
-AT
-ATOMIC
-AUTHORIZATION
-AVG
-BEFORE
-BEGIN
-BETWEEN
-BIGINT
-BINARY
-BIT
-BIT_LENGTH
-BLOB
-BOOLEAN
-BOTH
-BREADTH
-BY
-CALL
-CALLED
-CASCADE
-CASCADED
-CASE
-CAST
-CATALOG
-CHAR
-CHARACTER
-CHARACTER_LENGTH
-CHAR_LENGTH
-CHECK
-CLOB
-CLOSE
-COALESCE
-COLLATE
-COLLATION
-COLUMN
-COMMIT
-CONDITION
-CONNECT
-CONNECTION
-CONSTRAINT
-CONSTRAINTS
-CONSTRUCTOR
-CONTAINS
-CONTINUE
-CONVERT
-CORRESPONDING
-COUNT
-CREATE
-CROSS
-CUBE
-CURRENT
-CURRENT_DATE
-CURRENT_DEFAULT_TRANSFORM_GROUP
-CURRENT_PATH
-CURRENT_ROLE
-CURRENT_TIME
-CURRENT_TIMESTAMP
-CURRENT_TRANSFORM_GROUP_FOR_TYPE
-CURRENT_USER
-CURSOR
-CYCLE
-DATA
-DATE
-DAY
-DEALLOCATE
-DEC
-DECIMAL
-DECLARE
-DEFAULT
-DEFERRABLE
-DEFERRED
-DELETE
-DEPTH
-DEREF
-DESC
-DESCRIBE
-DESCRIPTOR
-DETERMINISTIC
-DIAGNOSTICS
-DISCONNECT
-DISTINCT
-DO
-DOMAIN
-DOUBLE
-DROP
-DYNAMIC
-EACH
-ELEMENT
-ELSE
-ELSEIF
-END
-EQUALS
-ESCAPE
-EXCEPT
-EXCEPTION
-EXEC
-EXECUTE
-EXISTS
-EXIT
-EXTERNAL
-EXTRACT
-FALSE
-FETCH
-FILTER
-FIRST
-FLOAT
-FOR
-FOREIGN
-FOUND
-FREE
-FROM
-FULL
-FUNCTION
-GENERAL
-GET
-GLOBAL
-GO
-GOTO
-GRANT
-GROUP
-GROUPING
-HANDLER
-HAVING
-HOLD
-HOUR
-IDENTITY
-IF
-IMMEDIATE
-IN
-INDICATOR
-INITIALLY
-INNER
-INOUT
-INPUT
-INSENSITIVE
-INSERT
-INT
-INTEGER
-INTERSECT
-INTERVAL
-INTO
-IS
-ISOLATION
-ITERATE
-JOIN
-KEY
-LANGUAGE
-LARGE
-LAST
-LATERAL
-LEADING
-LEAVE
-LEFT
-LEVEL
-LIKE
-LOCAL
-LOCALTIME
-LOCALTIMESTAMP
-LOCATOR
-LOOP
-LOWER
-MAP
-MATCH
-MAX
-MEMBER
-MERGE
-METHOD
-MIN
-MINUTE
-MODIFIES
-MODULE
-MONTH
-MULTISET
-NAMES
-NATIONAL
-NATURAL
-NCHAR
-NCLOB
-NEW
-NEXT
-NO
-NONE
-NOT
-NULL
-NULLIF
-NUMERIC
-OBJECT
-OCTET_LENGTH
-OF
-OLD
-ON
-ONLY
-OPEN
-OPTION
-OR
-ORDER
-ORDINALITY
-OUT
-OUTER
-OUTPUT
-OVER
-OVERLAPS
-PAD
-PARAMETER
-PARTIAL
-PARTITION
-PATH
-POSITION
-PRECISION
-PREPARE
-PRESERVE
-PRIMARY
-PRIOR
-PRIVILEGES
-PROCEDURE
-PUBLIC
-RANGE
-READ
-READS
-REAL
-RECURSIVE
-REF
-REFERENCES
-REFERENCING
-RELATIVE
-RELEASE
-REPEAT
-RESIGNAL
-RESTRICT
-RESULT
-RETURN
-RETURNS
-REVOKE
-RIGHT
-ROLE
-ROLLBACK
-ROLLUP
-ROUTINE
-ROW
-ROWS
-SAVEPOINT
-SCHEMA
-SCOPE
-SCROLL
-SEARCH
-SECOND
-SECTION
-SELECT
-SENSITIVE
-SESSION
-SESSION_USER
-SET
-SETS
-SIGNAL
-SIMILAR
-SIZE
-SMALLINT
-SOME
-SPACE
-SPECIFIC
-SPECIFICTYPE
-SQL
-SQLCODE
-SQLERROR
-SQLEXCEPTION
-SQLSTATE
-SQLWARNING
-START
-STATE
-STATIC
-SUBMULTISET
-SUBSTRING
-SUM
-SYMMETRIC
-SYSTEM
-SYSTEM_USER
-TABLE
-TABLESAMPLE
-TEMPORARY
-THEN
-TIME
-TIMESTAMP
-TIMEZONE_HOUR
-TIMEZONE_MINUTE
-TO
-TRAILING
-TRANSACTION
-TRANSLATE
-TRANSLATION
-TREAT
-TRIGGER
-TRIM
-TRUE
-UNDER
-UNDO
-UNION
-UNIQUE
-UNKNOWN
-UNNEST
-UNTIL
-UPDATE
-UPPER
-USAGE
-USER
-USING
-VALUE
-VALUES
-VARCHAR
-VARYING
-VIEW
-WHEN
-WHENEVER
-WHERE
-WHILE
-WINDOW
-WITH
-WITHIN
-WITHOUT
-WORK
-WRITE
-YEAR
-ZONE
diff --git a/plugins/org.eclipse.net4j.db/reserved_words/db2.txt b/plugins/org.eclipse.net4j.db/reserved_words/db2.txt
deleted file mode 100644
index cdecd44c27..0000000000
--- a/plugins/org.eclipse.net4j.db/reserved_words/db2.txt
+++ /dev/null
@@ -1,376 +0,0 @@
-ACTIVATE
-ADD
-AFTER
-ALIAS
-ALL
-ALLOCATE
-ALLOW
-ALTER
-AND
-ANY
-AS
-ASENSITIVE
-ASSOCIATE
-ASUTIME
-AT
-ATTRIBUTES
-AUDIT
-AUTHORIZATION
-AUX
-AUXILIARY
-BEFORE
-BEGIN
-BETWEEN
-BINARY
-BUFFERPOOL
-BY
-CACHE
-CALL
-CALLED
-CAPTURE
-CARDINALITY
-CASCADED
-CASE
-CAST
-CCSID
-CHAR
-CHARACTER
-CHECK
-CLOSE
-CLUSTER
-COLLECTION
-COLLID
-COLUMN
-COMMENT
-COMMIT
-CONCAT
-CONDITION
-CONNECT
-CONNECTION
-CONSTRAINT
-CONTAINS
-CONTINUE
-COUNT
-COUNT_BIG
-CREATE
-CROSS
-CURRENT
-CURRENT_DATE
-CURRENT_LC_CTYPE
-CURRENT_PATH
-CURRENT_SCHEMA
-CURRENT_SERVER
-CURRENT_TIME
-CURRENT_TIMESTAMP
-CURRENT_TIMEZONE
-CURRENT_USER
-CURSOR
-CYCLE
-DATA
-DATABASE
-DATAPARTITIONNAME
-DATAPARTITIONNUM
-DATE
-DAY
-DAYS
-DB2GENERAL
-DB2GENRL
-DB2SQL
-DBINFO
-DBPARTITIONNAME
-DBPARTITIONNUM
-DEALLOCATE
-DECLARE
-DEFAULT
-DEFAULTS
-DEFINITION
-DELETE
-DENSE_RANK
-DENSERANK
-DESCRIBE
-DESCRIPTOR
-DETERMINISTIC
-DIAGNOSTICS
-DISABLE
-DISALLOW
-DISCONNECT
-DISTINCT
-DO
-DOUBLE
-DROP
-DSSIZE
-DYNAMIC
-EACH
-EDITPROC
-ELSE
-ELSEIF
-ENABLE
-ENCODING
-ENCRYPTION
-END
-END-EXEC
-ENDING
-ERASE
-ESCAPE
-EVERY
-EXCEPT
-EXCEPTION
-EXCLUDING
-EXCLUSIVE
-EXECUTE
-EXISTS
-EXIT
-EXPLAIN
-EXTERNAL
-EXTRACT
-FENCED
-FETCH
-FIELDPROC
-FILE
-FINAL
-FOR
-FOREIGN
-FREE
-FROM
-FULL
-FUNCTION
-GENERAL
-GENERATED
-GET
-GLOBAL
-GO
-GOTO
-GRANT
-GRAPHIC
-GROUP
-HANDLER
-HASH
-HASHED_VALUE
-HAVING
-HINT
-HOLD
-HOUR
-HOURS
-IDENTITY
-IF
-IMMEDIATE
-IN
-INCLUDING
-INCLUSIVE
-INCREMENT
-INDEX
-INDICATOR
-INHERIT
-INNER
-INOUT
-INSENSITIVE
-INSERT
-INTEGRITY
-INTERSECT
-INTO
-IS
-ISOBID
-ISOLATION
-ITERATE
-JAR
-JAVA
-JOIN
-KEY
-LABEL
-LANGUAGE
-LATERAL
-LC_CTYPE
-LEAVE
-LEFT
-LIKE
-LINKTYPE
-LOCAL
-LOCALDATE
-LOCALE
-LOCALTIME
-LOCALTIMESTAMP
-LOCATOR
-LOCATORS
-LOCK
-LOCKMAX
-LOCKSIZE
-LONG
-LOOP
-MAINTAINED
-MATERIALIZED
-MAXVALUE
-MICROSECOND
-MICROSECONDS
-MINUTE
-MINUTES
-MINVALUE
-MODE
-MODIFIES
-MONTH
-MONTHS
-NEW
-NEW_TABLE
-NEXTVAL
-NO
-NOCACHE
-NOCYCLE
-NODENAME
-NODENUMBER
-NOMAXVALUE
-NOMINVALUE
-NONE
-NOORDER
-NORMALIZED
-NOT
-NULL
-NULLS
-NUMPARTS
-OBID
-OF
-OLD
-OLD_TABLE
-ON
-OPEN
-OPTIMIZATION
-OPTIMIZE
-OPTION
-OR
-ORDER
-OUT
-OUTER
-OVER
-OVERRIDING
-PACKAGE
-PADDED
-PAGESIZE
-PARAMETER
-PART
-PARTITION
-PARTITIONED
-PARTITIONING
-PARTITIONS
-PASSWORD
-PATH
-PIECESIZE
-PLAN
-POSITION
-PRECISION
-PREPARE
-PREVVAL
-PRIMARY
-PRIQTY
-PRIVILEGES
-PROCEDURE
-PROGRAM
-PSID
-QUERY
-QUERYNO
-RANGE
-RANK
-READ
-READS
-RECOVERY
-REFERENCES
-REFERENCING
-REFRESH
-RELEASE
-RENAME
-REPEAT
-RESET
-RESIGNAL
-RESTART
-RESTRICT
-RESULT
-RESULT_SET_LOCATOR
-RETURN
-RETURNS
-REVOKE
-RIGHT
-ROLLBACK
-ROUTINE
-ROW
-ROW_NUMBER
-ROWNUMBER
-ROWS
-ROWSET
-RRN
-RUN
-SAVEPOINT
-SCHEMA
-SCRATCHPAD
-SCROLL
-SEARCH
-SECOND
-SECONDS
-SECQTY
-SECURITY
-SELECT
-SENSITIVE
-SEQUENCE
-SESSION
-SESSION_USER
-SET
-SIGNAL
-SIMPLE
-SOME
-SOURCE
-SPECIFIC
-SQL
-SQLID
-STACKED
-STANDARD
-START
-STARTING
-STATEMENT
-STATIC
-STAY
-STOGROUP
-STORES
-STYLE
-SUBSTRING
-SUMMARY
-SYNONYM
-SYSFUN
-SYSIBM
-SYSPROC
-SYSTEM
-SYSTEM_USER
-TABLE
-TABLESPACE
-THEN
-TIME
-TIMESTAMP
-TO
-TRANSACTION
-TRIGGER
-TRIM
-TYPE
-UNDO
-UNION
-UNIQUE
-UNTIL
-UPDATE
-USAGE
-USER
-USING
-VALIDPROC
-VALUE
-VALUES
-VARIABLE
-VARIANT
-VCAT
-VERSION
-VIEW
-VOLATILE
-VOLUMES
-WHEN
-WHENEVER
-WHERE
-WHILE
-WITH
-WITHOUT
-WLM
-WRITE
-XMLELEMENT
-YEAR
-YEARS
diff --git a/plugins/org.eclipse.net4j.db/reserved_words/derby.txt b/plugins/org.eclipse.net4j.db/reserved_words/derby.txt
deleted file mode 100644
index fe7e130044..0000000000
--- a/plugins/org.eclipse.net4j.db/reserved_words/derby.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-ADD
-ALL
-ALLOCATE
-ALTER
-AND
-ANY
-ARE
-AS
-ASC
-ASSERTION
-AT
-AUTHORIZATION
-AVG
-BEGIN
-BETWEEN
-BIGINT
-BIT
-BOOLEAN
-BOTH
-BY
-CALL
-CASCADE
-CASCADED
-CASE
-CAST
-CHAR
-CHARACTER
-CHECK
-CLOSE
-COALESCE
-COLLATE
-COLLATION
-COLUMN
-COMMIT
-CONNECT
-CONNECTION
-CONSTRAINT
-CONSTRAINTS
-CONTINUE
-CONVERT
-CORRESPONDING
-CREATE
-CURRENT
-CURRENT_DATE
-CURRENT_TIME
-CURRENT_TIMESTAMP
-CURRENT_USER
-CURSOR
-DEALLOCATE
-DEC
-DECIMAL
-DECLARE
-DEFAULT
-DEFERRABLE
-DEFERRED
-DELETE
-DESC
-DESCRIBE
-DIAGNOSTICS
-DISCONNECT
-DISTINCT
-DOUBLE
-DROP
-ELSE
-END
-END-EXEC
-ESCAPE
-EXCEPT
-EXCEPTION
-EXEC
-EXECUTE
-EXISTS
-EXPLAIN
-EXTERNAL
-FALSE
-FETCH
-FIRST
-FLOAT
-FOR
-FOREIGN
-FOUND
-FROM
-FULL
-FUNCTION
-GET
-GETCURRENTCONNECTION
-GLOBAL
-GO
-GOTO
-GRANT
-GROUP
-HAVING
-HOUR
-IDENTITY
-IMMEDIATE
-IN
-INDICATOR
-INITIALLY
-INNER
-INOUT
-INPUT
-INSENSITIVE
-INSERT
-INT
-INTEGER
-INTERSECT
-INTO
-IS
-ISOLATION
-JOIN
-KEY
-LAST
-LEFT
-LIKE
-LOWER
-LTRIM
-MATCH
-MAX
-MIN
-MINUTE
-NATIONAL
-NATURAL
-NCHAR
-NVARCHAR
-NEXT
-NO
-NOT
-NULL
-NULLIF
-NUMERIC
-OF
-ON
-ONLY
-OPEN
-OPTION
-OR
-ORDER
-OUTER
-OUTPUT
-OVERLAPS
-PAD
-PARTIAL
-PREPARE
-PRESERVE
-PRIMARY
-PRIOR
-PRIVILEGES
-PROCEDURE
-PUBLIC
-READ
-REAL
-REFERENCES
-RELATIVE
-RESTRICT
-REVOKE
-RIGHT
-ROLLBACK
-ROWS
-RTRIM
-SCHEMA
-SCROLL
-SECOND
-SELECT
-SESSION_USER
-SET
-SMALLINT
-SOME
-SPACE
-SQL
-SQLCODE
-SQLERROR
-SQLSTATE
-SUBSTR
-SUBSTRING
-SUM
-SYSTEM_USER
-TABLE
-TEMPORARY
-TIMEZONE_HOUR
-TIMEZONE_MINUTE
-TO
-TRANSACTION
-TRANSLATE
-TRANSLATION
-TRIM
-TRUE
-UNION
-UNIQUE
-UNKNOWN
-UPDATE
-UPPER
-USER
-USING
-VALUES
-VARCHAR
-VARYING
-VIEW
-WHENEVER
-WHERE
-WITH
-WORK
-WRITE
-XML
-XMLEXISTS
-XMLPARSE
-XMLQUERY
-XMLSERIALIZE
-YEAR
diff --git a/plugins/org.eclipse.net4j.db/reserved_words/mysql.txt b/plugins/org.eclipse.net4j.db/reserved_words/mysql.txt
deleted file mode 100644
index 94dce4cf69..0000000000
--- a/plugins/org.eclipse.net4j.db/reserved_words/mysql.txt
+++ /dev/null
@@ -1,229 +0,0 @@
-ACTION
-ADD
-ALL
-ALTER
-ANALYZE
-AND
-AS
-ASC
-ASENSITIVE
-BEFORE
-BETWEEN
-BIGINT
-BINARY
-BIT
-BLOB
-BOTH
-BY
-CALL
-CASCADE
-CASE
-CHANGE
-CHAR
-CHARACTER
-CHECK
-COLLATE
-COLUMN
-CONDITION
-CONSTRAINT
-CONTINUE
-CONVERT
-CREATE
-CROSS
-CURRENT_DATE
-CURRENT_TIME
-CURRENT_TIMESTAMP
-CURRENT_USER
-CURSOR
-DATABASE
-DATABASES
-DATE
-DAY_HOUR
-DAY_MICROSECOND
-DAY_MINUTE
-DAY_SECOND
-DEC
-DECIMAL
-DECLARE
-DEFAULT
-DELAYED
-DELETE
-DESC
-DESCRIBE
-DETERMINISTIC
-DISTINCT
-DISTINCTROW
-DIV
-DOUBLE
-DROP
-DUAL
-EACH
-ELSE
-ELSEIF
-ENCLOSED
-ENUM
-ESCAPED
-EXISTS
-EXIT
-EXPLAIN
-FALSE
-FETCH
-FLOAT
-FLOAT4
-FLOAT8
-FOR
-FORCE
-FOREIGN
-FROM
-FULLTEXT
-GRANT
-GROUP
-HAVING
-HIGH_PRIORITY
-HOUR_MICROSECOND
-HOUR_MINUTE
-HOUR_SECOND
-IF
-IGNORE
-IN
-INDEX
-INFILE
-INNER
-INOUT
-INSENSITIVE
-INSERT
-INT
-INT1
-INT2
-INT3
-INT4
-INT8
-INTEGER
-INTERVAL
-INTO
-IS
-ITERATE
-JOIN
-KEY
-KEYS
-KILL
-LEADING
-LEAVE
-LEFT
-LIKE
-LIMIT
-LINES
-LOAD
-LOCALTIME
-LOCALTIMESTAMP
-LOCK
-LONG
-LONGBLOB
-LONGTEXT
-LOOP
-LOW_PRIORITY
-MATCH
-MEDIUMBLOB
-MEDIUMINT
-MEDIUMTEXT
-MIDDLEINT
-MINUTE_MICROSECOND
-MINUTE_SECOND
-MOD
-MODIFIES
-NATURAL
-NO
-NOT
-NO_WRITE_TO_BINLOG
-NULL
-NUMERIC
-ON
-OPTIMIZE
-OPTION
-OPTIONALLY
-OR
-ORDER
-OUT
-OUTER
-OUTFILE
-PRECISION
-PRIMARY
-PROCEDURE
-PURGE
-RAID0
-READ
-READS
-REAL
-REFERENCES
-REGEXP
-RELEASE
-RENAME
-REPEAT
-REPLACE
-REQUIRE
-RESTRICT
-RETURN
-REVOKE
-RIGHT
-RLIKE
-SCHEMA
-SCHEMAS
-SECOND_MICROSECOND
-SELECT
-SENSITIVE
-SEPARATOR
-SET
-SHOW
-SMALLINT
-SONAME
-SPATIAL
-SPECIFIC
-SQL
-SQLEXCEPTION
-SQLSTATE
-SQLWARNING
-SQL_BIG_RESULT
-SQL_CALC_FOUND_ROWS
-SQL_SMALL_RESULT
-SSL
-STARTING
-STRAIGHT_JOIN
-TABLE
-TERMINATED
-TEXT
-THEN
-TIME
-TIMESTAMP
-TINYBLOB
-TINYINT
-TINYTEXT
-TO
-TRAILING
-TRIGGER
-TRUE
-UNDO
-UNION
-UNIQUE
-UNLOCK
-UNSIGNED
-UPDATE
-USAGE
-USE
-USING
-UTC_DATE
-UTC_TIME
-UTC_TIMESTAMP
-VALUES
-VARBINARY
-VARCHAR
-VARCHARACTER
-VARYING
-WHEN
-WHERE
-WHILE
-WITH
-WRITE
-X509
-XOR
-YEAR_MONTH
-ZEROFILL
diff --git a/plugins/org.eclipse.net4j.db/reserved_words/oracle.txt b/plugins/org.eclipse.net4j.db/reserved_words/oracle.txt
deleted file mode 100644
index 00b7d48e79..0000000000
--- a/plugins/org.eclipse.net4j.db/reserved_words/oracle.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-ACCESS
-ADD
-ALL
-ALTER
-AND
-ANY
-AS
-ASC
-AUDIT
-BETWEEN
-BY
-CHAR
-CHECK
-CLUSTER
-COLUMN
-COMMENT
-COMPRESS
-CONNECT
-CREATE
-CURRENT
-DATE
-DECIMAL
-DEFAULT
-DELETE
-DESC
-DISTINCT
-DROP
-ELSE
-EXCLUSIVE
-EXISTS
-FILE
-FLOAT
-FOR
-FROM
-GRANT
-GROUP
-HAVING
-IDENTIFIED
-IMMEDIATE
-IN
-INCREMENT
-INDEX
-INITIAL
-INSERT
-INTEGER
-INTERSECT
-INTO
-IS
-LEVEL
-LIKE
-LOCK
-LONG
-MAXEXTENTS
-MINUS
-MLSLABEL
-MODE
-MODIFY
-NOAUDIT
-NOCOMPRESS
-NOT
-NOWAIT
-NULL
-NUMBER
-OF
-OFFLINE
-ON
-ONLINE
-OPTION
-OR
-ORDER
-PCTFREE
-PRIOR
-PRIVILEGES
-PUBLIC
-RAW
-RENAME
-RESOURCE
-REVOKE
-ROW
-ROWID
-ROWNUM
-ROWS
-SELECT
-SESSION
-SET
-SHARE
-SIZE
-SMALLINT
-START
-SUCCESSFUL
-SYNONYM
-SYSDATE
-TABLE
-THEN
-TO
-TRIGGER
-UID
-UNION
-UNIQUE
-UPDATE
-USER
-VALIDATE
-VALUES
-VARCHAR
-VARCHAR2
-VIEW
-WHENEVER
-WHERE
-WITH
diff --git a/plugins/org.eclipse.net4j.db/schema/dbAdapters.exsd b/plugins/org.eclipse.net4j.db/schema/dbAdapters.exsd
deleted file mode 100644
index 65ef45203c..0000000000
--- a/plugins/org.eclipse.net4j.db/schema/dbAdapters.exsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.net4j.db">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.net4j.db" id="dbAdapters" name="Net4j DB Adapters"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="dbAdapter" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="dbAdapter">
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="version" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.net4j.db.IDBAdapter"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBException.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBException.java
deleted file mode 100644
index 4a16e1dcee..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db;
-
-/**
- * TODO Provide consistent exception hierarchy
- * 
- * @author Eike Stepper
- */
-public class DBException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public DBException()
-  {
-  }
-
-  public DBException(String message)
-  {
-    super(message);
-  }
-
-  public DBException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public DBException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java
deleted file mode 100644
index a2ac905b02..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db;
-
-/**
- * @author Eike Stepper
- */
-public enum DBType
-{
-  BOOLEAN(16), //
-  BIT(-7), //
-  TINYINT(-6), //
-  SMALLINT(5), //
-  INTEGER(4), //
-  BIGINT(-5), //
-  FLOAT(6), //
-  REAL(7), //
-  DOUBLE(8), //
-  NUMERIC(2), //
-  DECIMAL(3), //
-  CHAR(1), //
-  VARCHAR(12), //
-  LONGVARCHAR(-1, "LONG VARCHAR"), //
-  DATE(91), //
-  TIME(92), //
-  TIMESTAMP(93), //
-  BINARY(-2)
-  {
-    @Override
-    public void appendValue(StringBuilder builder, Object value)
-    {
-      throw new UnsupportedOperationException();
-    }
-  }, //
-  VARBINARY(-3)
-  {
-    @Override
-    public void appendValue(StringBuilder builder, Object value)
-    {
-      throw new UnsupportedOperationException();
-    }
-  }, //
-  LONGVARBINARY(-4, "LONG VARBINARY")
-  {
-    @Override
-    public void appendValue(StringBuilder builder, Object value)
-    {
-      throw new UnsupportedOperationException();
-    }
-  }, //
-  BLOB(2004)
-  {
-    @Override
-    public void appendValue(StringBuilder builder, Object value)
-    {
-      throw new UnsupportedOperationException();
-    }
-  }, //
-  CLOB(2005)
-  {
-    @Override
-    public void appendValue(StringBuilder builder, Object value)
-    {
-      throw new UnsupportedOperationException();
-    }
-  }; //
-
-  private int code;
-
-  private String keyword;
-
-  private DBType(int code, String keyword)
-  {
-    this.code = code;
-    this.keyword = keyword;
-  }
-
-  private DBType(int code)
-  {
-    this(code, null);
-  }
-
-  public int getCode()
-  {
-    return code;
-  }
-
-  public String getKeyword()
-  {
-    return keyword == null ? super.toString() : keyword;
-  }
-
-  @Override
-  public String toString()
-  {
-    return getKeyword();
-  }
-
-  public void appendValue(StringBuilder builder, Object value)
-  {
-    if (value == null)
-    {
-      builder.append("NULL");
-    }
-    else
-    {
-      if (value instanceof String || value instanceof Character)
-      {
-        builder.append("'");
-        if (value instanceof String)
-        {
-          String str = (String)value;
-          for (int i = 0; i < str.length(); i++)
-          {
-            char c = str.charAt(i);
-            if (c == '\'')
-            {
-              builder.append("\\'");
-            }
-            else
-            {
-              builder.append(c);
-            }
-          }
-        }
-        else
-        {
-          builder.append(value);
-        }
-
-        builder.append("'");
-      }
-      else
-      {
-        builder.append(value);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
deleted file mode 100644
index 21f99a4229..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db;
-
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBSchema;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.DataSourceConnectionProvider;
-import org.eclipse.net4j.internal.db.bundle.OM;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.ReflectUtil;
-
-import javax.sql.DataSource;
-
-import java.sql.Clob;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public final class DBUtil
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SQL, DBUtil.class);
-
-  private DBUtil()
-  {
-  }
-
-  public static IDBSchema createSchema(String name)
-  {
-    return new DBSchema(name);
-  }
-
-  public static DataSource createDataSource(Map<Object, Object> properties)
-  {
-    return createDataSource(properties, null);
-  }
-
-  public static DataSource createDataSource(Map<Object, Object> properties, String namespace)
-  {
-    return createDataSource(properties, namespace, "class");
-  }
-
-  public static DataSource createDataSource(Map<Object, Object> properties, String namespace, String driverClassKey)
-  {
-    try
-    {
-      return (DataSource)ReflectUtil.instantiate(properties, namespace, driverClassKey, OM.class.getClassLoader());
-    }
-    catch (Exception ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  public static IDBConnectionProvider createConnectionProvider(DataSource dataSource)
-  {
-    return new DataSourceConnectionProvider(dataSource);
-  }
-
-  /**
-   * Can only be used when Eclipse is running. In standalone scenarios create the adapter instance by directly calling
-   * the constructor of the adapter class.
-   */
-  public static IDBAdapter getDBAdapter(String adapterName)
-  {
-    return IDBAdapter.REGISTRY.get(adapterName);
-  }
-
-  public static Exception close(Connection connection)
-  {
-    if (connection != null)
-    {
-      try
-      {
-        connection.close();
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-        return ex;
-      }
-    }
-
-    return null;
-  }
-
-  public static Exception close(Statement statement)
-  {
-    if (statement != null)
-    {
-      try
-      {
-        statement.close();
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-        return ex;
-      }
-    }
-
-    return null;
-  }
-
-  public static Exception close(ResultSet resultSet)
-  {
-    if (resultSet != null)
-    {
-      try
-      {
-        Statement statement = resultSet.getStatement();
-        if (statement != null)
-        {
-          statement.setMaxRows(0);
-        }
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-      }
-
-      try
-      {
-        resultSet.close();
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-        return ex;
-      }
-    }
-
-    return null;
-  }
-
-  public static List<String> getAllTableNames(Connection connection, String dbName)
-  {
-    ResultSet tables = null;
-
-    try
-    {
-      List<String> names = new ArrayList<String>();
-      DatabaseMetaData metaData = connection.getMetaData();
-      tables = metaData.getTables(dbName, null, null, new String[] { "TABLE" });
-      while (tables.next())
-      {
-        String name = tables.getString(3);
-        names.add(name);
-      }
-
-      return names;
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      close(tables);
-    }
-  }
-
-  public static void dropAllTables(Connection connection, String dbName)
-  {
-    Statement statement = null;
-
-    try
-    {
-      statement = connection.createStatement();
-      for (String tableName : DBUtil.getAllTableNames(connection, dbName))
-      {
-        String sql = "DROP TABLE " + tableName;
-        DBUtil.trace(sql);
-        statement.execute(sql);
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      DBUtil.close(statement);
-    }
-  }
-
-  public static int selectMaximumInt(Connection connection, IDBField field) throws DBException
-  {
-    Number number = getMaximumNumber(connection, field);
-    if (number instanceof Integer)
-    {
-      return (Integer)number;
-    }
-    else if (number == null)
-    {
-      return 0;
-    }
-
-    throw new DBException("Not an integer number: " + number);
-  }
-
-  public static long selectMaximumLong(Connection connection, IDBField field) throws DBException
-  {
-    Number number = getMaximumNumber(connection, field);
-    if (number instanceof Long)
-    {
-      return (Long)number;
-    }
-    else if (number == null)
-    {
-      return 0L;
-    }
-
-    throw new DBException("Not a long number: " + number);
-  }
-
-  private static Number getMaximumNumber(Connection connection, IDBField field) throws DBException
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append("SELECT MAX(");
-    builder.append(field);
-    builder.append(") FROM ");
-    builder.append(field.getTable());
-
-    String sql = builder.toString();
-    trace(sql);
-    Statement statement = null;
-    ResultSet resultSet = null;
-
-    try
-    {
-      statement = connection.createStatement();
-
-      try
-      {
-        resultSet = statement.executeQuery(sql);
-        if (!resultSet.next())
-        {
-          return null;
-        }
-
-        return (Number)resultSet.getObject(1);
-      }
-      catch (SQLException ex)
-      {
-        throw new DBException(ex);
-      }
-      finally
-      {
-        close(resultSet);
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      close(statement);
-    }
-  }
-
-  public static int update(Connection connection, String sql)
-  {
-    trace(sql);
-    Statement statement = null;
-
-    try
-    {
-      statement = connection.createStatement();
-      return statement.executeUpdate(sql);
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      close(statement);
-    }
-  }
-
-  public static void insertRow(Connection connection, IDBAdapter dbAdapter, IDBTable table, Object... args)
-      throws DBException
-  {
-    IDBField[] fields = table.getFields();
-    if (fields.length != args.length)
-    {
-      throw new IllegalArgumentException("Wrong number of args for " + table + ": " + Arrays.asList(args) + " --> "
-          + Arrays.asList(table.getFields()));
-    }
-
-    StringBuilder builder = new StringBuilder();
-    builder.append("INSERT INTO ");
-    builder.append(table);
-    builder.append(" VALUES (");
-
-    for (int i = 0; i < fields.length; i++)
-    {
-      if (i > 0)
-      {
-        builder.append(", ");
-      }
-
-      dbAdapter.appendValue(builder, fields[i], args[i]);
-    }
-
-    builder.append(")");
-    String sql = builder.toString();
-
-    int count = update(connection, sql);
-    if (count == 0)
-    {
-      throw new DBException("No row inserted into table " + table);
-    }
-  }
-
-  public static int select(Connection connection, IDBRowHandler rowHandler, String where, IDBField... fields)
-      throws DBException
-  {
-    IDBTable table = fields[0].getTable();
-    for (int i = 1; i < fields.length; i++)
-    {
-      if (fields[i].getTable() != table)
-      {
-        throw new IllegalArgumentException("Multiple tables not allowed: " + Arrays.asList(fields));
-      }
-    }
-
-    StringBuilder builder = new StringBuilder();
-    builder.append("SELECT ");
-    for (int i = 0; i < fields.length; i++)
-    {
-      if (i > 0)
-      {
-        builder.append(", ");
-      }
-
-      builder.append(fields[i]);
-    }
-
-    builder.append(" FROM ");
-    builder.append(table);
-    if (where != null)
-    {
-      builder.append(" WHERE ");
-      builder.append(where);
-    }
-
-    String sql = builder.toString();
-    trace(sql);
-    Statement statement = null;
-    ResultSet resultSet = null;
-
-    try
-    {
-      statement = connection.createStatement();
-
-      try
-      {
-        int rows = 0;
-        boolean proceed = true;
-        Object[] values = new Object[fields.length];
-        resultSet = statement.executeQuery(sql);
-        while (proceed && resultSet.next())
-        {
-          for (int i = 0; i < fields.length; i++)
-          {
-            values[i] = resultSet.getObject(i + 1);
-            if (values[i] instanceof Clob)
-            {
-              Clob clob = (Clob)values[i];
-              long length = clob.length();
-              if (length > Integer.MAX_VALUE)
-              {
-                throw new IllegalStateException("String too long: " + length);
-              }
-
-              values[i] = clob.getSubString(1, (int)length);
-            }
-          }
-
-          proceed = rowHandler.handle(rows++, values);
-        }
-
-        return rows;
-      }
-      catch (SQLException ex)
-      {
-        throw new DBException(ex);
-      }
-      finally
-      {
-        close(resultSet);
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      close(statement);
-    }
-  }
-
-  public static int select(Connection connection, IDBRowHandler rowHandler, IDBField... fields) throws DBException
-  {
-    return select(connection, rowHandler, null, fields);
-  }
-
-  public static Object[] select(Connection connection, String where, IDBField... fields) throws DBException
-  {
-    final Object[][] result = new Object[1][];
-    IDBRowHandler rowHandler = new IDBRowHandler()
-    {
-      public boolean handle(int row, Object... values)
-      {
-        result[0] = values;
-        return false;
-      }
-    };
-
-    select(connection, rowHandler, where, fields);
-    return result[0];
-  }
-
-  public static void trace(String sql)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace(sql);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBAdapter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBAdapter.java
deleted file mode 100644
index 66466f16c0..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBAdapter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db;
-
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.DBAdapterRegistry;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import javax.sql.DataSource;
-
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.Statement;
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBAdapter
-{
-  public static final IRegistry<String, IDBAdapter> REGISTRY = DBAdapterRegistry.INSTANCE;
-
-  public String getName();
-
-  public String getVersion();
-
-  public Driver getJDBCDriver();
-
-  public DataSource createJDBCDataSource();
-
-  public Set<IDBTable> createTables(Iterable<? extends IDBTable> tables, Connection connection) throws DBException;
-
-  public boolean createTable(IDBTable table, Statement statement) throws DBException;
-
-  public Collection<IDBTable> dropTables(Iterable<? extends IDBTable> tables, Connection connection) throws DBException;
-
-  public boolean dropTable(IDBTable table, Statement statement);
-
-  public String[] getReservedWords();
-
-  public boolean isReservedWord(String word);
-
-  public String mangleTableName(String name, int attempt);
-
-  public String mangleFieldName(String name, int attempt);
-
-  public void appendValue(StringBuilder builder, IDBField field, Object value);
-
-  public boolean isTypeIndexable(DBType type);
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider.java
deleted file mode 100644
index 3a44d63720..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db;
-
-import java.sql.Connection;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBConnectionProvider
-{
-  public Connection getConnection() throws DBException;
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBRowHandler.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBRowHandler.java
deleted file mode 100644
index c367e00889..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBRowHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBRowHandler
-{
-  public boolean handle(int row, Object... values);
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java
deleted file mode 100644
index e14fe8c113..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.ddl;
-
-import org.eclipse.net4j.db.DBType;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBField extends IDBSchemaElement
-{
-  public static final int DEFAULT = -1;
-
-  public IDBTable getTable();
-
-  public void setName(String name);
-
-  public DBType getType();
-
-  public void setType(DBType type);
-
-  public int getPrecision();
-
-  public void setPrecision(int precision);
-
-  public int getScale();
-
-  public void setScale(int scale);
-
-  public boolean isNotNull();
-
-  public void setNotNull(boolean on);
-
-  public int getPosition();
-
-  public String getFullName();
-
-  public void appendValue(StringBuilder builder, Object value);
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBIndex.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBIndex.java
deleted file mode 100644
index ffe7a67106..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBIndex.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.ddl;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBIndex extends IDBSchemaElement
-{
-  public IDBTable getTable();
-
-  public Type getType();
-
-  public IDBField getField(int index);
-
-  public int getFieldCount();
-
-  public IDBField[] getFields();
-
-  public int getPosition();
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum Type
-  {
-    PRIMARY_KEY, UNIQUE, NON_UNIQUE
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchema.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchema.java
deleted file mode 100644
index fc82187e34..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchema.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.ddl;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.IDBConnectionProvider;
-
-import javax.sql.DataSource;
-
-import java.io.PrintStream;
-import java.sql.Connection;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBSchema extends IDBSchemaElement
-{
-  public IDBTable addTable(String name) throws DBException;
-
-  public IDBTable getTable(String name);
-
-  public IDBTable[] getTables();
-
-  public Set<IDBTable> create(IDBAdapter dbAdapter, Connection connection) throws DBException;
-
-  public Set<IDBTable> create(IDBAdapter dbAdapter, DataSource dataSource) throws DBException;
-
-  public Set<IDBTable> create(IDBAdapter dbAdapter, IDBConnectionProvider connectionProvider) throws DBException;
-
-  public void drop(IDBAdapter dbAdapter, Connection connection) throws DBException;
-
-  public void drop(IDBAdapter dbAdapter, DataSource dataSource) throws DBException;
-
-  public void drop(IDBAdapter dbAdapter, IDBConnectionProvider connectionProvider) throws DBException;
-
-  public void export(Connection connection, PrintStream out) throws DBException;
-
-  public void export(DataSource dataSource, PrintStream out) throws DBException;
-
-  public void export(IDBConnectionProvider connectionProvider, PrintStream out) throws DBException;
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchemaElement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchemaElement.java
deleted file mode 100644
index d0eb709815..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBSchemaElement.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.ddl;
-
-import java.util.Properties;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBSchemaElement
-{
-  public IDBSchema getSchema();
-
-  public String getName();
-
-  public String getFullName();
-
-  public Properties getProperties();
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBTable.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBTable.java
deleted file mode 100644
index 35ac10baf2..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBTable.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.ddl;
-
-import org.eclipse.net4j.db.DBType;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBTable extends IDBSchemaElement
-{
-  public IDBField addField(String name, DBType type);
-
-  public IDBField addField(String name, DBType type, boolean notNull);
-
-  public IDBField addField(String name, DBType type, int precision);
-
-  public IDBField addField(String name, DBType type, int precision, boolean notNull);
-
-  public IDBField addField(String name, DBType type, int precision, int scale);
-
-  public IDBField addField(String name, DBType type, int precision, int scale, boolean notNull);
-
-  public IDBField getField(String name);
-
-  public IDBField getField(int index);
-
-  public int getFieldCount();
-
-  public IDBField[] getFields();
-
-  public IDBIndex addIndex(IDBIndex.Type type, IDBField... fields);
-
-  public int getIndexCount();
-
-  public IDBIndex[] getIndices();
-
-  public IDBIndex getPrimaryKeyIndex();
-
-  public String sqlInsert();
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBParameter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBParameter.java
deleted file mode 100644
index 9d7f4bb3de..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBParameter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.dml;
-
-import org.eclipse.net4j.db.DBType;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBParameter
-{
-  public IDBStatement getStatement();
-
-  /**
-   * Returns the zero based position of this parameter within the {@link IDBStatement#getParameters() parameters} list
-   * of the containing {@link #getStatement() statement}.
-   */
-  public int getPosition();
-
-  public DBType getType();
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBStatement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBStatement.java
deleted file mode 100644
index 2de389a020..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/IDBStatement.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.db.dml;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBSchemaElement;
-
-/**
- * @author Eike Stepper
- */
-public interface IDBStatement
-{
-  public IDBParameter addParameter(DBType type);
-
-  public IDBParameter addParameter(IDBField field);
-
-  public IDBParameter[] getParameters();
-
-  public void addSQL(String literal);
-
-  public void addSQL(IDBParameter parameter);
-
-  public void addSQL(IDBSchemaElement schemaElement);
-
-  public String getSQL();
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapter.java
deleted file mode 100644
index 89eea152ac..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapter.java
+++ /dev/null
@@ -1,504 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.bundle.OM;
-import org.eclipse.net4j.internal.db.ddl.DBField;
-import org.eclipse.net4j.internal.db.ddl.DBIndex;
-import org.eclipse.net4j.internal.db.ddl.DBTable;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public abstract class DBAdapter implements IDBAdapter
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SQL, DBAdapter.class);
-
-  private static final String[] SQL92_RESERVED_WORDS = { "ABSOLUTE", "ACTION", "ADD", "AFTER", "ALL", "ALLOCATE",
-      "ALTER", "AND", "ANY", "ARE", "ARRAY", "AS", "ASC", "ASENSITIVE", "ASSERTION", "ASYMMETRIC", "AT", "ATOMIC",
-      "AUTHORIZATION", "AVG", "BEFORE", "BEGIN", "BETWEEN", "BIGINT", "BINARY", "BIT", "BIT_LENGTH", "BLOB", "BOOLEAN",
-      "BOTH", "BREADTH", "BY", "CALL", "CALLED", "CASCADE", "CASCADED", "CASE", "CAST", "CATALOG", "CHAR", "CHARACTER",
-      "CHARACTER_LENGTH", "CHAR_LENGTH", "CHECK", "CLOB", "CLOSE", "COALESCE", "COLLATE", "COLLATION", "COLUMN",
-      "COMMIT", "CONDITION", "CONNECT", "CONNECTION", "CONSTRAINT", "CONSTRAINTS", "CONSTRUCTOR", "CONTAINS",
-      "CONTINUE", "CONVERT", "CORRESPONDING", "COUNT", "CREATE", "CROSS", "CUBE", "CURRENT", "CURRENT_DATE",
-      "CURRENT_DEFAULT_TRANSFORM_GROUP", "CURRENT_PATH", "CURRENT_ROLE", "CURRENT_TIME", "CURRENT_TIMESTAMP",
-      "CURRENT_TRANSFORM_GROUP_FOR_TYPE", "CURRENT_USER", "CURSOR", "CYCLE", "DATA", "DATE", "DAY", "DEALLOCATE",
-      "DEC", "DECIMAL", "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "DELETE", "DEPTH", "DEREF", "DESC", "DESCRIBE",
-      "DESCRIPTOR", "DETERMINISTIC", "DIAGNOSTICS", "DISCONNECT", "DISTINCT", "DO", "DOMAIN", "DOUBLE", "DROP",
-      "DYNAMIC", "EACH", "ELEMENT", "ELSE", "ELSEIF", "END", "EQUALS", "ESCAPE", "EXCEPT", "EXCEPTION", "EXEC",
-      "EXECUTE", "EXISTS", "EXIT", "EXTERNAL", "EXTRACT", "FALSE", "FETCH", "FILTER", "FIRST", "FLOAT", "FOR",
-      "FOREIGN", "FOUND", "FREE", "FROM", "FULL", "FUNCTION", "GENERAL", "GET", "GLOBAL", "GO", "GOTO", "GRANT",
-      "GROUP", "GROUPING", "HANDLER", "HAVING", "HOLD", "HOUR", "IDENTITY", "IF", "IMMEDIATE", "IN", "INDICATOR",
-      "INITIALLY", "INNER", "INOUT", "INPUT", "INSENSITIVE", "INSERT", "INT", "INTEGER", "INTERSECT", "INTERVAL",
-      "INTO", "IS", "ISOLATION", "ITERATE", "JOIN", "KEY", "LANGUAGE", "LARGE", "LAST", "LATERAL", "LEADING", "LEAVE",
-      "LEFT", "LEVEL", "LIKE", "LOCAL", "LOCALTIME", "LOCALTIMESTAMP", "LOCATOR", "LOOP", "LOWER", "MAP", "MATCH",
-      "MAX", "MEMBER", "MERGE", "METHOD", "MIN", "MINUTE", "MODIFIES", "MODULE", "MONTH", "MULTISET", "NAMES",
-      "NATIONAL", "NATURAL", "NCHAR", "NCLOB", "NEW", "NEXT", "NO", "NONE", "NOT", "NULL", "NULLIF", "NUMERIC",
-      "OBJECT", "OCTET_LENGTH", "OF", "OLD", "ON", "ONLY", "OPEN", "OPTION", "OR", "ORDER", "ORDINALITY", "OUT",
-      "OUTER", "OUTPUT", "OVER", "OVERLAPS", "PAD", "PARAMETER", "PARTIAL", "PARTITION", "PATH", "POSITION",
-      "PRECISION", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", "PROCEDURE", "PUBLIC", "RANGE", "READ",
-      "READS", "REAL", "RECURSIVE", "REF", "REFERENCES", "REFERENCING", "RELATIVE", "RELEASE", "REPEAT", "RESIGNAL",
-      "RESTRICT", "RESULT", "RETURN", "RETURNS", "REVOKE", "RIGHT", "ROLE", "ROLLBACK", "ROLLUP", "ROUTINE", "ROW",
-      "ROWS", "SAVEPOINT", "SCHEMA", "SCOPE", "SCROLL", "SEARCH", "SECOND", "SECTION", "SELECT", "SENSITIVE",
-      "SESSION", "SESSION_USER", "SET", "SETS", "SIGNAL", "SIMILAR", "SIZE", "SMALLINT", "SOME", "SPACE", "SPECIFIC",
-      "SPECIFICTYPE", "SQL", "SQLCODE", "SQLERROR", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING", "START", "STATE",
-      "STATIC", "SUBMULTISET", "SUBSTRING", "SUM", "SYMMETRIC", "SYSTEM", "SYSTEM_USER", "TABLE", "TABLESAMPLE",
-      "TEMPORARY", "THEN", "TIME", "TIMESTAMP", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TO", "TRAILING", "TRANSACTION",
-      "TRANSLATE", "TRANSLATION", "TREAT", "TRIGGER", "TRIM", "TRUE", "UNDER", "UNDO", "UNION", "UNIQUE", "UNKNOWN",
-      "UNNEST", "UNTIL", "UPDATE", "UPPER", "USAGE", "USER", "USING", "VALUE", "VALUES", "VARCHAR", "VARYING", "VIEW",
-      "WHEN", "WHENEVER", "WHERE", "WHILE", "WINDOW", "WITH", "WITHIN", "WITHOUT", "WORK", "WRITE", "YEAR", "ZONE" };
-
-  private String name;
-
-  private String version;
-
-  private Set<String> reservedWords;
-
-  public DBAdapter(String name, String version)
-  {
-    this.name = name;
-    this.version = version;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public String getVersion()
-  {
-    return version;
-  }
-
-  public Set<IDBTable> createTables(Iterable<? extends IDBTable> tables, Connection connection) throws DBException
-  {
-    Set<IDBTable> createdTables = new HashSet<IDBTable>();
-    Statement statement = null;
-
-    try
-    {
-      statement = connection.createStatement();
-      for (IDBTable table : tables)
-      {
-        if (createTable(table, statement))
-        {
-          createdTables.add(table);
-        }
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-    finally
-    {
-      DBUtil.close(statement);
-    }
-
-    return createdTables;
-  }
-
-  public boolean createTable(IDBTable table, Statement statement) throws DBException
-  {
-    boolean created = true;
-
-    try
-    {
-      doCreateTable((DBTable)table, statement);
-    }
-    catch (SQLException ex)
-    {
-      created = false;
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("-- " + ex.getMessage());
-      }
-    }
-
-    validateTable((DBTable)table, statement);
-    return created;
-  }
-
-  public Collection<IDBTable> dropTables(Iterable<? extends IDBTable> tables, Connection connection) throws DBException
-  {
-    List<IDBTable> droppedTables = new ArrayList<IDBTable>();
-    Statement statement = null;
-
-    try
-    {
-      statement = connection.createStatement();
-      for (IDBTable table : tables)
-      {
-        if (dropTable(table, statement))
-        {
-          droppedTables.add(table);
-        }
-      }
-    }
-    catch (SQLException ex)
-    {
-      OM.LOG.error(ex);
-    }
-    finally
-    {
-      DBUtil.close(statement);
-    }
-
-    return droppedTables;
-  }
-
-  public boolean dropTable(IDBTable table, Statement statement)
-  {
-    try
-    {
-      String sql = getDropTableSQL(table);
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace(sql);
-      }
-
-      statement.execute(sql);
-      return true;
-    }
-    catch (SQLException ex)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace(ex.getMessage());
-      }
-
-      return false;
-    }
-  }
-
-  protected String getDropTableSQL(IDBTable table)
-  {
-    return "DROP TABLE " + table;
-  }
-
-  public String mangleTableName(String name, int attempt)
-  {
-    return mangleName(name, getMaximumTableNameLength(), attempt);
-  }
-
-  public String mangleFieldName(String name, int attempt)
-  {
-    return mangleName(name, getMaximumFieldNameLength(), attempt);
-  }
-
-  public void appendValue(StringBuilder builder, IDBField field, Object value)
-  {
-    field.appendValue(builder, value);
-  }
-
-  public boolean isTypeIndexable(DBType type)
-  {
-    switch (type)
-    {
-    case CLOB:
-    case BLOB:
-    case LONGVARCHAR:
-    case LONGVARBINARY:
-    case VARBINARY:
-    case BINARY:
-      return false;
-
-    default:
-      return true;
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    return getName() + "-" + getVersion();
-  }
-
-  protected void doCreateTable(DBTable table, Statement statement) throws SQLException
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append("CREATE TABLE ");
-    builder.append(table);
-    builder.append(" (");
-    appendFieldDefs(builder, table, createFieldDefinitions(table));
-    String constraints = createConstraints(table);
-    if (constraints != null)
-    {
-      builder.append(", ");
-      builder.append(constraints);
-    }
-
-    builder.append(")");
-    String sql = builder.toString();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace(sql);
-    }
-
-    System.out.println(sql);
-    statement.execute(sql);
-
-    DBIndex[] indices = table.getIndices();
-    for (int i = 0; i < indices.length; i++)
-    {
-      createIndex(indices[i], statement, i);
-    }
-  }
-
-  protected void createIndex(DBIndex index, Statement statement, int num) throws SQLException
-  {
-    DBTable table = index.getTable();
-    StringBuilder builder = new StringBuilder();
-    builder.append("CREATE ");
-    if (index.getType() == IDBIndex.Type.UNIQUE)
-    {
-      builder.append("UNIQUE ");
-    }
-
-    builder.append("INDEX ");
-    builder.append(table);
-    builder.append("_idx");
-    builder.append(num);
-    builder.append(" ON ");
-    builder.append(table);
-    builder.append(" (");
-    IDBField[] fields = index.getFields();
-    for (int i = 0; i < fields.length; i++)
-    {
-      if (i != 0)
-      {
-        builder.append(", ");
-      }
-
-      addIndexField(builder, fields[i]);
-    }
-
-    builder.append(")");
-    String sql = builder.toString();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace(sql);
-    }
-    statement.execute(sql);
-  }
-
-  protected void addIndexField(StringBuilder builder, IDBField field)
-  {
-    builder.append(field);
-  }
-
-  protected String createConstraints(DBTable table)
-  {
-    return null;
-  }
-
-  protected String createFieldDefinition(DBField field)
-  {
-    return getTypeName(field) + (field.isNotNull() ? " NOT NULL" : "");
-  }
-
-  protected String getTypeName(DBField field)
-  {
-    DBType type = field.getType();
-    switch (type)
-    {
-    case BOOLEAN:
-    case BIT:
-    case TINYINT:
-    case SMALLINT:
-    case INTEGER:
-    case BIGINT:
-    case FLOAT:
-    case REAL:
-    case DOUBLE:
-    case DATE:
-    case TIME:
-    case TIMESTAMP:
-    case LONGVARCHAR:
-    case LONGVARBINARY:
-    case BLOB:
-    case CLOB:
-      return type.toString();
-
-    case CHAR:
-    case VARCHAR:
-    case BINARY:
-    case VARBINARY:
-      return type.toString() + field.formatPrecision();
-
-    case NUMERIC:
-    case DECIMAL:
-      return type.toString() + field.formatPrecisionAndScale();
-    }
-
-    throw new IllegalArgumentException("Unknown type: " + type);
-  }
-
-  protected int getMaximumTableNameLength()
-  {
-    return 128;
-  }
-
-  protected int getMaximumFieldNameLength()
-  {
-    return 128;
-  }
-
-  protected String mangleName(String name, int max, int attempt)
-  {
-    if (isReservedWord(name))
-    {
-      String suffix = "_" + String.valueOf(attempt);
-      if (name.length() + suffix.length() > max)
-      {
-        name = name.substring(0, max - suffix.length()) + suffix;
-      }
-      else
-      {
-        name += suffix;
-      }
-    }
-    else if (name.length() > max)
-    {
-      name = name.substring(0, max);
-    }
-
-    return name;
-  }
-
-  public String[] getSQL92ReservedWords()
-  {
-    return SQL92_RESERVED_WORDS;
-  }
-
-  public boolean isReservedWord(String word)
-  {
-    if (reservedWords == null)
-    {
-      reservedWords = new HashSet<String>();
-      for (String reservedWord : getReservedWords())
-      {
-        reservedWords.add(reservedWord.toUpperCase());
-      }
-    }
-
-    word = word.toUpperCase();
-    return reservedWords.contains(word);
-  }
-
-  protected void validateTable(DBTable table, Statement statement) throws DBException
-  {
-    try
-    {
-      StringBuilder builder = new StringBuilder();
-      builder.append("SELECT ");
-      appendFieldNames(builder, table);
-      builder.append(" FROM ");
-      builder.append(table);
-      String sql = builder.toString();
-
-      ResultSet resultSet = statement.executeQuery(sql);
-      ResultSetMetaData metaData = resultSet.getMetaData();
-      int columnCount = metaData.getColumnCount();
-      if (columnCount != table.getFieldCount())
-      {
-        throw new DBException("DBTable " + table + " has " + columnCount + " columns instead of "
-            + table.getFieldCount());
-      }
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex.getMessage());
-    }
-  }
-
-  private String[] createFieldDefinitions(DBTable table)
-  {
-    DBField[] fields = table.getFields();
-    int fieldCount = fields.length;
-
-    String[] result = new String[fieldCount];
-    for (int i = 0; i < fieldCount; i++)
-    {
-      DBField field = fields[i];
-      result[i] = createFieldDefinition(field);
-    }
-
-    return result;
-  }
-
-  public void appendFieldNames(Appendable appendable, IDBTable table)
-  {
-    try
-    {
-      IDBField[] fields = table.getFields();
-      for (int i = 0; i < fields.length; i++)
-      {
-        IDBField field = fields[i];
-        if (i != 0)
-        {
-          appendable.append(", ");
-        }
-
-        String fieldName = field.getName();
-        appendable.append(fieldName);
-      }
-    }
-    catch (IOException canNotHappen)
-    {
-    }
-  }
-
-  private void appendFieldDefs(Appendable appendable, IDBTable table, String[] defs)
-  {
-    try
-    {
-      IDBField[] fields = table.getFields();
-      for (int i = 0; i < fields.length; i++)
-      {
-        IDBField field = fields[i];
-        if (i != 0)
-        {
-          appendable.append(", ");
-        }
-
-        // String fieldName = mangleFieldName(field.getName(), 0);
-        String fieldName = field.getName();
-        appendable.append(fieldName);
-        appendable.append(" ");
-        appendable.append(defs[i]);
-      }
-    }
-    catch (IOException canNotHappen)
-    {
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java
deleted file mode 100644
index ab75e8fb7f..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db;
-
-import org.eclipse.net4j.db.IDBAdapter;
-
-/**
- * @author Eike Stepper
- */
-public abstract class DBAdapterDescriptor
-{
-  private String name;
-
-  public DBAdapterDescriptor(String name)
-  {
-    this.name = name;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public abstract IDBAdapter createDBAdapter();
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java
deleted file mode 100644
index a160be364b..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db;
-
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.internal.util.registry.HashMapRegistry;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class DBAdapterRegistry extends HashMapRegistry<String, IDBAdapter> implements IRegistry<String, IDBAdapter>
-{
-  public static final DBAdapterRegistry INSTANCE = new DBAdapterRegistry();
-
-  private Map<String, DBAdapterDescriptor> descriptors = new HashMap<String, DBAdapterDescriptor>();
-
-  public DBAdapterRegistry()
-  {
-  }
-
-  public DBAdapterRegistry(int initialCapacity)
-  {
-    super(initialCapacity);
-  }
-
-  public DBAdapterRegistry(int initialCapacity, float loadFactor)
-  {
-    super(initialCapacity, loadFactor);
-  }
-
-  public DBAdapterRegistry(Map<? extends String, ? extends IDBAdapter> m)
-  {
-    super(m);
-  }
-
-  @Override
-  public IDBAdapter get(Object key)
-  {
-    IDBAdapter adapter = super.get(key);
-    if (adapter == null)
-    {
-      if (key instanceof String)
-      {
-        DBAdapterDescriptor descriptor = descriptors.get(key);
-        if (descriptor != null)
-        {
-          adapter = descriptor.createDBAdapter();
-          if (adapter != null)
-          {
-            put((String)key, adapter);
-          }
-        }
-      }
-    }
-
-    return adapter;
-  }
-
-  public DBAdapterDescriptor addDescriptor(DBAdapterDescriptor descriptor)
-  {
-    return descriptors.put(descriptor.getName(), descriptor);
-  }
-
-  public DBAdapterDescriptor removeDescriptor(String name)
-  {
-    return descriptors.remove(name);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java
deleted file mode 100644
index f80e7383bc..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.IDBConnectionProvider;
-
-import javax.sql.DataSource;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * @author Eike Stepper
- */
-public class DataSourceConnectionProvider implements IDBConnectionProvider
-{
-  private DataSource dataSource;
-
-  public DataSourceConnectionProvider(DataSource dataSource)
-  {
-    this.dataSource = dataSource;
-  }
-
-  public DataSource getDataSource()
-  {
-    return dataSource;
-  }
-
-  public Connection getConnection()
-  {
-    try
-    {
-      return dataSource.getConnection();
-    }
-    catch (SQLException ex)
-    {
-      throw new DBException(ex);
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    return dataSource.toString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
deleted file mode 100644
index 946f08cc02..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db.bundle;
-
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.internal.db.DBAdapterDescriptor;
-import org.eclipse.net4j.internal.db.DBAdapterRegistry;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-import org.osgi.framework.BundleContext;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.db"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_SQL = DEBUG.tracer("sql"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  public static final String EXT_POINT = "dbAdapters";
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-
-    @Override
-    public void start(BundleContext context) throws Exception
-    {
-      super.start(context);
-      initDBAdapterRegistry();
-    }
-
-    private void initDBAdapterRegistry()
-    {
-      IExtensionRegistry registry = Platform.getExtensionRegistry();
-      IConfigurationElement[] elements = registry.getConfigurationElementsFor(BUNDLE_ID, EXT_POINT);
-      for (final IConfigurationElement element : elements)
-      {
-        if ("dbAdapter".equals(element.getName()))
-        {
-          DBAdapterDescriptor descriptor = new DBAdapterDescriptor(element.getAttribute("name"))
-          {
-            @Override
-            public IDBAdapter createDBAdapter()
-            {
-              try
-              {
-                return (IDBAdapter)element.createExecutableExtension("class");
-              }
-              catch (CoreException ex)
-              {
-                OM.LOG.error(ex);
-                return null;
-              }
-            }
-          };
-
-          DBAdapterRegistry.INSTANCE.addDescriptor(descriptor);
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java
deleted file mode 100644
index 5e59091b0f..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db.ddl;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBSchema;
-
-/**
- * @author Eike Stepper
- */
-public class DBField extends DBSchemaElement implements IDBField
-{
-  public static final int DEFAULT_DECIMAL_PRECISION = 5;
-
-  public static final int DEFAULT_SCALE = 0;
-
-  public static final int DEFAULT_CHAR_LENGTH = 1;
-
-  public static final int DEFAULT_VARCHAR_LENGTH = 255;
-
-  private DBTable table;
-
-  private String name;
-
-  private DBType type;
-
-  private int precision;
-
-  private int scale;
-
-  private boolean notNull;
-
-  private int position;
-
-  public DBField(DBTable table, String name, DBType type, int precision, int scale, boolean notNull, int position)
-  {
-    this.table = table;
-    this.name = name;
-    this.type = type;
-    this.precision = precision;
-    this.scale = scale;
-    this.notNull = notNull;
-    this.position = position;
-  }
-
-  public IDBSchema getSchema()
-  {
-    return table.getSchema();
-  }
-
-  public DBTable getTable()
-  {
-    return table;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  public DBType getType()
-  {
-    return type;
-  }
-
-  public void setType(DBType type)
-  {
-    this.type = type;
-  }
-
-  public int getPrecision()
-  {
-    if (precision == DEFAULT)
-    {
-      switch (type)
-      {
-      case CHAR:
-        return DEFAULT_CHAR_LENGTH;
-
-      case VARCHAR:
-      case VARBINARY:
-        return DEFAULT_VARCHAR_LENGTH;
-
-      case DECIMAL:
-      case NUMERIC:
-        return DEFAULT_DECIMAL_PRECISION;
-      }
-    }
-
-    return precision;
-  }
-
-  public void setPrecision(int precision)
-  {
-    this.precision = precision;
-  }
-
-  public int getScale()
-  {
-    if (scale == DEFAULT)
-    {
-      return DEFAULT_SCALE;
-    }
-
-    return scale;
-  }
-
-  public void setScale(int scale)
-  {
-    this.scale = scale;
-  }
-
-  public boolean isNotNull()
-  {
-    return notNull;
-  }
-
-  public void setNotNull(boolean on)
-  {
-    notNull = on;
-  }
-
-  public int getPosition()
-  {
-    return position;
-  }
-
-  public String getFullName()
-  {
-    return table.getName() + "." + name;
-  }
-
-  public String formatPrecision()
-  {
-    return "(" + getPrecision() + ")";
-  }
-
-  public String formatPrecisionAndScale()
-  {
-    if (scale == DEFAULT)
-    {
-      return "(" + getPrecision() + ")";
-    }
-
-    return "(" + getPrecision() + ", " + scale + ")";
-  }
-
-  public void appendValue(StringBuilder builder, Object value)
-  {
-    type.appendValue(builder, value);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
deleted file mode 100644
index 62c8912b9d..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db.ddl;
-
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBSchema;
-
-/**
- * @author Eike Stepper
- */
-public class DBIndex extends DBSchemaElement implements IDBIndex
-{
-  private DBTable table;
-
-  private Type type;
-
-  private IDBField[] fields;
-
-  public int position;
-
-  public DBIndex(DBTable table, Type type, IDBField[] fields, int position)
-  {
-    this.table = table;
-    this.type = type;
-    this.fields = fields;
-    this.position = position;
-  }
-
-  public IDBSchema getSchema()
-  {
-    return table.getSchema();
-  }
-
-  public DBTable getTable()
-  {
-    return table;
-  }
-
-  public Type getType()
-  {
-    return type;
-  }
-
-  public IDBField getField(int index)
-  {
-    return fields[index];
-  }
-
-  public int getFieldCount()
-  {
-    return fields.length;
-  }
-
-  public IDBField[] getFields()
-  {
-    return fields;
-  }
-
-  public int getPosition()
-  {
-    return position;
-  }
-
-  public String getName()
-  {
-    return "idx_" + table.getName() + "_" + position;
-  }
-
-  public String getFullName()
-  {
-    return getName();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java
deleted file mode 100644
index 93a0a70898..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db.ddl;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.IDBConnectionProvider;
-import org.eclipse.net4j.db.IDBRowHandler;
-import org.eclipse.net4j.db.ddl.IDBSchema;
-import org.eclipse.net4j.db.ddl.IDBTable;
-
-import javax.sql.DataSource;
-
-import java.io.PrintStream;
-import java.sql.Connection;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class DBSchema extends DBSchemaElement implements IDBSchema
-{
-  private String name;
-
-  private Map<String, DBTable> tables = new HashMap<String, DBTable>();
-
-  private boolean locked;
-
-  public DBSchema(String name)
-  {
-    this.name = name;
-  }
-
-  public String getFullName()
-  {
-    return name;
-  }
-
-  public IDBSchema getSchema()
-  {
-    return this;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public DBTable addTable(String name) throws DBException
-  {
-    assertUnlocked();
-    if (tables.containsKey(name))
-    {
-      throw new DBException("DBTable exists: " + name);
-    }
-
-    DBTable table = new DBTable(this, name);
-    tables.put(name, table);
-    return table;
-  }
-
-  public DBTable getTable(String name)
-  {
-    return tables.get(name);
-  }
-
-  public DBTable[] getTables()
-  {
-    return tables.values().toArray(new DBTable[tables.size()]);
-  }
-
-  public boolean isLocked()
-  {
-    return locked;
-  }
-
-  public boolean lock()
-  {
-    return locked = true;
-  }
-
-  public Set<IDBTable> create(IDBAdapter dbAdapter, Connection connection) throws DBException
-  {
-    return dbAdapter.createTables(tables.values(), connection);
-  }
-
-  public Set<IDBTable> create(IDBAdapter dbAdapter, DataSource dataSource) throws DBException
-  {
-    return create(dbAdapter, DBUtil.createConnectionProvider(dataSource));
-  }
-
-  public Set<IDBTable> create(IDBAdapter dbAdapter, IDBConnectionProvider connectionProvider) throws DBException
-  {
-    Connection connection = null;
-
-    try
-    {
-      connection = connectionProvider.getConnection();
-      return create(dbAdapter, connection);
-    }
-    finally
-    {
-      DBUtil.close(connection);
-    }
-  }
-
-  public void drop(IDBAdapter dbAdapter, Connection connection) throws DBException
-  {
-    dbAdapter.dropTables(tables.values(), connection);
-  }
-
-  public void drop(IDBAdapter dbAdapter, DataSource dataSource) throws DBException
-  {
-    drop(dbAdapter, DBUtil.createConnectionProvider(dataSource));
-  }
-
-  public void drop(IDBAdapter dbAdapter, IDBConnectionProvider connectionProvider) throws DBException
-  {
-    Connection connection = null;
-
-    try
-    {
-      connection = connectionProvider.getConnection();
-      drop(dbAdapter, connection);
-    }
-    finally
-    {
-      DBUtil.close(connection);
-    }
-  }
-
-  public void export(Connection connection, PrintStream out) throws DBException
-  {
-    for (DBTable table : getTables())
-    {
-      export(table, connection, out);
-    }
-  }
-
-  private void export(final DBTable table, Connection connection, final PrintStream out)
-  {
-    if (DBUtil.select(connection, new IDBRowHandler()
-    {
-      public boolean handle(int row, Object... values)
-      {
-        if (row == 0)
-        {
-          String tableName = table.getName();
-          out.println(tableName);
-          for (int i = 0; i < tableName.length(); i++)
-          {
-            out.print("=");
-          }
-
-          out.println();
-        }
-
-        out.println(Arrays.asList(values));
-        return true;
-      }
-    }, table.getFields()) > 0)
-    {
-      out.println();
-    }
-  }
-
-  public void export(DataSource dataSource, PrintStream out) throws DBException
-  {
-    export(DBUtil.createConnectionProvider(dataSource), out);
-  }
-
-  public void export(IDBConnectionProvider connectionProvider, PrintStream out) throws DBException
-  {
-    Connection connection = null;
-
-    try
-    {
-      connection = connectionProvider.getConnection();
-      export(connection, out);
-    }
-    finally
-    {
-      DBUtil.close(connection);
-    }
-  }
-
-  void assertUnlocked() throws DBException
-  {
-    if (locked)
-    {
-      throw new DBException("DBSchema locked: " + name);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchemaElement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchemaElement.java
deleted file mode 100644
index 69d130e61f..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchemaElement.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db.ddl;
-
-import org.eclipse.net4j.db.ddl.IDBSchemaElement;
-
-import java.util.Properties;
-
-/**
- * @author Eike Stepper
- */
-public abstract class DBSchemaElement implements IDBSchemaElement
-{
-  private Properties properties;
-
-  public DBSchemaElement()
-  {
-  }
-
-  public Properties getProperties()
-  {
-    if (properties == null)
-    {
-      properties = new Properties();
-    }
-
-    return properties;
-  }
-
-  @Override
-  public String toString()
-  {
-    return getName();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java
deleted file mode 100644
index 21662f9154..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db.ddl;
-
-import org.eclipse.net4j.db.DBException;
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.db.ddl.IDBIndex.Type;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class DBTable extends DBSchemaElement implements IDBTable
-{
-  private DBSchema schema;
-
-  private String name;
-
-  private List<DBField> fields = new ArrayList<DBField>();
-
-  private List<DBIndex> indices = new ArrayList<DBIndex>();
-
-  public DBTable(DBSchema schema, String name)
-  {
-    this.schema = schema;
-    this.name = name;
-  }
-
-  public DBSchema getSchema()
-  {
-    return schema;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public DBField addField(String name, DBType type)
-  {
-    return addField(name, type, IDBField.DEFAULT, IDBField.DEFAULT, false);
-  }
-
-  public DBField addField(String name, DBType type, boolean notNull)
-  {
-    return addField(name, type, IDBField.DEFAULT, IDBField.DEFAULT, notNull);
-  }
-
-  public DBField addField(String name, DBType type, int precision)
-  {
-    return addField(name, type, precision, IDBField.DEFAULT, false);
-  }
-
-  public DBField addField(String name, DBType type, int precision, boolean notNull)
-  {
-    return addField(name, type, precision, IDBField.DEFAULT, notNull);
-  }
-
-  public DBField addField(String name, DBType type, int precision, int scale)
-  {
-    return addField(name, type, precision, scale, false);
-  }
-
-  public DBField addField(String name, DBType type, int precision, int scale, boolean notNull)
-  {
-    schema.assertUnlocked();
-    if (getField(name) != null)
-    {
-      throw new DBException("DBField exists: " + name);
-    }
-
-    DBField field = new DBField(this, name, type, precision, scale, notNull, fields.size());
-    fields.add(field);
-    return field;
-  }
-
-  public DBField getField(String name)
-  {
-    for (DBField field : fields)
-    {
-      if (name.equals(field.getName()))
-      {
-        return field;
-      }
-    }
-
-    return null;
-  }
-
-  public DBField getField(int index)
-  {
-    return fields.get(index);
-  }
-
-  public int getFieldCount()
-  {
-    return fields.size();
-  }
-
-  public DBField[] getFields()
-  {
-    return fields.toArray(new DBField[fields.size()]);
-  }
-
-  public DBIndex addIndex(Type type, IDBField... fields)
-  {
-    schema.assertUnlocked();
-    DBIndex index = new DBIndex(this, type, fields, indices.size());
-    indices.add(index);
-    return index;
-  }
-
-  public int getIndexCount()
-  {
-    return indices.size();
-  }
-
-  public DBIndex[] getIndices()
-  {
-    return indices.toArray(new DBIndex[indices.size()]);
-  }
-
-  public IDBIndex getPrimaryKeyIndex()
-  {
-    for (IDBIndex index : indices)
-    {
-      if (index.getType() == IDBIndex.Type.PRIMARY_KEY)
-      {
-        return index;
-      }
-    }
-
-    return null;
-  }
-
-  public String getFullName()
-  {
-    return name;
-  }
-
-  public String sqlInsert()
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append("INSERT INTO ");
-    builder.append(getName());
-    builder.append(" VALUES (");
-
-    for (int i = 0; i < fields.size(); i++)
-    {
-      if (i > 0)
-      {
-        builder.append(", ");
-      }
-
-      builder.append("?");
-    }
-
-    builder.append(")");
-    return builder.toString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBParameter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBParameter.java
deleted file mode 100644
index f367597308..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBParameter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db.dml;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.dml.IDBParameter;
-import org.eclipse.net4j.db.dml.IDBStatement;
-
-/**
- * @author Eike Stepper
- */
-public class DBParameter implements IDBParameter
-{
-  private IDBStatement statement;
-
-  private int position;
-
-  private DBType type;
-
-  public DBParameter(IDBStatement statement, int position, DBType type)
-  {
-    this.statement = statement;
-    this.position = position;
-    this.type = type;
-  }
-
-  public IDBStatement getStatement()
-  {
-    return statement;
-  }
-
-  public int getPosition()
-  {
-    return position;
-  }
-
-  public DBType getType()
-  {
-    return type;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBStatement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBStatement.java
deleted file mode 100644
index b1c092425b..0000000000
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBStatement.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.db.dml;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBSchemaElement;
-import org.eclipse.net4j.db.dml.IDBParameter;
-import org.eclipse.net4j.db.dml.IDBStatement;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class DBStatement implements IDBStatement
-{
-  private static final DBParameter[] NO_PARAMETERS = {};
-
-  private List<DBParameter> parameters;
-
-  private List<Object> sequence = new ArrayList<Object>();
-
-  public IDBParameter addParameter(DBType type)
-  {
-    int position = 0;
-    if (parameters == null)
-    {
-      parameters = new ArrayList<DBParameter>();
-    }
-    else
-    {
-      position = parameters.size();
-    }
-
-    DBParameter parameter = new DBParameter(this, position, type);
-    parameters.add(parameter);
-    return parameter;
-  }
-
-  public IDBParameter addParameter(IDBField field)
-  {
-    return addParameter(field.getType());
-  }
-
-  public DBParameter[] getParameters()
-  {
-    if (parameters == null)
-    {
-      return NO_PARAMETERS;
-    }
-
-    return parameters.toArray(new DBParameter[parameters.size()]);
-  }
-
-  public void addSQL(String literal)
-  {
-    int tailPos = sequence.size() - 1;
-    Object tail = sequence.get(tailPos);
-    if (tail instanceof String)
-    {
-      sequence.set(tailPos, ((String)tail) + literal);
-    }
-    else
-    {
-      sequence.add(literal);
-    }
-  }
-
-  public void addSQL(IDBParameter parameter)
-  {
-    sequence.add(parameter);
-  }
-
-  public void addSQL(IDBSchemaElement schemaElement)
-  {
-    addSQL(schemaElement.getName());
-  }
-
-  public String getSQL()
-  {
-    StringBuilder builder = new StringBuilder();
-    for (Object element : sequence)
-    {
-      if (element instanceof IDBParameter)
-      {
-        builder.append("?");
-      }
-      else
-      {
-        builder.append(element);
-      }
-    }
-
-    return builder.toString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.debug/.classpath b/plugins/org.eclipse.net4j.debug/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.debug/.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.debug/.cvsignore b/plugins/org.eclipse.net4j.debug/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.net4j.debug/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.net4j.debug/.options b/plugins/org.eclipse.net4j.debug/.options
deleted file mode 100644
index e3e8d5886b..0000000000
--- a/plugins/org.eclipse.net4j.debug/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.debug/debug = true
diff --git a/plugins/org.eclipse.net4j.debug/.project b/plugins/org.eclipse.net4j.debug/.project
deleted file mode 100644
index 6a5e8b15db..0000000000
--- a/plugins/org.eclipse.net4j.debug/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.debug</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ae26d23633..0000000000
--- a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:43:40 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index a204286ec9..0000000000
--- a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:43:40 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.debug/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
deleted file mode 100644
index a6210b8b9e..0000000000
--- a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.debug; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.internal.debug.bundle.OM$Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.util.ui;visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.debug/about.html b/plugins/org.eclipse.net4j.debug/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.debug/about.html
+++ /dev/null
@@ -1,28 +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.debug/build.properties b/plugins/org.eclipse.net4j.debug/build.properties
deleted file mode 100644
index bc97e0f8d8..0000000000
--- a/plugins/org.eclipse.net4j.debug/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               plugin.properties,\
-               license.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               about.html,\
-               .options
diff --git a/plugins/org.eclipse.net4j.debug/copyright.txt b/plugins/org.eclipse.net4j.debug/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.debug/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.debug/epl-v10.html b/plugins/org.eclipse.net4j.debug/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.debug/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.debug/icons/javabean.gif b/plugins/org.eclipse.net4j.debug/icons/javabean.gif
deleted file mode 100644
index d9bfbd0541..0000000000
--- a/plugins/org.eclipse.net4j.debug/icons/javabean.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.debug/icons/text.gif b/plugins/org.eclipse.net4j.debug/icons/text.gif
deleted file mode 100644
index c77fa1308d..0000000000
--- a/plugins/org.eclipse.net4j.debug/icons/text.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.debug/license.html b/plugins/org.eclipse.net4j.debug/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.debug/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.debug/plugin.properties b/plugins/org.eclipse.net4j.debug/plugin.properties
deleted file mode 100644
index f5419303ea..0000000000
--- a/plugins/org.eclipse.net4j.debug/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Debug (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.debug/plugin.xml b/plugins/org.eclipse.net4j.debug/plugin.xml
deleted file mode 100644
index 25fa8983f9..0000000000
--- a/plugins/org.eclipse.net4j.debug/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            id="org.eclipse.debug.ui"
-            name="Debug">
-      </category>
-      <view
-            name="Remote Traces"
-            icon="icons/text.gif"
-            category="org.eclipse.debug.ui"
-            class="org.eclipse.net4j.internal.debug.views.RemoteTraceView"
-            id="org.eclipse.net4j.debug.RemoteTraceView">
-      </view>
-   </extension>
-   
-</plugin>
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
deleted file mode 100644
index 80e12657df..0000000000
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.debug;
-
-import org.eclipse.net4j.internal.debug.views.RemoteTraceView;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.internal.util.om.trace.RemoteTraceServer;
-import org.eclipse.net4j.internal.util.om.trace.RemoteTraceServer.Event;
-import org.eclipse.net4j.internal.util.om.trace.RemoteTraceServer.Listener;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class RemoteTraceManager extends Lifecycle implements Listener
-{
-  // @Singleton
-  public static final RemoteTraceManager INSTANCE = new RemoteTraceManager();
-
-  private RemoteTraceServer server;
-
-  private List<Event> events = new ArrayList<Event>();
-
-  public RemoteTraceManager()
-  {
-  }
-
-  public Event[] getEvents()
-  {
-    return events.toArray(new Event[events.size()]);
-  }
-
-  public void clearEvents()
-  {
-    events.clear();
-  }
-
-  public void notifyRemoteTrace(Event event)
-  {
-    events.add(event);
-    RemoteTraceView.notifyNewTrace();
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    server = new RemoteTraceServer();
-    server.addListener(this);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    server.removeListener(this);
-    server.close();
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
deleted file mode 100644
index 8e528476f1..0000000000
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.debug.bundle;
-
-import org.eclipse.net4j.internal.debug.RemoteTraceManager;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-import org.eclipse.net4j.util.ui.UIActivator;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.debug"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  static void start() throws Exception
-  {
-    if (isRemoteTracing())
-    {
-      RemoteTraceManager.INSTANCE.activate();
-    }
-  }
-
-  static void stop() throws Exception
-  {
-    if (isRemoteTracing())
-    {
-      RemoteTraceManager.INSTANCE.deactivate();
-    }
-  }
-
-  private static boolean isRemoteTracing()
-  {
-    // TODO Make configurable
-    return true;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends UIActivator
-  {
-    public static Activator INSTANCE;
-
-    public Activator()
-    {
-      super(BUNDLE);
-      INSTANCE = this;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
deleted file mode 100644
index 58b32fc03d..0000000000
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.debug.views;
-
-import org.eclipse.net4j.internal.debug.RemoteTraceManager;
-import org.eclipse.net4j.internal.util.om.trace.RemoteTraceServer.Event;
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.ReflectUtil;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * @author Eike Stepper
- */
-public class RemoteTraceView extends ViewPart
-{
-  private static RemoteTraceView instance;
-
-  private TableViewer viewer;
-
-  private Action clearAction;
-
-  private Action doubleClickAction;
-
-  public RemoteTraceView()
-  {
-  }
-
-  @Override
-  public void dispose()
-  {
-    instance = null;
-    super.dispose();
-  }
-
-  @Override
-  public void createPartControl(Composite parent)
-  {
-    viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-    viewer.getTable().setHeaderVisible(true);
-    createColmuns(viewer);
-    viewer.setContentProvider(new ViewContentProvider());
-    viewer.setLabelProvider(new ViewLabelProvider());
-    // viewer.setSorter(new NameSorter());
-    viewer.setInput(getViewSite());
-
-    // final ToolTipHandler tooltip = new ToolTipHandler(getSite().getShell());
-    // tooltip.activateHoverHelp(viewer.getTable());
-
-    makeActions();
-    hookContextMenu();
-    hookDoubleClickAction();
-    contributeToActionBars();
-    instance = this;
-  }
-
-  protected void createColmuns(TableViewer viewer)
-  {
-    final String[] columnNames = { "ID", "Time Stamp", "Agent ID", "Bundle ID", "Tracer Name", "Context", "Message",
-        "Throwable" };
-    final int[] columnWidths = { 60, 170, 80, 160, 120, 120, 400, 200 };
-    TableColumn[] columns = new TableColumn[columnNames.length];
-    for (int i = 0; i < columns.length; i++)
-    {
-      TableColumn column = new TableColumn(viewer.getTable(), SWT.LEFT, i);
-      column.setText(columnNames[i]);
-      column.setWidth(columnWidths[i]);
-      column.setMoveable(true);
-      column.setResizable(true);
-    }
-  }
-
-  public static void notifyNewTrace()
-  {
-    if (instance != null)
-    {
-      instance.refreshViewer();
-    }
-  }
-
-  public void refreshViewer()
-  {
-    if (isViewerAlive())
-    {
-      getSite().getShell().getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          if (isViewerAlive())
-          {
-            viewer.refresh();
-          }
-        }
-      });
-    }
-  }
-
-  private boolean isViewerAlive()
-  {
-    return viewer != null && viewer.getControl() != null && !viewer.getControl().isDisposed();
-  }
-
-  private void hookContextMenu()
-  {
-    MenuManager menuMgr = new MenuManager("#PopupMenu");
-    menuMgr.setRemoveAllWhenShown(true);
-    menuMgr.addMenuListener(new IMenuListener()
-    {
-      public void menuAboutToShow(IMenuManager manager)
-      {
-        RemoteTraceView.this.fillContextMenu(manager);
-      }
-    });
-    Menu menu = menuMgr.createContextMenu(viewer.getControl());
-    viewer.getControl().setMenu(menu);
-    getSite().registerContextMenu(menuMgr, viewer);
-  }
-
-  private void contributeToActionBars()
-  {
-    IActionBars bars = getViewSite().getActionBars();
-    fillLocalPullDown(bars.getMenuManager());
-    fillLocalToolBar(bars.getToolBarManager());
-  }
-
-  private void fillLocalPullDown(IMenuManager manager)
-  {
-    manager.add(clearAction);
-  }
-
-  private void fillContextMenu(IMenuManager manager)
-  {
-    manager.add(clearAction);
-    // Other plug-ins can contribute there actions here
-    manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-  }
-
-  private void fillLocalToolBar(IToolBarManager manager)
-  {
-    manager.add(clearAction);
-  }
-
-  private void makeActions()
-  {
-    clearAction = new Action()
-    {
-      @Override
-      public void run()
-      {
-        RemoteTraceManager.INSTANCE.clearEvents();
-        refreshViewer();
-      }
-    };
-    clearAction.setText("Clear");
-    clearAction.setToolTipText("Clear");
-    clearAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(
-        ISharedImages.IMG_TOOL_DELETE));
-
-    doubleClickAction = new Action()
-    {
-      @Override
-      public void run()
-      {
-        ISelection selection = viewer.getSelection();
-        Object obj = ((IStructuredSelection)selection).getFirstElement();
-        showMessage("Double-click detected on " + obj.toString());
-      }
-    };
-  }
-
-  private void hookDoubleClickAction()
-  {
-    viewer.addDoubleClickListener(new IDoubleClickListener()
-    {
-      public void doubleClick(DoubleClickEvent event)
-      {
-        doubleClickAction.run();
-      }
-    });
-  }
-
-  private void showMessage(String message)
-  {
-    MessageDialog.openInformation(viewer.getControl().getShell(), "Remote Traces", message);
-  }
-
-  /**
-   * Passing the focus request to the viewer's control.
-   */
-  @Override
-  public void setFocus()
-  {
-    viewer.getControl().setFocus();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class ViewContentProvider implements IStructuredContentProvider
-  {
-    public void inputChanged(Viewer v, Object oldInput, Object newInput)
-    {
-    }
-
-    public void dispose()
-    {
-    }
-
-    public Object[] getElements(Object parent)
-    {
-      return RemoteTraceManager.INSTANCE.getEvents();
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class ViewLabelProvider extends LabelProvider implements ITableLabelProvider
-  {
-    private Image info;
-
-    private Image error;
-
-    private Image text;
-
-    public ViewLabelProvider()
-    {
-      ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-      info = sharedImages.getImage(ISharedImages.IMG_OBJS_INFO_TSK);
-      error = sharedImages.getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
-      text = sharedImages.getImage(ISharedImages.IMG_OBJ_FILE);
-    }
-
-    public String getColumnText(Object obj, int index)
-    {
-      if (obj instanceof Event)
-      {
-        Event event = (Event)obj;
-        String text = event.getText(index);
-        switch (index)
-        {
-        case 5:
-          return ReflectUtil.getSimpleClassName(text);
-        case 6:
-          int at = text.indexOf('@');
-          if (at == -1)
-          {
-            return text;
-          }
-
-          String context = ReflectUtil.getSimpleClassName(event.getText(5));
-          String id = text.substring(at + 1);
-          String className = text.substring(0, at);
-          if (ObjectUtil.equals(context, className))
-          {
-            return id;
-          }
-
-          return id + " (" + className + ")";
-
-        case 7:
-          return getFirstLine(text);
-        }
-
-        return text;
-      }
-
-      return getText(obj);
-    }
-
-    public Image getColumnImage(Object obj, int index)
-    {
-      if (obj instanceof Event)
-      {
-        Event event = (Event)obj;
-        switch (index)
-        {
-        case 0:
-          return event.hasError() ? error : info;
-        case 7:
-          return hasNL(event.getMessage()) ? text : null;
-        case 8:
-          return event.hasError() ? error : null;
-        }
-      }
-
-      return null;
-    }
-
-    @Override
-    public Image getImage(Object obj)
-    {
-      return null;
-    }
-
-    private boolean hasNL(String str)
-    {
-      return str.indexOf('\n') != -1;
-    }
-
-    private String getFirstLine(String str)
-    {
-      int nl = str.indexOf('\n');
-      if (nl != -1)
-      {
-        str = str.substring(0, nl);
-      }
-
-      return str.replaceAll("\r", "");
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class NameSorter extends ViewerSorter
-  {
-  }
-
-  // static class ToolTipHandler
-  // {
-  // private Shell tipShell;
-  //
-  // private Label tipLabel;
-  //
-  // private TableItem tipItem;
-  //
-  // private Point tipPosition;
-  //
-  // public ToolTipHandler(Shell parent)
-  // {
-  // final Display display = parent.getDisplay();
-  //
-  // tipShell = new Shell(parent, SWT.ON_TOP | SWT.TOOL);
-  // GridLayout gridLayout = new GridLayout();
-  // gridLayout.numColumns = 2;
-  // gridLayout.marginWidth = 2;
-  // gridLayout.marginHeight = 2;
-  // tipShell.setLayout(gridLayout);
-  //
-  // tipShell.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-  //
-  // tipLabel = new Label(tipShell, SWT.NONE);
-  // tipLabel.setForeground(display.getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-  // tipLabel.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-  // tipLabel
-  // .setLayoutData(new GridData(GridData.FILL_HORIZONTAL |
-  // GridData.VERTICAL_ALIGN_CENTER));
-  // }
-  //
-  // public void activateHoverHelp(final Control control)
-  // {
-  // control.addMouseListener(new MouseAdapter()
-  // {
-  // @Override
-  // public void mouseDown(MouseEvent e)
-  // {
-  // if (tipShell.isVisible())
-  // {
-  // tipShell.setVisible(false);
-  // }
-  // }
-  // });
-  //
-  // control.addMouseTrackListener(new MouseTrackAdapter()
-  // {
-  // @Override
-  // public void mouseExit(MouseEvent e)
-  // {
-  // if (tipShell.isVisible())
-  // {
-  // tipShell.setVisible(false);
-  // }
-  //
-  // tipItem = null;
-  // }
-  //
-  // @Override
-  // public void mouseHover(MouseEvent event)
-  // {
-  // Point pt = new Point(event.x, event.y);
-  // Widget widget = event.widget;
-  // if (widget instanceof Table)
-  // {
-  // Table table = (Table)widget;
-  // TableItem item = table.getItem(pt);
-  // if (widget == null)
-  // {
-  // tipShell.setVisible(false);
-  // tipItem = null;
-  // return;
-  // }
-  //
-  // if (item == tipItem)
-  // {
-  // return;
-  // }
-  //
-  // Object data = item.getData();
-  // if (data instanceof Event)
-  // {
-  // Event e = (Event)data;
-  // }
-  //
-  // tipItem = item;
-  // tipPosition = control.toDisplay(pt);
-  // String text = (String)item.getData("TIP_TEXT");
-  // tipLabel.setText(text != null ? text : "");
-  // tipShell.pack();
-  // setHoverLocation(tipShell, tipPosition);
-  // tipShell.setVisible(true);
-  // }
-  // }
-  // });
-  // }
-  //
-  // private void setHoverLocation(Shell shell, Point position)
-  // {
-  // Rectangle displayBounds = shell.getDisplay().getBounds();
-  // Rectangle shellBounds = shell.getBounds();
-  // shellBounds.x = Math.max(Math.min(position.x, displayBounds.width -
-  // shellBounds.width), 0);
-  // shellBounds.y = Math.max(
-  // Math.min(position.y + 16, displayBounds.height - shellBounds.height), 0);
-  // shell.setBounds(shellBounds);
-  // }
-  // }
-}
diff --git a/plugins/org.eclipse.net4j.examples/.classpath b/plugins/org.eclipse.net4j.examples/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.examples/.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.examples/.cvsignore b/plugins/org.eclipse.net4j.examples/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.net4j.examples/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.net4j.examples/.options b/plugins/org.eclipse.net4j.examples/.options
deleted file mode 100644
index bf52f07a54..0000000000
--- a/plugins/org.eclipse.net4j.examples/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.examples/debug = true
diff --git a/plugins/org.eclipse.net4j.examples/.project b/plugins/org.eclipse.net4j.examples/.project
deleted file mode 100644
index bec30c77a8..0000000000
--- a/plugins/org.eclipse.net4j.examples/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.examples</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 905bced209..0000000000
--- a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:51:46 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c9df9098f9..0000000000
--- a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,66 +0,0 @@
-#Sat Feb 23 10:51:46 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-internal.default.compliance=default
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.examples/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
deleted file mode 100644
index 22331c68b7..0000000000
--- a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.examples;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.internal.examples.bundle.OM$Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j;visibility:=reexport,
- org.eclipse.net4j.tcp;visibility:=reexport,
- org.eclipse.net4j.jvm;visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.examples/about.html b/plugins/org.eclipse.net4j.examples/about.html
deleted file mode 100644
index f2decc3a0d..0000000000
--- a/plugins/org.eclipse.net4j.examples/about.html
+++ /dev/null
@@ -1,70 +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>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-
-  <head>
-
-    <meta content="text/html; charset=ISO-8859-1"
-     http-equiv="Content-Type"/>
-
-    <title>About</title>
-
-  </head>
-
-  <body lang="EN-US">
-
-    <h2>About This Content</h2>
-
-    <p>May 17, 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&apos;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.</p>
-
-  </body>
-
-</html>
-
diff --git a/plugins/org.eclipse.net4j.examples/about.ini b/plugins/org.eclipse.net4j.examples/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.net4j.examples/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.examples/about.mappings b/plugins/org.eclipse.net4j.examples/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.net4j.examples/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.examples/about.properties b/plugins/org.eclipse.net4j.examples/about.properties
deleted file mode 100644
index 87311e7090..0000000000
--- a/plugins/org.eclipse.net4j.examples/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 Examples (Incubation)
-featureText = Net4j Examples \n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/Net4j
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.examples/build.properties b/plugins/org.eclipse.net4j.examples/build.properties
deleted file mode 100644
index 1ec3548179..0000000000
--- a/plugins/org.eclipse.net4j.examples/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png,\
-               plugin.xml
diff --git a/plugins/org.eclipse.net4j.examples/copyright.txt b/plugins/org.eclipse.net4j.examples/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.examples/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.examples/epl-v10.html b/plugins/org.eclipse.net4j.examples/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.examples/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.examples/license.html b/plugins/org.eclipse.net4j.examples/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.examples/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.examples/modeling32.png b/plugins/org.eclipse.net4j.examples/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.net4j.examples/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.examples/plugin.properties b/plugins/org.eclipse.net4j.examples/plugin.properties
deleted file mode 100644
index f1ef50393a..0000000000
--- a/plugins/org.eclipse.net4j.examples/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Examples (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.examples/plugin.xml b/plugins/org.eclipse.net4j.examples/plugin.xml
deleted file mode 100644
index cfc29e01d4..0000000000
--- a/plugins/org.eclipse.net4j.examples/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension point="org.eclipse.net4j.util.factories">
-      <factory
-            class="org.eclipse.net4j.examples.echo.server.EchoServerProtocol$Factory"
-            productGroup="org.eclipse.net4j.serverProtocols"
-            type="echo"/>
-      <factory
-            class="org.eclipse.net4j.examples.echo.client.EchoClientProtocol$Factory"
-            productGroup="org.eclipse.net4j.clientProtocols"
-            type="echo"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java
deleted file mode 100644
index 87a2dbb5cf..0000000000
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.examples.echo;
-
-/**
- * @author Eike Stepper
- */
-public interface EchoProtocol
-{
-  public static final String PROTOCOL_NAME = "echo";
-
-  public static final short ECHO_SIGNAL = 1;
-}
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java
deleted file mode 100644
index b125473af7..0000000000
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.examples.echo.client;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.examples.echo.EchoProtocol;
-import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
-import org.eclipse.net4j.tcp.TCPUtil;
-import org.eclipse.net4j.util.container.ContainerUtil;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.om.OMPlatform;
-
-/**
- * @author Eike Stepper
- */
-public class EchoClient
-{
-  public static void main(String[] args) throws Exception
-  {
-    // Send all traces and logs to the console
-    OMPlatform.INSTANCE.setDebugging(true);
-    OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-    OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
-
-    // Use this container to create and wire the components
-    IManagedContainer container = ContainerUtil.createContainer();
-
-    try
-    {
-      Net4jUtil.prepareContainer(container);
-      TCPUtil.prepareContainer(container);
-      container.registerFactory(new EchoClientProtocol.Factory());
-      LifecycleUtil.activate(container);
-
-      // Start a connector that represents the client side of a physical connection
-      IConnector connector = (IConnector)container.getElement("org.eclipse.net4j.connectors", "tcp", "localhost:2036");
-
-      // Open a virtual channel with the ECHO protocol, send an ECHO request and close the channel
-      IChannel channel = connector.openChannel(EchoProtocol.PROTOCOL_NAME, null);
-      EchoRequest request = new EchoRequest(channel, "My cool message");
-      String echo = request.send();
-      channel.close();
-
-      System.out.println();
-      System.out.println("ECHO: " + echo);
-      System.out.println();
-    }
-    finally
-    {
-      LifecycleUtil.deactivate(container);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
deleted file mode 100644
index 9117dc0b52..0000000000
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.examples.echo.client;
-
-import org.eclipse.net4j.examples.echo.EchoProtocol;
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-import org.eclipse.internal.net4j.protocol.ClientProtocolFactory;
-
-/**
- * @author Eike Stepper
- */
-public class EchoClientProtocol extends SignalProtocol implements EchoProtocol
-{
-  public EchoClientProtocol()
-  {
-  }
-
-  public String getType()
-  {
-    return PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor doCreateSignalReactor(short signalID)
-  {
-    // On client side only needed for server initiated requests
-    return null;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Factory extends ClientProtocolFactory
-  {
-    public Factory()
-    {
-      super(PROTOCOL_NAME);
-    }
-
-    public Object create(String description) throws ProductCreationException
-    {
-      return new EchoClientProtocol();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java
deleted file mode 100644
index f31af6af8b..0000000000
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.examples.echo.client;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.examples.echo.EchoProtocol;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class EchoRequest extends RequestWithConfirmation<String> implements EchoProtocol
-{
-  private String message;
-
-  public EchoRequest(IChannel channel, String message)
-  {
-    super(channel);
-    this.message = message;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ECHO_SIGNAL;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(message);
-  }
-
-  @Override
-  protected String confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java
deleted file mode 100644
index f9748bc9fd..0000000000
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.examples.echo.server;
-
-import org.eclipse.net4j.examples.echo.EchoProtocol;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class EchoIndication extends IndicationWithResponse implements EchoProtocol
-{
-  private String message;
-
-  public EchoIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return ECHO_SIGNAL;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    message = in.readString();
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(message);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java
deleted file mode 100644
index 608558d73e..0000000000
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.examples.echo.server;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.acceptor.IAcceptor;
-import org.eclipse.net4j.internal.examples.bundle.OM;
-import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
-import org.eclipse.net4j.tcp.TCPUtil;
-import org.eclipse.net4j.util.container.ContainerUtil;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.om.OMPlatform;
-
-/**
- * @author Eike Stepper
- */
-public class EchoServer
-{
-  public static void main(String[] args) throws Exception
-  {
-    // Send all traces and logs to the console
-    OMPlatform.INSTANCE.setDebugging(true);
-    OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-    OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
-
-    // Use this container to create and wire the components
-    IManagedContainer container = ContainerUtil.createContainer();
-
-    try
-    {
-      Net4jUtil.prepareContainer(container);
-      TCPUtil.prepareContainer(container);
-      container.registerFactory(new EchoServerProtocol.Factory());
-      LifecycleUtil.activate(container);
-
-      // Start an acceptor
-      IAcceptor acceptor = (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", "tcp", "0.0.0.0:2036");
-      OM.LOG.info("Accepting connections: " + acceptor);
-
-      System.out.println("Press any key to shutdown");
-      while (System.in.read() == -1)
-      {
-        Thread.sleep(200);
-      }
-    }
-    finally
-    {
-      LifecycleUtil.deactivate(container);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
deleted file mode 100644
index 8fbf7bc9cc..0000000000
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.examples.echo.server;
-
-import org.eclipse.net4j.examples.echo.EchoProtocol;
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-import org.eclipse.internal.net4j.protocol.ServerProtocolFactory;
-
-/**
- * @author Eike Stepper
- */
-public class EchoServerProtocol extends SignalProtocol implements EchoProtocol
-{
-  public EchoServerProtocol()
-  {
-  }
-
-  public String getType()
-  {
-    return PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor doCreateSignalReactor(short signalID)
-  {
-    switch (signalID)
-    {
-    case ECHO_SIGNAL:
-      return new EchoIndication();
-
-    default:
-      return null;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Factory extends ServerProtocolFactory
-  {
-    public Factory()
-    {
-      super(PROTOCOL_NAME);
-    }
-
-    public Object create(String description) throws ProductCreationException
-    {
-      return new EchoServerProtocol();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java
deleted file mode 100644
index 312e094416..0000000000
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.examples.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.examples"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.admin/.classpath b/plugins/org.eclipse.net4j.jms.admin/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/.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.jms.admin/.cvsignore b/plugins/org.eclipse.net4j.jms.admin/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.net4j.jms.admin/.options b/plugins/org.eclipse.net4j.jms.admin/.options
deleted file mode 100644
index ae8a96aa5a..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/.options
+++ /dev/null
@@ -1,5 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.jms.admin/debug = true
-
-org.eclipse.net4j.jms.admin/debug.protocol = true
diff --git a/plugins/org.eclipse.net4j.jms.admin/.project b/plugins/org.eclipse.net4j.jms.admin/.project
deleted file mode 100644
index c7af87ed59..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.jms.admin</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 24edbac2cf..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,272 +0,0 @@
-#Sat Feb 23 10:51:27 CET 2008
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4b96962f1b..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:51:27 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
deleted file mode 100644
index 819e8803c1..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.jms.admin
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.jms.internal.admin.bundle.OM
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.jms;visibility:=reexport
-Export-Package: org.eclipse.net4j.jms.admin;version="0.8.0",
- org.eclipse.net4j.jms.internal.admin;version="0.8.0",
- org.eclipse.net4j.jms.internal.admin.protocol;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.jms.admin/about.html b/plugins/org.eclipse.net4j.jms.admin/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/about.html
+++ /dev/null
@@ -1,28 +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.jms.admin/build.properties b/plugins/org.eclipse.net4j.jms.admin/build.properties
deleted file mode 100644
index 8edf2b291f..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties
diff --git a/plugins/org.eclipse.net4j.jms.admin/copyright.txt b/plugins/org.eclipse.net4j.jms.admin/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.admin/epl-v10.html b/plugins/org.eclipse.net4j.jms.admin/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.admin/license.html b/plugins/org.eclipse.net4j.jms.admin/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.admin/plugin.properties b/plugins/org.eclipse.net4j.jms.admin/plugin.properties
deleted file mode 100644
index 7f10c47fe6..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j JMS Admin (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java
deleted file mode 100644
index 9458493593..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.admin;
-
-/**
- * @author Eike Stepper
- */
-public interface IJMSAdmin
-{
-  public boolean createQueue(String name);
-
-  public boolean createTopic(String name);
-
-  public void close();
-}
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java
deleted file mode 100644
index abf70a787f..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.admin;
-
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.jms.internal.admin.JMSAdmin;
-import org.eclipse.net4j.jms.internal.admin.protocol.JMSAdminProtocolFactory;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public final class JMSAdminUtil
-{
-  private JMSAdminUtil()
-  {
-  }
-
-  public static void prepareContainer(IManagedContainer container)
-  {
-    container.registerFactory(new JMSAdminProtocolFactory());
-  }
-
-  public static IJMSAdmin createAdmin(IConnector connector)
-  {
-    return new JMSAdmin(connector);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java
deleted file mode 100644
index 4b7dbe4522..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.admin;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.jms.JMSAdminProtocolConstants;
-import org.eclipse.net4j.jms.admin.IJMSAdmin;
-import org.eclipse.net4j.jms.internal.admin.bundle.OM;
-import org.eclipse.net4j.jms.internal.admin.protocol.JMSCreateDestinationRequest;
-
-/**
- * @author Eike Stepper
- */
-public class JMSAdmin implements IJMSAdmin
-{
-  private IChannel channel;
-
-  public JMSAdmin(IConnector connector)
-  {
-    channel = connector.openChannel(JMSAdminProtocolConstants.PROTOCOL_NAME, this);
-  }
-
-  public void close()
-  {
-    channel.close();
-    channel = null;
-  }
-
-  public boolean createQueue(String name)
-  {
-    return createDestination(name, JMSAdminProtocolConstants.DESTINATION_TYPE_QUEUE);
-  }
-
-  public boolean createTopic(String name)
-  {
-    return createDestination(name, JMSAdminProtocolConstants.DESTINATION_TYPE_TOPIC);
-  }
-
-  private boolean createDestination(String name, byte type)
-  {
-    try
-    {
-      return new JMSCreateDestinationRequest(channel, type, name).send();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
deleted file mode 100644
index 1b5dfd2b05..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.admin.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.jms.admin"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
deleted file mode 100644
index f5f0d2a891..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.admin.protocol;
-
-import org.eclipse.net4j.jms.JMSAdminProtocolConstants;
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
-
-/**
- * @author Eike Stepper
- */
-public class JMSAdminProtocol extends SignalProtocol
-{
-  public JMSAdminProtocol()
-  {
-  }
-
-  public String getType()
-  {
-    return JMSAdminProtocolConstants.PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor doCreateSignalReactor(short signalID)
-  {
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocolFactory.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocolFactory.java
deleted file mode 100644
index b725a9b946..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocolFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.admin.protocol;
-
-import org.eclipse.net4j.jms.JMSAdminProtocolConstants;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-import org.eclipse.internal.net4j.protocol.ClientProtocolFactory;
-
-/**
- * @author Eike Stepper
- */
-public final class JMSAdminProtocolFactory extends ClientProtocolFactory
-{
-  public static final String TYPE = JMSAdminProtocolConstants.PROTOCOL_NAME;
-
-  public JMSAdminProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public JMSAdminProtocol create(String description)
-  {
-    return new JMSAdminProtocol();
-  }
-
-  public static JMSAdminProtocol get(IManagedContainer container, String description)
-  {
-    return (JMSAdminProtocol)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java
deleted file mode 100644
index 513cbe58ee..0000000000
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.admin.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSAdminProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSCreateDestinationRequest extends RequestWithConfirmation<Boolean>
-{
-  private byte type;
-
-  private String name;
-
-  public JMSCreateDestinationRequest(IChannel channel, byte type, String name)
-  {
-    super(channel);
-    this.type = type;
-    this.name = name;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSAdminProtocolConstants.SIGNAL_CREATE_DESTINATION;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeByte(type);
-    out.writeString(name);
-  }
-
-  @Override
-  protected Boolean confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readBoolean();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.api/.classpath b/plugins/org.eclipse.net4j.jms.api/.classpath
deleted file mode 100644
index a22e3d08c6..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.jar"/>
-	<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="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.net4j.jms.api/.cvsignore b/plugins/org.eclipse.net4j.jms.api/.cvsignore
deleted file mode 100644
index 072edad71b..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-jms_src.zip
diff --git a/plugins/org.eclipse.net4j.jms.api/.project b/plugins/org.eclipse.net4j.jms.api/.project
deleted file mode 100644
index 023ba4d7d8..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.jms.api</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 601f481e24..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:51:15 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index e407538c31..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:51:15 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
deleted file mode 100644
index c53d8329c5..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.jms.api
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Export-Package: javax.jms;version="1.1.0"
-Bundle-ClassPath: lib/geronimo-jms_1.1_spec-1.1.jar
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.net4j.jms.api/META-INF/geronimo-LICENSE.txt b/plugins/org.eclipse.net4j.jms.api/META-INF/geronimo-LICENSE.txt
deleted file mode 100644
index 6b0b1270ff..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/META-INF/geronimo-LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/plugins/org.eclipse.net4j.jms.api/META-INF/geronimo-NOTICE.txt b/plugins/org.eclipse.net4j.jms.api/META-INF/geronimo-NOTICE.txt
deleted file mode 100644
index 3b4090d7e1..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/META-INF/geronimo-NOTICE.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache Geronimo 
-Copyright 2003-2006 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/plugins/org.eclipse.net4j.jms.api/about.html b/plugins/org.eclipse.net4j.jms.api/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/about.html
+++ /dev/null
@@ -1,28 +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.jms.api/build.properties b/plugins/org.eclipse.net4j.jms.api/build.properties
deleted file mode 100644
index e6d6fed16a..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-output.. = .
-bin.includes = META-INF/,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               lib/,\
-               lib/geronimo-jms_1.1_spec-1.1.jar
-bin.excludes = lib/.cvsignore
diff --git a/plugins/org.eclipse.net4j.jms.api/copyright.txt b/plugins/org.eclipse.net4j.jms.api/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.api/epl-v10.html b/plugins/org.eclipse.net4j.jms.api/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.api/lib/.cvsignore b/plugins/org.eclipse.net4j.jms.api/lib/.cvsignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/lib/.cvsignore
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.jms.api/license.html b/plugins/org.eclipse.net4j.jms.api/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.api/plugin.properties b/plugins/org.eclipse.net4j.jms.api/plugin.properties
deleted file mode 100644
index 07cbd61ddf..0000000000
--- a/plugins/org.eclipse.net4j.jms.api/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j JMS API (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.classpath b/plugins/org.eclipse.net4j.jms.server.jdbc/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.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.jms.server.jdbc/.cvsignore b/plugins/org.eclipse.net4j.jms.server.jdbc/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.options b/plugins/org.eclipse.net4j.jms.server.jdbc/.options
deleted file mode 100644
index 43a5c9f199..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.jms.server.jdbc/debug = true
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.project b/plugins/org.eclipse.net4j.jms.server.jdbc/.project
deleted file mode 100644
index afc317d56b..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.jms.server.jdbc</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 361462cf52..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,272 +0,0 @@
-#Sat Feb 23 10:50:54 CET 2008
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index cf66f92733..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:50:54 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
deleted file mode 100644
index 5311e682e7..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.jms.server.jdbc
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.jms.server.internal.jdbc.bundle.OM
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.jms.server;visibility:=reexport,
- org.eclipse.net4j.db;visibility:=reexport
-Import-Package: javax.jms;version="1.1.0"
-Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="0.8.0",
- org.eclipse.net4j.jms.server.jdbc;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/about.html b/plugins/org.eclipse.net4j.jms.server.jdbc/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/about.html
+++ /dev/null
@@ -1,28 +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.jms.server.jdbc/build.properties b/plugins/org.eclipse.net4j.jms.server.jdbc/build.properties
deleted file mode 100644
index 8edf2b291f..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/copyright.txt b/plugins/org.eclipse.net4j.jms.server.jdbc/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/db.txt b/plugins/org.eclipse.net4j.jms.server.jdbc/db.txt
deleted file mode 100644
index 531b9c2161..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/db.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-SYSTEM_DATA
-===========
-  id                     bigint
-  version                varchar(20)
-  creationdate           date
-
-
-
-SEEDS
-=====
-  name                   varchar(20)
-  seed                   bigint
-
-
-
-DESTINATIONS
-============
-  name                   varchar(255)
-  isqueue                int
-  destination_id         bigint
-
-
-
-MESSAGES
-========
-  message_id            varchar(64)
-  destination_id        bigint
-  priority              int
-  createtime            bigint
-  expirytime            bigint
-  processed             int
-  messageblob           longblob
-
-
-
-MESSAGE_HANDLES
-===============
-   message_id           varchar(64)
-   destination_id       bigint
-   consumer_id          bigint
-   priority             int
-   acceptedtime         bigint
-   sequencenumber       bigint
-   expirytime           bigint
-   delivered            int
-
-
-
-CONSUMERS
-=========
-  name                 varchar(255)
-  destination_id       bigint
-  consumer_id          bigint
-  created              bigint
-
-
-
-USERS
-=====
-  username             varchar(50)
-  password             varchar(50)
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/epl-v10.html b/plugins/org.eclipse.net4j.jms.server.jdbc/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/license.html b/plugins/org.eclipse.net4j.jms.server.jdbc/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/plugin.properties b/plugins/org.eclipse.net4j.jms.server.jdbc/plugin.properties
deleted file mode 100644
index a7e7e8d6d0..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j JMS Server DB (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java
deleted file mode 100644
index 32b347b517..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server.internal.jdbc;
-
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.jms.internal.server.store.AbstractStore;
-import org.eclipse.net4j.jms.internal.server.store.StoreException;
-import org.eclipse.net4j.jms.server.IStoreTransaction;
-
-import javax.sql.DataSource;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * @author Eike Stepper
- */
-public class JDBCStore extends AbstractStore
-{
-  private static final String STORE_TYPE = "JDBC";
-
-  private IDBAdapter dbAdapter;
-
-  private DataSource dataSource;
-
-  public JDBCStore(IDBAdapter dbAdapter, DataSource dataSource)
-  {
-    super(STORE_TYPE);
-    if (dbAdapter == null)
-    {
-      throw new IllegalArgumentException("dbAdapter == null");
-    }
-
-    if (dataSource == null)
-    {
-      throw new IllegalArgumentException("dataSource == null");
-    }
-
-    this.dbAdapter = dbAdapter;
-    this.dataSource = dataSource;
-  }
-
-  public IDBAdapter getDBAdapter()
-  {
-    return dbAdapter;
-  }
-
-  public DataSource getDataSource()
-  {
-    return dataSource;
-  }
-
-  public Connection getConnection()
-  {
-    try
-    {
-      return dataSource.getConnection();
-    }
-    catch (SQLException ex)
-    {
-      throw new StoreException(ex);
-    }
-  }
-
-  public void initDatabase(String instanceID)
-  {
-    JMSSchema.INSTANCE.create(dbAdapter, dataSource);
-    // TODO Store instanceID
-  }
-
-  public IStoreTransaction startTransaction()
-  {
-    try
-    {
-      Connection connection = getConnection();
-      connection.setAutoCommit(false);
-      return new JDBCTransaction(this, connection);
-    }
-    catch (SQLException ex)
-    {
-      throw new StoreException(ex);
-    }
-  }
-
-  public void commitTransaction(IStoreTransaction transaction)
-  {
-    JDBCTransaction jdbcTransaction = (JDBCTransaction)transaction;
-    try
-    {
-      Connection connection = jdbcTransaction.getConnection();
-      connection.commit();
-    }
-    catch (SQLException ex)
-    {
-      throw new StoreException(ex);
-    }
-    finally
-    {
-      jdbcTransaction.dispose();
-    }
-  }
-
-  public void rollbackTransaction(IStoreTransaction transaction)
-  {
-    JDBCTransaction jdbcTransaction = (JDBCTransaction)transaction;
-    try
-    {
-      Connection connection = jdbcTransaction.getConnection();
-      connection.rollback();
-    }
-    catch (SQLException ex)
-    {
-      throw new StoreException(ex);
-    }
-    finally
-    {
-      jdbcTransaction.dispose();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java
deleted file mode 100644
index 46188d61cf..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server.internal.jdbc;
-
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.jms.internal.server.ServerConsumer;
-import org.eclipse.net4j.jms.internal.server.ServerDestination;
-import org.eclipse.net4j.jms.internal.server.store.AbstractStore;
-import org.eclipse.net4j.jms.internal.server.store.AbstractTransaction;
-
-import java.sql.Connection;
-
-/**
- * @author Eike Stepper
- */
-public class JDBCTransaction extends AbstractTransaction
-{
-  private Connection connection;
-
-  public JDBCTransaction(AbstractStore store, Connection connection)
-  {
-    super(store);
-    this.connection = connection;
-  }
-
-  public Connection getConnection()
-  {
-    return connection;
-  }
-
-  public void dispose()
-  {
-    connection = null;
-  }
-
-  @Override
-  protected String[] doGetDestinationNames()
-  {
-    return NO_DESTINATION_NAMES;
-  }
-
-  @Override
-  protected ServerDestination doGetDestination(String name)
-  {
-    return null;
-  }
-
-  @Override
-  protected long[] doGetConsumerIDs()
-  {
-    return NO_CONSUMER_IDS;
-  }
-
-  @Override
-  protected ServerConsumer doGetConsumer(long id)
-  {
-    return null;
-  }
-
-  @Override
-  protected void doDestinationAdded(ServerDestination destination)
-  {
-  }
-
-  @Override
-  protected void doDestinationRemoved(ServerDestination destination)
-  {
-  }
-
-  @Override
-  protected void doConsumerAdded(ServerConsumer consumer)
-  {
-  }
-
-  @Override
-  protected void doConsumerRemoved(ServerConsumer consumer)
-  {
-  }
-
-  @Override
-  protected void doMessageReceived(MessageImpl message)
-  {
-  }
-
-  @Override
-  protected void doMessageSent(MessageImpl message, long consumerID)
-  {
-  }
-
-  @Override
-  protected void doMessageAcknowledged(MessageImpl message, long consumerID)
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
deleted file mode 100644
index 5b357e28a5..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server.internal.jdbc;
-
-import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.db.ddl.IDBIndex;
-import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
-
-/**
- * @author Eike Stepper
- */
-public class JMSSchema extends DBSchema
-{
-  public static final JMSSchema INSTANCE = new JMSSchema();
-
-  /**
-   * DBTable Destinations
-   */
-  public static final IDBTable DESTINATIONS = INSTANCE.addTable("destinations");
-
-  public static final IDBField DESTINATIONS_NAME = //
-  DESTINATIONS.addField("name", DBType.VARCHAR, 255);
-
-  public static final IDBField DESTINATIONS_TYPE = //
-  DESTINATIONS.addField("type", DBType.INTEGER);
-
-  public static final IDBIndex INDEX_DESTINATIONS_PK = //
-  DESTINATIONS.addIndex(IDBIndex.Type.PRIMARY_KEY, DESTINATIONS_NAME);
-
-  /**
-   * DBTable Messages
-   */
-  public static final IDBTable MESSAGES = INSTANCE.addTable("messages");
-
-  public static final IDBField MESSAGES_ID = //
-  MESSAGES.addField("id", DBType.VARCHAR);
-
-  public static final IDBField MESSAGES_DESTINATION = //
-  MESSAGES.addField("destination", DBType.VARCHAR);
-
-  public static final IDBField MESSAGES_PRIORITY = //
-  MESSAGES.addField("priority", DBType.INTEGER);
-
-  public static final IDBIndex INDEX_MESSAGES_PK = //
-  MESSAGES.addIndex(IDBIndex.Type.PRIMARY_KEY, MESSAGES_ID);
-
-  /**
-   * Queries
-   */
-  public static final String QUERY = "SELECT " + DESTINATIONS_TYPE + ", " + MESSAGES_ID + ", " + MESSAGES_PRIORITY
-      + " FROM " + DESTINATIONS + ", " + MESSAGES + " WHERE " + DESTINATIONS_NAME + "=" + MESSAGES_DESTINATION
-      + " AND " + DESTINATIONS_NAME + "=?";
-
-  private JMSSchema()
-  {
-    super("JMS");
-  }
-
-  static
-  {
-    INSTANCE.lock();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
deleted file mode 100644
index d92212911a..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server.internal.jdbc.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.jms.server.jdbc"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java
deleted file mode 100644
index 9cd6f0a717..0000000000
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server.jdbc;
-
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.jms.server.IStore;
-import org.eclipse.net4j.jms.server.internal.jdbc.JDBCStore;
-import org.eclipse.net4j.jms.server.internal.jdbc.bundle.OM;
-
-import javax.sql.DataSource;
-
-import java.util.Properties;
-
-/**
- * @author Eike Stepper
- */
-public final class JDBCUtil
-{
-  private JDBCUtil()
-  {
-  }
-
-  public static IStore getStore(IDBAdapter dbAdapter, DataSource dataSource, String instanceID)
-  {
-    JDBCStore store = new JDBCStore(dbAdapter, dataSource);
-    store.initDatabase(instanceID);
-    return store;
-  }
-
-  public static IStore getStore()
-  {
-    Properties properties = OM.BUNDLE.getConfigProperties();
-    String adapterName = properties.getProperty("store.adapterName", "derby-embedded");
-    IDBAdapter dbAdapter = DBUtil.getDBAdapter(adapterName);
-    DataSource dataSource = DBUtil.createDataSource(properties, "datasource");
-    String instanceID = properties.getProperty("store.instanceID", "00000000");
-    return getStore(dbAdapter, dataSource, instanceID);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/.classpath b/plugins/org.eclipse.net4j.jms.server/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/.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.jms.server/.cvsignore b/plugins/org.eclipse.net4j.jms.server/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.net4j.jms.server/.options b/plugins/org.eclipse.net4j.jms.server/.options
deleted file mode 100644
index 1fd37aa77e..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/.options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.jms.server/debug = true
-
-org.eclipse.net4j.jms.server/debug.protocol = true
-org.eclipse.net4j.jms.server/debug.store = true
diff --git a/plugins/org.eclipse.net4j.jms.server/.project b/plugins/org.eclipse.net4j.jms.server/.project
deleted file mode 100644
index 8bbd7f899a..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.jms.server</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7aaaf02197..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,272 +0,0 @@
-#Sat Feb 23 10:51:03 CET 2008
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 09978d9fae..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:51:03 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
deleted file mode 100644
index 7a84d75911..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.jms.server
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.jms.internal.server.bundle.OM
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.jms;visibility:=reexport
-Import-Package: javax.jms;version="1.1.0"
-Export-Package: org.eclipse.net4j.jms.internal.server;version="0.8.0",
- org.eclipse.net4j.jms.internal.server.protocol;version="0.8.0",
- org.eclipse.net4j.jms.internal.server.protocol.admin;version="0.8.0",
- org.eclipse.net4j.jms.internal.server.store;version="0.8.0",
- org.eclipse.net4j.jms.server;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.jms.server/about.html b/plugins/org.eclipse.net4j.jms.server/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/about.html
+++ /dev/null
@@ -1,28 +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.jms.server/build.properties b/plugins/org.eclipse.net4j.jms.server/build.properties
deleted file mode 100644
index 8edf2b291f..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties
diff --git a/plugins/org.eclipse.net4j.jms.server/copyright.txt b/plugins/org.eclipse.net4j.jms.server/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.server/epl-v10.html b/plugins/org.eclipse.net4j.jms.server/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.server/license.html b/plugins/org.eclipse.net4j.jms.server/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.server/plugin.properties b/plugins/org.eclipse.net4j.jms.server/plugin.properties
deleted file mode 100644
index 3bac5489ef..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j JMS Server (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
deleted file mode 100644
index 0312925849..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server;
-
-import org.eclipse.net4j.internal.jms.ConnectionFactoryImpl;
-import org.eclipse.net4j.internal.jms.JMSDestination;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.util.lifecycle.QueueWorker;
-import org.eclipse.net4j.jms.internal.server.bundle.OM;
-import org.eclipse.net4j.jms.server.IDestination;
-import org.eclipse.net4j.jms.server.IServer;
-import org.eclipse.net4j.jms.server.IStore;
-import org.eclipse.net4j.jms.server.IStoreTransaction;
-import org.eclipse.net4j.util.HexUtil;
-import org.eclipse.net4j.util.concurrent.NonBlockingLongCounter;
-
-import javax.jms.Destination;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * @author Eike Stepper
- */
-public class Server extends QueueWorker<MessageImpl> implements IServer
-{
-  public static final Server INSTANCE = new Server();
-
-  private static final boolean REBIND_DESTINATIONS = true;
-
-  private NonBlockingLongCounter messageIDCounter = new NonBlockingLongCounter();
-
-  private NonBlockingLongCounter consumerIDCounter = new NonBlockingLongCounter();
-
-  private IStore store = null;
-
-  private Context jndiContext;
-
-  private ConcurrentMap<String, ServerDestination> destinations = new ConcurrentHashMap<String, ServerDestination>();
-
-  private Set<ServerConnection> connections = new HashSet<ServerConnection>();
-
-  private ConcurrentMap<Long, ServerConsumer> consumers = new ConcurrentHashMap<Long, ServerConsumer>();
-
-  public Server()
-  {
-  }
-
-  public IStore getStore()
-  {
-    return store;
-  }
-
-  public void setStore(IStore store)
-  {
-    this.store = store;
-  }
-
-  public IDestination createDestination(String name, IDestination.Type type)
-  {
-    ServerDestination destination = new ServerDestination(name, type);
-    ServerDestination existing = destinations.putIfAbsent(name, destination);
-    if (existing != null)
-    {
-      throw new IllegalStateException("Destination " + type + " " + name + " does already exist");
-    }
-
-    IStoreTransaction transaction = store.startTransaction();
-    transaction.destinationAdded(destination);
-    store.commitTransaction(transaction);
-
-    try
-    {
-      destination.bind(jndiContext, REBIND_DESTINATIONS);
-    }
-    catch (NamingException ex)
-    {
-      OM.LOG.error(ex);
-      destinations.remove(name);
-      destination = null;
-    }
-
-    return destination;
-  }
-
-  public ServerDestination getDestination(String name)
-  {
-    return destinations.get(name);
-  }
-
-  public ServerDestination getServerDestination(Destination jmsDestination)
-  {
-    String name = ((JMSDestination)jmsDestination).getName();
-    ServerDestination destination = destinations.get(name);
-    if (destination == null)
-    {
-      OM.LOG.error("Invalid destination: " + name);
-      return null;
-    }
-
-    return destination;
-  }
-
-  public ServerConnection logon(String userName, String password)
-  {
-    ServerConnection connection = new ServerConnection(this, userName);
-    synchronized (connections)
-    {
-      connections.add(connection);
-    }
-
-    return connection;
-  }
-
-  public ServerConsumer createConsumer(ServerDestination destination, String messageSelector, boolean noLocal,
-      boolean durable)
-  {
-    long consumerID = consumerIDCounter.increment();
-    ServerConsumer consumer = new ServerConsumer(consumerID, destination, messageSelector, noLocal, durable);
-    consumers.put(consumer.getID(), consumer);
-    return consumer;
-  }
-
-  public ServerConsumer getConsumer(long consumerID)
-  {
-    return consumers.get(consumerID);
-  }
-
-  public String[] handleClientMessages(MessageImpl[] messages)
-  {
-    IStoreTransaction transaction = store.startTransaction();
-    String[] messageIDs = handleClientMessagesInTransaction(transaction, messages);
-    store.commitTransaction(transaction);
-    return messageIDs;
-  }
-
-  public String[] handleClientMessagesInTransaction(IStoreTransaction transaction, MessageImpl[] messages)
-  {
-    String[] messageIDs = new String[messages.length];
-    for (int i = 0; i < messages.length; i++)
-    {
-      MessageImpl message = messages[i];
-      if (getServerDestination(message.getJMSDestination()) == null)
-      {
-        return null;
-      }
-
-      messageIDs[i] = "ID:NET4J:" + HexUtil.longToHex(messageIDCounter.increment());
-      message.setJMSMessageID(messageIDs[i]);
-    }
-
-    for (MessageImpl message : messages)
-    {
-      transaction.messageReceived(message);
-      addWork(message);
-    }
-
-    return messageIDs;
-  }
-
-  @Override
-  protected String getThreadName()
-  {
-    return "jms-server";
-  }
-
-  @Override
-  protected void work(WorkContext context, MessageImpl message)
-  {
-    ServerDestination destination = getServerDestination(message.getJMSDestination());
-    IStoreTransaction transaction = store.startTransaction();
-    destination.handleClientMessage(transaction, message);
-    store.commitTransaction(transaction);
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (store == null)
-    {
-      throw new IllegalStateException("store == null");
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    String name = System.getProperty("net4j.jms.connection.factory.name", "net4j.jms.ConnectionFactory");
-    String type = System.getProperty("net4j.jms.connector.type", "tcp");
-    String desc = System.getProperty("net4j.jms.connector.description", "localhost");
-
-    jndiContext = new InitialContext();
-    jndiContext.rebind(name, new ConnectionFactoryImpl(type, desc));
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    synchronized (connections)
-    {
-      for (ServerConnection connection : connections)
-      {
-        try
-        {
-          connection.close();
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-        }
-      }
-    }
-
-    jndiContext.close();
-    jndiContext = null;
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
deleted file mode 100644
index e7e26647e7..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server;
-
-import org.eclipse.net4j.jms.internal.server.protocol.JMSServerProtocol;
-import org.eclipse.net4j.jms.server.IConnection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class ServerConnection implements IConnection
-{
-  private Server server;
-
-  private String userName;
-
-  private List<ServerSession> sessions = new ArrayList<ServerSession>(0);
-
-  private JMSServerProtocol protocol;
-
-  public ServerConnection(Server server, String userName)
-  {
-    this.server = server;
-    this.userName = userName;
-  }
-
-  public Server getServer()
-  {
-    return server;
-  }
-
-  public String getUserName()
-  {
-    return userName;
-  }
-
-  public JMSServerProtocol getProtocol()
-  {
-    return protocol;
-  }
-
-  public void setProtocol(JMSServerProtocol protocol)
-  {
-    this.protocol = protocol;
-  }
-
-  public ServerSession openSession(int sessionID)
-  {
-    ServerSession session = new ServerSession(this, sessionID);
-    synchronized (sessions)
-    {
-      while (sessionID >= sessions.size())
-      {
-        sessions.add(null);
-      }
-
-      sessions.set(sessionID, session);
-    }
-
-    return session;
-  }
-
-  public ServerSession getSession(int sessionID)
-  {
-    return sessions.get(sessionID);
-  }
-
-  public ServerSession[] getSessions()
-  {
-    List<ServerSession> result = new ArrayList<ServerSession>(sessions.size());
-    synchronized (sessions)
-    {
-      for (ServerSession session : sessions)
-      {
-        if (session != null)
-        {
-          result.add(session);
-        }
-      }
-    }
-
-    return result.toArray(new ServerSession[result.size()]);
-  }
-
-  public void close()
-  {
-    protocol.getChannel().close();
-  }
-
-  protected boolean removeSession(ServerSession session)
-  {
-    synchronized (sessions)
-    {
-      int sessionID = session.getID();
-      if (sessions.get(sessionID) == session)
-      {
-        sessions.set(sessionID, null);
-        return true;
-      }
-
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
deleted file mode 100644
index f7d71e0d78..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.jms.internal.server.bundle.OM;
-import org.eclipse.net4j.jms.internal.server.protocol.JMSServerMessageRequest;
-import org.eclipse.net4j.jms.server.IStoreTransaction;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * @author Eike Stepper
- */
-public class ServerConsumer
-{
-  private ServerSession session;
-
-  private long id;
-
-  private ServerDestination destination;
-
-  private String messageSelector;
-
-  private boolean noLocal;
-
-  private boolean durable;
-
-  private ConcurrentMap<String, MessageImpl> messages = new ConcurrentHashMap<String, MessageImpl>();
-
-  public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal, boolean durable)
-  {
-    this.id = id;
-    this.destination = destination;
-    this.messageSelector = messageSelector;
-    this.noLocal = noLocal;
-    this.durable = durable;
-  }
-
-  public ServerSession getSession()
-  {
-    return session;
-  }
-
-  public void setSession(ServerSession session)
-  {
-    this.session = session;
-  }
-
-  public long getID()
-  {
-    return id;
-  }
-
-  public ServerDestination getDestination()
-  {
-    return destination;
-  }
-
-  public String getMessageSelector()
-  {
-    return messageSelector;
-  }
-
-  public boolean isNoLocal()
-  {
-    return noLocal;
-  }
-
-  public IChannel getChannel()
-  {
-    return session.getConnection().getProtocol().getChannel();
-  }
-
-  public boolean isDurable()
-  {
-    return durable;
-  }
-
-  public boolean handleClientMessage(IStoreTransaction transaction, MessageImpl message)
-  {
-    try
-    {
-      String messageID = message.getJMSMessageID();
-      synchronized (messages)
-      {
-        messages.put(messageID, message);
-      }
-
-      new JMSServerMessageRequest(getChannel(), session.getID(), id, message).send();
-      transaction.messageSent(message, id);
-      return true;
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      return false;
-    }
-  }
-
-  public void handleAcknowledge(IStoreTransaction transaction)
-  {
-    synchronized (messages)
-    {
-      if (messages.isEmpty())
-      {
-        return;
-      }
-
-      for (MessageImpl message : messages.values())
-      {
-        transaction.messageAcknowledged(message, id);
-        IOUtil.OUT().println("\nMessage acknowledged: " + message.getJMSMessageID() + "  (consumer=" + id + ")\n");
-      }
-
-      messages.clear();
-    }
-  }
-
-  public void handleRecover(IStoreTransaction transaction)
-  {
-    synchronized (messages)
-    {
-      if (messages.isEmpty())
-      {
-        return;
-      }
-
-      for (MessageImpl message : messages.values())
-      {
-        IOUtil.OUT().println("\nRecovering message: " + message.getJMSMessageID() + "  (consumer=" + id + ")\n");
-        session.getConnection().getServer().addWork(message);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
deleted file mode 100644
index dcc9a6e6bb..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server;
-
-import org.eclipse.net4j.internal.jms.DestinationImpl;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.jms.QueueImpl;
-import org.eclipse.net4j.internal.jms.TopicImpl;
-import org.eclipse.net4j.internal.util.concurrent.RoundRobinList;
-import org.eclipse.net4j.jms.server.IDestination;
-import org.eclipse.net4j.jms.server.IStore;
-import org.eclipse.net4j.jms.server.IStoreTransaction;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import java.util.Iterator;
-
-/**
- * @author Eike Stepper
- */
-public class ServerDestination implements IDestination
-{
-  private String name;
-
-  private Type type;
-
-  private RoundRobinList<ServerConsumer> consumers = new RoundRobinList<ServerConsumer>();
-
-  public ServerDestination(String name, Type type)
-  {
-    this.name = name;
-    this.type = type;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public Type getType()
-  {
-    return type;
-  }
-
-  public DestinationImpl bind(Context context, boolean rebind) throws NamingException
-  {
-    DestinationImpl destination = type == Type.QUEUE ? new QueueImpl(name) : new TopicImpl(name);
-    if (rebind)
-    {
-      context.rebind(name, destination);
-    }
-    else
-    {
-      context.bind(name, destination);
-    }
-
-    return destination;
-  }
-
-  public boolean addConsumer(ServerConsumer consumer)
-  {
-    if (consumer.isDurable())
-    {
-      IStore store = Server.INSTANCE.getStore();
-      IStoreTransaction transaction = store.startTransaction();
-      transaction.consumerAdded(consumer);
-      store.commitTransaction(transaction);
-    }
-
-    return consumers.add(consumer);
-  }
-
-  public boolean removeConsumer(final long consumerID)
-  {
-    final boolean[] modified = { false };
-    consumers.executeWrites(new Runnable()
-    {
-      public void run()
-      {
-        for (Iterator<ServerConsumer> it = consumers.iterator(); it.hasNext();)
-        {
-          ServerConsumer consumer = it.next();
-          if (consumer.getID() == consumerID)
-          {
-            it.remove();
-            modified[0] = true;
-            return;
-          }
-        }
-      }
-    });
-
-    return modified[0];
-  }
-
-  /**
-   * Called by worker thread of the server
-   */
-  public void handleClientMessage(IStoreTransaction transaction, MessageImpl message)
-  {
-    if (type == Type.QUEUE)
-    {
-      ServerConsumer consumer = consumers.element();
-      if (consumer != null)
-      {
-        consumer.handleClientMessage(transaction, message);
-      }
-    }
-    else
-    {
-      ServerConsumer[] consumers = this.consumers.toArray(new ServerConsumer[0]);
-      for (ServerConsumer consumer : consumers)
-      {
-        consumer.handleClientMessage(transaction, message);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
deleted file mode 100644
index 98fafa6dcb..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server;
-
-import org.eclipse.net4j.internal.jms.DestinationImpl;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.jms.internal.server.bundle.OM;
-import org.eclipse.net4j.jms.server.ISession;
-import org.eclipse.net4j.jms.server.IStore;
-import org.eclipse.net4j.jms.server.IStoreTransaction;
-
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * @author Eike Stepper
- */
-public class ServerSession extends Lifecycle implements ISession
-{
-  private ServerConnection connection;
-
-  private int id;
-
-  private ConcurrentMap<Long, ServerConsumer> consumers = new ConcurrentHashMap<Long, ServerConsumer>();
-
-  public ServerSession(ServerConnection connection, int id)
-  {
-    this.connection = connection;
-    this.id = id;
-  }
-
-  public ServerConnection getConnection()
-  {
-    return connection;
-  }
-
-  public int getID()
-  {
-    return id;
-  }
-
-  public long registerConsumer(DestinationImpl dest, String messageSelector, boolean noLocal, boolean durable)
-  {
-    Server server = connection.getServer();
-    String name = dest.getName();
-    ServerDestination destination = server.getDestination(name);
-    if (destination == null)
-    {
-      OM.LOG.error("Destination not found: " + name);
-      return -1;
-    }
-
-    ServerConsumer consumer = server.createConsumer(destination, messageSelector, noLocal, durable);
-    consumer.setSession(this);
-    consumers.put(consumer.getID(), consumer);
-    destination.addConsumer(consumer);
-    return consumer.getID();
-  }
-
-  public void handleAcknowledge()
-  {
-    IStore store = connection.getServer().getStore();
-    IStoreTransaction transaction = store.startTransaction();
-    handleAcknowledgeInTransaction(transaction);
-    store.commitTransaction(transaction);
-  }
-
-  public void handleAcknowledgeInTransaction(IStoreTransaction transaction)
-  {
-    for (ServerConsumer consumer : consumers.values())
-    {
-      consumer.handleAcknowledge(transaction);
-    }
-  }
-
-  public void handleRecover()
-  {
-    IStore store = connection.getServer().getStore();
-    IStoreTransaction transaction = store.startTransaction();
-    Collection<ServerConsumer> values = consumers.values();
-    for (ServerConsumer consumer : values)
-    {
-      consumer.handleRecover(transaction);
-    }
-
-    store.commitTransaction(transaction);
-  }
-
-  public String[] handleCommit(MessageImpl[] messages)
-  {
-    Server server = connection.getServer();
-    IStore store = server.getStore();
-
-    IStoreTransaction transaction = store.startTransaction();
-    handleAcknowledgeInTransaction(transaction);
-    String[] messageIDs = server.handleClientMessagesInTransaction(transaction, messages);
-    store.commitTransaction(transaction);
-
-    return messageIDs;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
deleted file mode 100644
index 0110f6ff46..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.bundle;
-
-import org.eclipse.net4j.jms.internal.server.Server;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.jms.server"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_STORE = DEBUG.tracer("store"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  static void start() throws Exception
-  {
-    Server.INSTANCE.activate();
-  }
-
-  static void stop() throws Exception
-  {
-    Server.INSTANCE.deactivate();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
deleted file mode 100644
index 4b2a1d30bd..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.jms.internal.server.ServerConnection;
-import org.eclipse.net4j.jms.internal.server.ServerSession;
-import org.eclipse.net4j.jms.internal.server.bundle.OM;
-import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSAcknowledgeIndication extends Indication
-{
-  public JMSAcknowledgeIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_ACKNOWLEDGE;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    int sessionID = in.readInt();
-
-    JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
-    ServerSession session = connection.getSession(sessionID);
-    if (session == null)
-    {
-      OM.LOG.info("Session " + sessionID + " not found. Acknowledgement discarded.");
-      return;
-    }
-
-    session.handleAcknowledge();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
deleted file mode 100644
index 0ce93b1cde..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.jms.util.MessageUtil;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.jms.internal.server.Server;
-import org.eclipse.net4j.jms.internal.server.ServerConnection;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSClientMessageIndication extends IndicationWithResponse
-{
-  private String messageID;
-
-  public JMSClientMessageIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_CLIENT_MESSAGE;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    MessageImpl[] messages = { MessageUtil.read(in) };
-    JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
-    Server server = connection.getServer();
-    String[] ids = server.handleClientMessages(messages);
-    if (ids != null && ids.length != 0)
-    {
-      messageID = ids[0];
-    }
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(messageID);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
deleted file mode 100644
index 364c3dd35a..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.jms.util.MessageUtil;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.jms.internal.server.ServerConnection;
-import org.eclipse.net4j.jms.internal.server.ServerSession;
-import org.eclipse.net4j.jms.internal.server.bundle.OM;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSCommitIndication extends IndicationWithResponse
-{
-  private String[] messageIDs;
-
-  public JMSCommitIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_COMMIT;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    int sessionID = in.readInt();
-    int size = in.readInt();
-    MessageImpl[] messages = new MessageImpl[size];
-    for (int i = 0; i < messages.length; i++)
-    {
-      messages[i] = MessageUtil.read(in);
-    }
-
-    JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
-    ServerSession session = connection.getSession(sessionID);
-    if (session == null)
-    {
-      OM.LOG.warn("Session " + sessionID + " not found");
-      return;
-    }
-
-    messageIDs = session.handleCommit(messages);
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    if (messageIDs == null)
-    {
-      out.writeInt(-1);
-    }
-    else
-    {
-      out.writeInt(messageIDs.length);
-      for (String messageID : messageIDs)
-      {
-        out.writeString(messageID);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
deleted file mode 100644
index 639928f44e..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.jms.internal.server.Server;
-import org.eclipse.net4j.jms.internal.server.ServerConnection;
-import org.eclipse.net4j.jms.internal.server.bundle.OM;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSLogonIndication extends IndicationWithResponse
-{
-  private boolean ok;
-
-  public JMSLogonIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_LOGON;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    String userName = in.readString();
-    String password = in.readString();
-    ServerConnection connection = Server.INSTANCE.logon(userName, password);
-    if (connection == null)
-    {
-      OM.LOG.error("Access to JMS server denied");
-      return;
-    }
-
-    JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    connection.setProtocol(protocol);
-    protocol.setInfraStructure(connection);
-    ok = true;
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeBoolean(ok);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
deleted file mode 100644
index c8c611bce3..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.jms.internal.server.ServerConnection;
-import org.eclipse.net4j.jms.internal.server.ServerSession;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSOpenSessionIndication extends IndicationWithResponse
-{
-  private boolean ok;
-
-  public JMSOpenSessionIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_OPEN_SESSION;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    int sessionID = in.readInt();
-    JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
-    ServerSession session = connection.openSession(sessionID);
-    if (session != null)
-    {
-      ok = true;
-    }
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeBoolean(ok);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
deleted file mode 100644
index f97ad56012..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.jms.internal.server.ServerConnection;
-import org.eclipse.net4j.jms.internal.server.ServerSession;
-import org.eclipse.net4j.jms.internal.server.bundle.OM;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSRecoverIndication extends IndicationWithResponse
-{
-  public JMSRecoverIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_RECOVER;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    int sessionID = in.readInt();
-    JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
-    ServerSession session = connection.getSession(sessionID);
-    if (session == null)
-    {
-      OM.LOG.warn("Session " + sessionID + " not found");
-      return;
-    }
-
-    session.handleRecover();
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
deleted file mode 100644
index 3678914912..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.internal.jms.DestinationImpl;
-import org.eclipse.net4j.internal.jms.util.DestinationUtil;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.jms.internal.server.ServerConnection;
-import org.eclipse.net4j.jms.internal.server.ServerSession;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSRegisterConsumerIndication extends IndicationWithResponse
-{
-  private long consumerID;
-
-  public JMSRegisterConsumerIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_REGISTER_CONSUMER;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    int sessionID = in.readInt();
-    DestinationImpl destination = DestinationUtil.read(in);
-    String messageSelector = in.readString();
-    boolean noLocal = in.readBoolean();
-    boolean durable = in.readBoolean();
-    JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
-    ServerSession session = connection.getSession(sessionID);
-    consumerID = session.registerConsumer(destination, messageSelector, noLocal, durable);
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeLong(consumerID);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
deleted file mode 100644
index adf7d2408f..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.jms.internal.server.ServerConnection;
-import org.eclipse.net4j.jms.internal.server.ServerSession;
-import org.eclipse.net4j.jms.internal.server.bundle.OM;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSRollbackIndication extends IndicationWithResponse
-{
-  public JMSRollbackIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_ROLLBACK;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    int sessionID = in.readInt();
-    JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
-    ServerSession session = connection.getSession(sessionID);
-    if (session == null)
-    {
-      OM.LOG.warn("Session " + sessionID + " not found");
-      return;
-    }
-
-    session.handleRecover();
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeBoolean(true);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
deleted file mode 100644
index 6df0efbb37..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.jms.util.MessageUtil;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSServerMessageRequest extends Request
-{
-  private int sessionID;
-
-  private long consumerID;
-
-  private MessageImpl message;
-
-  public JMSServerMessageRequest(IChannel channel, int sessionID, long consumerID, MessageImpl message)
-  {
-    super(channel);
-    this.sessionID = sessionID;
-    this.consumerID = consumerID;
-    this.message = message;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_SERVER_MESSAGE;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(sessionID);
-    out.writeLong(consumerID);
-    MessageUtil.write(out, message);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
deleted file mode 100644
index fb1707c0db..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
-
-/**
- * @author Eike Stepper
- */
-public class JMSServerProtocol extends SignalProtocol
-{
-  public JMSServerProtocol()
-  {
-  }
-
-  public String getType()
-  {
-    return JMSProtocolConstants.PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor doCreateSignalReactor(short signalID)
-  {
-    switch (signalID)
-    {
-    case JMSProtocolConstants.SIGNAL_SYNC:
-      return new JMSSyncIndication();
-
-    case JMSProtocolConstants.SIGNAL_LOGON:
-      return new JMSLogonIndication();
-
-    case JMSProtocolConstants.SIGNAL_OPEN_SESSION:
-      return new JMSOpenSessionIndication();
-
-    case JMSProtocolConstants.SIGNAL_REGISTER_CONSUMER:
-      return new JMSRegisterConsumerIndication();
-
-    case JMSProtocolConstants.SIGNAL_CLIENT_MESSAGE:
-      return new JMSClientMessageIndication();
-
-    case JMSProtocolConstants.SIGNAL_ACKNOWLEDGE:
-      return new JMSAcknowledgeIndication();
-
-    case JMSProtocolConstants.SIGNAL_RECOVER:
-      return new JMSRecoverIndication();
-
-    case JMSProtocolConstants.SIGNAL_COMMIT:
-      return new JMSCommitIndication();
-
-    case JMSProtocolConstants.SIGNAL_ROLLBACK:
-      return new JMSRollbackIndication();
-    }
-
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
deleted file mode 100644
index 739e8ba53c..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-import org.eclipse.internal.net4j.protocol.ServerProtocolFactory;
-
-/**
- * @author Eike Stepper
- */
-public final class JMSServerProtocolFactory extends ServerProtocolFactory
-{
-  public static final String TYPE = JMSProtocolConstants.PROTOCOL_NAME;
-
-  public JMSServerProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public JMSServerProtocol create(String description)
-  {
-    return new JMSServerProtocol();
-  }
-
-  public static JMSServerProtocol get(IManagedContainer container, String description)
-  {
-    return (JMSServerProtocol)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
deleted file mode 100644
index 01577a56cf..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSSyncIndication extends IndicationWithResponse
-{
-  public JMSSyncIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_SYNC;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeLong(System.currentTimeMillis());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
deleted file mode 100644
index 7778f463e0..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol.admin;
-
-import org.eclipse.net4j.jms.JMSAdminProtocolConstants;
-import org.eclipse.net4j.jms.server.IServer;
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
-
-/**
- * @author Eike Stepper
- */
-public class JMSAdminServerProtocol extends SignalProtocol
-{
-  public JMSAdminServerProtocol()
-  {
-  }
-
-  public String getType()
-  {
-    return JMSAdminProtocolConstants.PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor doCreateSignalReactor(short signalID)
-  {
-    switch (signalID)
-    {
-    case JMSAdminProtocolConstants.SIGNAL_CREATE_DESTINATION:
-      return new JMSCreateDestinationIndication();
-    }
-
-    return null;
-  }
-
-  public IServer getServer()
-  {
-    return IServer.INSTANCE;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
deleted file mode 100644
index e9dff046a1..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol.admin;
-
-import org.eclipse.net4j.jms.JMSAdminProtocolConstants;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-import org.eclipse.internal.net4j.protocol.ServerProtocolFactory;
-
-/**
- * @author Eike Stepper
- */
-public final class JMSAdminServerProtocolFactory extends ServerProtocolFactory
-{
-  public static final String TYPE = JMSAdminProtocolConstants.PROTOCOL_NAME;
-
-  public JMSAdminServerProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public JMSAdminServerProtocol create(String description)
-  {
-    return new JMSAdminServerProtocol();
-  }
-
-  public static JMSAdminServerProtocol get(IManagedContainer container, String description)
-  {
-    return (JMSAdminServerProtocol)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
deleted file mode 100644
index 3649a2149a..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.protocol.admin;
-
-import org.eclipse.net4j.jms.JMSAdminProtocolConstants;
-import org.eclipse.net4j.jms.server.IDestination;
-import org.eclipse.net4j.jms.server.IServer;
-import org.eclipse.net4j.jms.server.IDestination.Type;
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSCreateDestinationIndication extends IndicationWithResponse
-{
-  private boolean ok;
-
-  public JMSCreateDestinationIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSAdminProtocolConstants.SIGNAL_CREATE_DESTINATION;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    byte type = in.readByte();
-    String name = in.readString();
-    JMSAdminServerProtocol protocol = (JMSAdminServerProtocol)getProtocol();
-    IServer server = protocol.getServer();
-    IDestination destination = server.createDestination(name, getDestinationType(type));
-    if (destination != null)
-    {
-      ok = true;
-    }
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeBoolean(ok);
-  }
-
-  private Type getDestinationType(byte type)
-  {
-    switch (type)
-    {
-    case JMSAdminProtocolConstants.DESTINATION_TYPE_QUEUE:
-      return IDestination.Type.QUEUE;
-    case JMSAdminProtocolConstants.DESTINATION_TYPE_TOPIC:
-      return IDestination.Type.TOPIC;
-    }
-
-    throw new IllegalArgumentException("type: " + type);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java
deleted file mode 100644
index aa1bfa8305..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.store;
-
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.jms.server.IStore;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractStore extends Lifecycle implements IStore
-{
-  private String storeType;
-
-  private String instanceID;
-
-  public AbstractStore(String storeType)
-  {
-    this.storeType = storeType;
-  }
-
-  public String getStoreType()
-  {
-    return storeType;
-  }
-
-  public String getInstanceID()
-  {
-    return instanceID;
-  }
-
-  public void setInstanceID(String instanceID)
-  {
-    this.instanceID = instanceID;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
deleted file mode 100644
index 6deb70ed1c..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.store;
-
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.jms.internal.server.ServerConsumer;
-import org.eclipse.net4j.jms.internal.server.ServerDestination;
-import org.eclipse.net4j.jms.internal.server.bundle.OM;
-import org.eclipse.net4j.jms.server.IStoreTransaction;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractTransaction implements IStoreTransaction
-{
-  public static final String[] NO_DESTINATION_NAMES = new String[0];
-
-  public static final long[] NO_CONSUMER_IDS = new long[0];
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_STORE, AbstractTransaction.class);
-
-  private AbstractStore store;
-
-  public AbstractTransaction(AbstractStore store)
-  {
-    this.store = store;
-  }
-
-  public AbstractStore getStore()
-  {
-    return store;
-  }
-
-  public String[] getDestinationNames()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Getting destination names");
-    }
-
-    String[] names = doGetDestinationNames();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Got destination names " + names);
-    }
-
-    return names;
-  }
-
-  public ServerDestination getDestination(String name)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Getting destination " + name);
-    }
-
-    ServerDestination destination = doGetDestination(name);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Got destination " + destination);
-    }
-
-    return destination;
-  }
-
-  public long[] getConsumerIDs()
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Getting consumer IDs");
-    }
-
-    long[] ids = doGetConsumerIDs();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Got consumer IDs " + ids);
-    }
-
-    return ids;
-  }
-
-  public ServerConsumer getConsumer(long id)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Getting consumer " + id);
-    }
-
-    ServerConsumer consumer = doGetConsumer(id);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Got consumer " + consumer);
-    }
-
-    return consumer;
-  }
-
-  public void destinationAdded(ServerDestination destination)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Adding destination " + destination);
-    }
-
-    doDestinationAdded(destination);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Added destination " + destination);
-    }
-  }
-
-  public void destinationRemoved(ServerDestination destination)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Removing destination " + destination);
-    }
-
-    doDestinationRemoved(destination);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Removed destination " + destination);
-    }
-  }
-
-  public void consumerAdded(ServerConsumer consumer)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Adding consumer " + consumer);
-    }
-
-    doConsumerAdded(consumer);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Added consumer " + consumer);
-    }
-  }
-
-  public void consumerRemoved(ServerConsumer consumer)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Removing consumer " + consumer);
-    }
-
-    doConsumerRemoved(consumer);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Removed consumer " + consumer);
-    }
-  }
-
-  public void messageReceived(MessageImpl message)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Logging received message " + message);
-    }
-
-    doMessageReceived(message);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Logged received message " + message);
-    }
-  }
-
-  public void messageSent(MessageImpl message, long consumerID)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Logging sent message " + message);
-    }
-
-    doMessageSent(message, consumerID);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Logged sent message " + message);
-    }
-  }
-
-  public void messageAcknowledged(MessageImpl message, long consumerID)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Logging acknowledged message " + message);
-    }
-
-    doMessageAcknowledged(message, consumerID);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Logged acknowledged message " + message);
-    }
-  }
-
-  protected abstract String[] doGetDestinationNames();
-
-  protected abstract ServerDestination doGetDestination(String name);
-
-  protected abstract long[] doGetConsumerIDs();
-
-  protected abstract ServerConsumer doGetConsumer(long id);
-
-  protected abstract void doDestinationAdded(ServerDestination destination);
-
-  protected abstract void doDestinationRemoved(ServerDestination destination);
-
-  protected abstract void doConsumerAdded(ServerConsumer consumer);
-
-  protected abstract void doConsumerRemoved(ServerConsumer consumer);
-
-  protected abstract void doMessageReceived(MessageImpl message);
-
-  protected abstract void doMessageSent(MessageImpl message, long consumerID);
-
-  protected abstract void doMessageAcknowledged(MessageImpl message, long consumerID);
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java
deleted file mode 100644
index 0699374396..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.store;
-
-import org.eclipse.net4j.jms.server.IStoreTransaction;
-
-/**
- * @author Eike Stepper
- */
-public class NOOPStore extends AbstractStore
-{
-  private static final String STORE_TYPE = "NOOP";
-
-  public NOOPStore()
-  {
-    super(STORE_TYPE);
-    setInstanceID(STORE_TYPE);
-  }
-
-  public IStoreTransaction startTransaction()
-  {
-    return new NOOPTransaction(this);
-  }
-
-  public void commitTransaction(IStoreTransaction transaction)
-  {
-  }
-
-  public void rollbackTransaction(IStoreTransaction transaction)
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java
deleted file mode 100644
index 58f93624d4..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.store;
-
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.jms.internal.server.ServerConsumer;
-import org.eclipse.net4j.jms.internal.server.ServerDestination;
-
-/**
- * @author Eike Stepper
- */
-public class NOOPTransaction extends AbstractTransaction
-{
-  public NOOPTransaction(AbstractStore store)
-  {
-    super(store);
-  }
-
-  @Override
-  protected String[] doGetDestinationNames()
-  {
-    return NO_DESTINATION_NAMES;
-  }
-
-  @Override
-  protected ServerDestination doGetDestination(String name)
-  {
-    return null;
-  }
-
-  @Override
-  protected long[] doGetConsumerIDs()
-  {
-    return NO_CONSUMER_IDS;
-  }
-
-  @Override
-  protected ServerConsumer doGetConsumer(long id)
-  {
-    return null;
-  }
-
-  @Override
-  protected void doDestinationAdded(ServerDestination destination)
-  {
-  }
-
-  @Override
-  protected void doDestinationRemoved(ServerDestination destination)
-  {
-  }
-
-  @Override
-  protected void doConsumerAdded(ServerConsumer consumer)
-  {
-  }
-
-  @Override
-  protected void doConsumerRemoved(ServerConsumer consumer)
-  {
-  }
-
-  @Override
-  protected void doMessageReceived(MessageImpl message)
-  {
-  }
-
-  @Override
-  protected void doMessageSent(MessageImpl message, long consumerID)
-  {
-  }
-
-  @Override
-  protected void doMessageAcknowledged(MessageImpl message, long consumerID)
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java
deleted file mode 100644
index 87736e7d46..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.internal.server.store;
-
-/**
- * @author Eike Stepper
- */
-public class StoreException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public StoreException()
-  {
-  }
-
-  public StoreException(String message)
-  {
-    super(message);
-  }
-
-  public StoreException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public StoreException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java
deleted file mode 100644
index 0f105dbcec..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server;
-
-/**
- * @author Eike Stepper
- */
-public interface IConnection
-{
-  public IServer getServer();
-
-  public String getUserName();
-
-  public ISession openSession(int sessionID);
-
-  public ISession getSession(int sessionID);
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java
deleted file mode 100644
index 0b472cfc55..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server;
-
-/**
- * @author Eike Stepper
- */
-public interface IDestination
-{
-  public String getName();
-
-  public Type getType();
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum Type
-  {
-    QUEUE, TOPIC;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java
deleted file mode 100644
index 3dae4fbaf1..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server;
-
-import org.eclipse.net4j.jms.internal.server.Server;
-
-/**
- * @author Eike Stepper
- */
-public interface IServer
-{
-  public static final IServer INSTANCE = Server.INSTANCE;
-
-  public IDestination createDestination(String name, IDestination.Type type);
-
-  public IConnection logon(String userName, String password);
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java
deleted file mode 100644
index 73c630e72f..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server;
-
-/**
- * @author Eike Stepper
- */
-public interface ISession
-{
-  public IConnection getConnection();
-
-  public int getID();
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java
deleted file mode 100644
index c0704ca8ec..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server;
-
-/**
- * @author Eike Stepper
- */
-public interface IStore
-{
-  public String getStoreType();
-
-  public String getInstanceID();
-
-  public IStoreTransaction startTransaction();
-
-  public void commitTransaction(IStoreTransaction transaction);
-
-  public void rollbackTransaction(IStoreTransaction transaction);
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
deleted file mode 100644
index 767c52431f..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server;
-
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.jms.internal.server.ServerConsumer;
-import org.eclipse.net4j.jms.internal.server.ServerDestination;
-
-/**
- * @author Eike Stepper
- */
-public interface IStoreTransaction
-{
-  public String[] getDestinationNames();
-
-  public ServerDestination getDestination(String name);
-
-  public long[] getConsumerIDs();
-
-  public ServerConsumer getConsumer(long id);
-
-  public void destinationAdded(ServerDestination destination);
-
-  public void destinationRemoved(ServerDestination destination);
-
-  public void consumerAdded(ServerConsumer consumer);
-
-  public void consumerRemoved(ServerConsumer consumer);
-
-  public void messageReceived(MessageImpl message);
-
-  public void messageSent(MessageImpl message, long consumerID);
-
-  public void messageAcknowledged(MessageImpl message, long consumerID);
-}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java
deleted file mode 100644
index e1e76163cf..0000000000
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.server;
-
-import org.eclipse.net4j.jms.internal.server.protocol.JMSServerProtocolFactory;
-import org.eclipse.net4j.jms.internal.server.protocol.admin.JMSAdminServerProtocolFactory;
-import org.eclipse.net4j.jms.internal.server.store.NOOPStore;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public final class JMSServerUtil
-{
-  private JMSServerUtil()
-  {
-  }
-
-  public static void prepareContainer(IManagedContainer container)
-  {
-    container.registerFactory(new JMSServerProtocolFactory());
-    container.registerFactory(new JMSAdminServerProtocolFactory());
-  }
-
-  public static IStore createNOOPStore()
-  {
-    return new NOOPStore();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.tests/.classpath b/plugins/org.eclipse.net4j.jms.tests/.classpath
deleted file mode 100644
index 8ea86b68f4..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/.classpath
+++ /dev/null
@@ -1,8 +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 combineaccessrules="false" kind="src" path="/org.eclipse.net4j.db.derby"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.net4j.jms.tests/.cvsignore b/plugins/org.eclipse.net4j.jms.tests/.cvsignore
deleted file mode 100644
index 18ace54cb8..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-*.log
diff --git a/plugins/org.eclipse.net4j.jms.tests/.project b/plugins/org.eclipse.net4j.jms.tests/.project
deleted file mode 100644
index 417871d1db..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.jms.tests</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ec934a6b9e..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,272 +0,0 @@
-#Sat Feb 23 10:50:44 CET 2008
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 6f1c42645b..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:50:44 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.jms.tests/JMSSeparatedTest.launch b/plugins/org.eclipse.net4j.jms.tests/JMSSeparatedTest.launch
deleted file mode 100644
index b1506d86da..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/JMSSeparatedTest.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.jms.tests.JMSSeparatedTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.jms.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.naming.factory.initial=com.sun.jndi.rmi.registry.RegistryContextFactory&#13;&#10;-Djava.naming.provider.url=rmi://localhost:1199&#13;&#10;-Dnet4j.config=config"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.jms.tests/JMSTest.launch b/plugins/org.eclipse.net4j.jms.tests/JMSTest.launch
deleted file mode 100644
index 202d555696..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/JMSTest.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.jms.tests.JMSTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.jms.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.naming.factory.initial=com.sun.jndi.rmi.registry.RegistryContextFactory&#13;&#10;-Djava.naming.provider.url=rmi://localhost:1199&#13;&#10;-Dnet4j.config=config"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 763678238a..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.jms.tests
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.tcp,
- org.eclipse.net4j.jms,
- org.eclipse.net4j.jms.admin,
- org.eclipse.net4j.jms.server,
- org.eclipse.net4j.jms.server.jdbc
-Import-Package: javax.jms;version="1.1.0"
diff --git a/plugins/org.eclipse.net4j.jms.tests/RMIRegistry.launch b/plugins/org.eclipse.net4j.jms.tests/RMIRegistry.launch
deleted file mode 100644
index ed57c0f7a4..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/RMIRegistry.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="CLASSPATH" value="${workspace_loc}/org.eclipse.net4j.jms.api/lib/jms.jar;${workspace_loc}/org.eclipse.net4j.jms/bin"/>
-</mapAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_property:java.home}/bin/rmiregistry.exe"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="1199"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.net4j.tests}"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.jms.tests/about.html b/plugins/org.eclipse.net4j.jms.tests/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/about.html
+++ /dev/null
@@ -1,28 +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.jms.tests/build.properties b/plugins/org.eclipse.net4j.jms.tests/build.properties
deleted file mode 100644
index 3a47064c16..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               config/
diff --git a/plugins/org.eclipse.net4j.jms.tests/config/org.eclipse.net4j.jms.server.jdbc.properties b/plugins/org.eclipse.net4j.jms.tests/config/org.eclipse.net4j.jms.server.jdbc.properties
deleted file mode 100644
index d924de99cd..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/config/org.eclipse.net4j.jms.server.jdbc.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-store.instanceID          = TEST0001
-store.dbAdapter           = derby
-
-datasource.class          = org.apache.derby.jdbc.EmbeddedDataSource
-datasource.databaseName   = C:/temp/jmsdb
-datasource.createDatabase = create
diff --git a/plugins/org.eclipse.net4j.jms.tests/copyright.txt b/plugins/org.eclipse.net4j.jms.tests/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.tests/epl-v10.html b/plugins/org.eclipse.net4j.jms.tests/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.tests/license.html b/plugins/org.eclipse.net4j.jms.tests/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms.tests/plugin.properties b/plugins/org.eclipse.net4j.jms.tests/plugin.properties
deleted file mode 100644
index a8aee170a3..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j JMS Tests (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java
deleted file mode 100644
index 1af652eadb..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.tests;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.internal.derby.EmbeddedDerbyAdapter;
-import org.eclipse.net4j.internal.util.container.ManagedContainer;
-import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
-import org.eclipse.net4j.jms.JMSInitialContext;
-import org.eclipse.net4j.jms.JMSUtil;
-import org.eclipse.net4j.jms.admin.IJMSAdmin;
-import org.eclipse.net4j.jms.admin.JMSAdminUtil;
-import org.eclipse.net4j.jms.internal.server.Server;
-import org.eclipse.net4j.jms.server.IStore;
-import org.eclipse.net4j.jms.server.JMSServerUtil;
-import org.eclipse.net4j.jms.server.jdbc.JDBCUtil;
-import org.eclipse.net4j.tcp.TCPUtil;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.om.OMPlatform;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-public class JMSSeparatedTest
-{
-  public static void main(String[] args) throws Exception
-  {
-    try
-    {
-      Context context = init();
-      ConnectionFactory connectionFactory = (ConnectionFactory)context.lookup("net4j.jms.ConnectionFactory");
-      Destination destination = (Destination)context.lookup("StockTopic");
-
-      Connection connection = connectionFactory.createConnection();
-      Session session = connection.createSession(true, 0);
-
-      MessageProducer publisher = session.createProducer(destination);
-      MessageConsumer subscriber1 = session.createConsumer(destination);
-      MessageConsumer subscriber2 = session.createConsumer(destination);
-      subscriber1.setMessageListener(new MessageLogger("subscriber1"));
-      subscriber2.setMessageListener(new MessageLogger("subscriber2"));
-
-      connection.start();
-
-      publisher.send(session.createObjectMessage("Message 1"));
-      publisher.send(session.createObjectMessage("Message 2"));
-      publisher.send(session.createObjectMessage("Message 3"));
-      publisher.send(session.createObjectMessage("Message 4"));
-
-      session.commit();
-    }
-    finally
-    {
-      ConcurrencyUtil.sleep(500);
-      Server.INSTANCE.deactivate();
-    }
-  }
-
-  private static Context init() throws Exception
-  {
-    OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
-    OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-    OMPlatform.INSTANCE.setDebugging(true);
-
-    initServer();
-    return initClient();
-  }
-
-  private static void initServer() throws Exception
-  {
-    IDBAdapter.REGISTRY.put(EmbeddedDerbyAdapter.NAME, new EmbeddedDerbyAdapter());
-    IStore store = JDBCUtil.getStore();
-    Server.INSTANCE.setStore(store);
-    Server.INSTANCE.activate();
-
-    IManagedContainer serverContainer = new ManagedContainer();
-    Net4jUtil.prepareContainer(serverContainer);
-    TCPUtil.prepareContainer(serverContainer);
-    JMSServerUtil.prepareContainer(serverContainer);
-
-    TCPUtil.getAcceptor(serverContainer, null);
-  }
-
-  private static Context initClient() throws NamingException
-  {
-    IManagedContainer clientContainer = new ManagedContainer();
-    Net4jUtil.prepareContainer(clientContainer);
-    TCPUtil.prepareContainer(clientContainer);
-    JMSUtil.prepareContainer(clientContainer);
-    JMSAdminUtil.prepareContainer(clientContainer);
-
-    IConnector connector = TCPUtil.getConnector(clientContainer, "localhost");
-
-    IJMSAdmin admin = JMSAdminUtil.createAdmin(connector);
-    admin.createQueue("StockQueue");
-    admin.createTopic("StockTopic");
-
-    return new JMSInitialContext(clientContainer);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class MessageLogger implements MessageListener
-  {
-    private String name;
-
-    public MessageLogger(String name)
-    {
-      this.name = name;
-    }
-
-    public void onMessage(Message message)
-    {
-      try
-      {
-        Object object = ((ObjectMessage)message).getObject();
-        IOUtil.OUT().println("\n------> MESSAGE for " + name + ": " + object + "\n");
-        message.acknowledge();
-      }
-      catch (JMSException ex)
-      {
-        ex.printStackTrace();
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java
deleted file mode 100644
index 19d76e1978..0000000000
--- a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms.tests;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.internal.derby.EmbeddedDerbyAdapter;
-import org.eclipse.net4j.internal.util.container.ManagedContainer;
-import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
-import org.eclipse.net4j.jms.JMSInitialContext;
-import org.eclipse.net4j.jms.JMSUtil;
-import org.eclipse.net4j.jms.admin.IJMSAdmin;
-import org.eclipse.net4j.jms.admin.JMSAdminUtil;
-import org.eclipse.net4j.jms.internal.server.Server;
-import org.eclipse.net4j.jms.server.IStore;
-import org.eclipse.net4j.jms.server.JMSServerUtil;
-import org.eclipse.net4j.jms.server.jdbc.JDBCUtil;
-import org.eclipse.net4j.tcp.TCPUtil;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.om.OMPlatform;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.naming.Context;
-
-public class JMSTest
-{
-  public static void main(String[] args) throws Exception
-  {
-    try
-    {
-      Context context = init();
-      ConnectionFactory connectionFactory = (ConnectionFactory)context.lookup("net4j.jms.ConnectionFactory");
-      Destination destination = (Destination)context.lookup("StockTopic");
-
-      Connection connection = connectionFactory.createConnection();
-      Session session = connection.createSession(true, 0);
-
-      MessageProducer publisher = session.createProducer(destination);
-      MessageConsumer subscriber1 = session.createConsumer(destination);
-      MessageConsumer subscriber2 = session.createConsumer(destination);
-      subscriber1.setMessageListener(new MessageLogger("subscriber1"));
-      subscriber2.setMessageListener(new MessageLogger("subscriber2"));
-
-      connection.start();
-
-      publisher.send(session.createObjectMessage("Message 1"));
-      publisher.send(session.createObjectMessage("Message 2"));
-      publisher.send(session.createObjectMessage("Message 3"));
-      publisher.send(session.createObjectMessage("Message 4"));
-
-      session.commit();
-    }
-    finally
-    {
-      ConcurrencyUtil.sleep(500);
-      Server.INSTANCE.deactivate();
-    }
-  }
-
-  private static Context init() throws Exception
-  {
-    OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
-    OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-    OMPlatform.INSTANCE.setDebugging(true);
-
-    IDBAdapter.REGISTRY.put(EmbeddedDerbyAdapter.NAME, new EmbeddedDerbyAdapter());
-    IStore store = JDBCUtil.getStore();
-    Server.INSTANCE.setStore(store);
-    Server.INSTANCE.activate();
-
-    IManagedContainer container = new ManagedContainer();
-    Net4jUtil.prepareContainer(container);
-    TCPUtil.prepareContainer(container);
-    JMSUtil.prepareContainer(container);
-    JMSServerUtil.prepareContainer(container);
-    JMSAdminUtil.prepareContainer(container);
-
-    TCPUtil.getAcceptor(container, null);
-    IConnector connector = TCPUtil.getConnector(container, "localhost");
-
-    IJMSAdmin admin = JMSAdminUtil.createAdmin(connector);
-    admin.createQueue("StockQueue");
-    admin.createTopic("StockTopic");
-
-    return new JMSInitialContext(container);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class MessageLogger implements MessageListener
-  {
-    private String name;
-
-    public MessageLogger(String name)
-    {
-      this.name = name;
-    }
-
-    public void onMessage(Message message)
-    {
-      try
-      {
-        Object object = ((ObjectMessage)message).getObject();
-        IOUtil.OUT().println("\n------> MESSAGE for " + name + ": " + object + "\n");
-        message.acknowledge();
-      }
-      catch (JMSException ex)
-      {
-        ex.printStackTrace();
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/.classpath b/plugins/org.eclipse.net4j.jms/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.jms/.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.jms/.cvsignore b/plugins/org.eclipse.net4j.jms/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/plugins/org.eclipse.net4j.jms/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.net4j.jms/.options b/plugins/org.eclipse.net4j.jms/.options
deleted file mode 100644
index f67a398eae..0000000000
--- a/plugins/org.eclipse.net4j.jms/.options
+++ /dev/null
@@ -1,5 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.jms/debug = true
-
-org.eclipse.net4j.jms/debug.protocol = true
diff --git a/plugins/org.eclipse.net4j.jms/.project b/plugins/org.eclipse.net4j.jms/.project
deleted file mode 100644
index d71302b1e7..0000000000
--- a/plugins/org.eclipse.net4j.jms/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.jms</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 27270a1a72..0000000000
--- a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,272 +0,0 @@
-#Sat Feb 23 10:51:37 CET 2008
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 3686d07c53..0000000000
--- a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:51:37 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.jms/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
deleted file mode 100644
index a09de597e4..0000000000
--- a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.jms
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.internal.jms.bundle.OM$Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j;visibility:=reexport
-Import-Package: javax.jms;version="1.1.0"
-Export-Package: org.eclipse.net4j.internal.jms;version="0.8.0",
- org.eclipse.net4j.internal.jms.protocol;version="0.8.0",
- org.eclipse.net4j.internal.jms.util;version="0.8.0",
- org.eclipse.net4j.jms;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.jms/about.html b/plugins/org.eclipse.net4j.jms/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.jms/about.html
+++ /dev/null
@@ -1,28 +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.jms/build.properties b/plugins/org.eclipse.net4j.jms/build.properties
deleted file mode 100644
index 8edf2b291f..0000000000
--- a/plugins/org.eclipse.net4j.jms/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties
diff --git a/plugins/org.eclipse.net4j.jms/copyright.txt b/plugins/org.eclipse.net4j.jms/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.jms/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms/epl-v10.html b/plugins/org.eclipse.net4j.jms/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms/license.html b/plugins/org.eclipse.net4j.jms/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jms/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms/plugin.properties b/plugins/org.eclipse.net4j.jms/plugin.properties
deleted file mode 100644
index 277c36b63a..0000000000
--- a/plugins/org.eclipse.net4j.jms/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j JMS (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
deleted file mode 100644
index 594c8b4ada..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.Message;
-
-import java.io.IOException;
-
-public class BytesMessageImpl extends MessageImpl implements BytesMessage
-{
-  public long getBodyLength()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public boolean readBoolean()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public byte readByte()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public int readBytes(byte[] value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public int readBytes(byte[] value, int length)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public char readChar()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public double readDouble()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public float readFloat()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public int readInt()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public long readLong()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public short readShort()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public String readUTF()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public int readUnsignedByte()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public int readUnsignedShort()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void reset()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeBoolean(boolean value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeByte(byte value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeBytes(byte[] value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeBytes(byte[] value, int offset, int length)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeChar(char value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeDouble(double value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeFloat(float value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeInt(int value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeLong(long value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeObject(Object value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeShort(short value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeUTF(String value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  @Override
-  public void populate(Message source) throws JMSException
-  {
-    super.populate(source);
-    byte[] buffer = new byte[512];
-    BytesMessage bytes = (BytesMessage)source;
-
-    bytes.reset();
-    int count;
-    while ((count = bytes.readBytes(buffer)) != -1)
-    {
-      writeBytes(buffer, 0, count);
-    }
-  }
-
-  @Override
-  public void write(ExtendedDataOutputStream out) throws IOException
-  {
-    super.write(out);
-  }
-
-  @Override
-  public void read(ExtendedDataInputStream in) throws IOException
-  {
-    super.read(in);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
deleted file mode 100644
index 921df3c369..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-
-import java.io.Serializable;
-import java.rmi.Remote;
-
-public class ConnectionFactoryImpl implements ConnectionFactory, Remote, Serializable
-{
-  private static final long serialVersionUID = 1L;
-
-  private String connectorType;
-
-  private String connectorDescription;
-
-  private Object transportContainer;
-
-  public ConnectionFactoryImpl(String connectorType, String connectorDescription)
-  {
-    this.connectorType = connectorType;
-    this.connectorDescription = connectorDescription;
-  }
-
-  public String getConnectorType()
-  {
-    return connectorType;
-  }
-
-  public String getConnectorDescription()
-  {
-    return connectorDescription;
-  }
-
-  public Object getTransportContainer()
-  {
-    return transportContainer;
-  }
-
-  public void setTransportContainer(Object transportContainer)
-  {
-    this.transportContainer = transportContainer;
-  }
-
-  public Connection createConnection() throws JMSException
-  {
-    return createConnection(null, null);
-  }
-
-  public Connection createConnection(String userName, String password) throws JMSException
-  {
-    return new ConnectionImpl((IManagedContainer)transportContainer, connectorType, connectorDescription, userName,
-        password);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
deleted file mode 100644
index 435040e92d..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.jms.bundle.OM;
-import org.eclipse.net4j.internal.jms.protocol.JMSClientProtocol;
-import org.eclipse.net4j.internal.jms.protocol.JMSLogonRequest;
-import org.eclipse.net4j.internal.jms.protocol.JMSOpenSessionRequest;
-import org.eclipse.net4j.internal.util.container.Container;
-import org.eclipse.net4j.internal.util.container.LifecycleEventConverter;
-import org.eclipse.net4j.internal.util.container.SingleDeltaContainerEvent;
-import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter;
-import org.eclipse.net4j.jms.JMSUtil;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.container.IContainerDelta.Kind;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionConsumer;
-import javax.jms.ConnectionMetaData;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.ServerSessionPool;
-import javax.jms.Session;
-import javax.jms.Topic;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ConnectionImpl extends Container<Session> implements Connection
-{
-  private String connectorType;
-
-  private String connectorDescription;
-
-  private String userName;
-
-  private String password;
-
-  private ExceptionListener exceptionListener;
-
-  private String clientID;
-
-  private ConnectionMetaData metaData = new ConnectionMetaDataImpl(this);
-
-  private long sendTimeout = 2500;
-
-  private IManagedContainer transportContainer;
-
-  private IChannel channel;
-
-  private List<SessionImpl> sessions = new ArrayList<SessionImpl>(0);
-
-  private transient IListener sessionListener = new LifecycleEventConverter<Session>(this)
-  {
-
-    @Override
-    protected IContainerEvent<Session> createContainerEvent(IContainer<Session> container, Session element, Kind kind)
-    {
-      if (kind == IContainerDelta.Kind.REMOVED)
-      {
-        removeSession((SessionImpl)element);
-      }
-
-      return new SingleDeltaContainerEvent<Session>(container, element, kind);
-    }
-  };
-
-  private transient IListener channelListener = new LifecycleEventAdapter()
-  {
-    @Override
-    protected void onDeactivated(ILifecycle lifecycle)
-    {
-      close();
-    }
-  };
-
-  private boolean modified = false;
-
-  private boolean stopped = true;
-
-  public ConnectionImpl(IManagedContainer transportContainer, String connectorType, String connectorDescription,
-      String userName, String password) throws JMSException
-  {
-    this.transportContainer = transportContainer == null ? JMSUtil.getTransportContainer() : transportContainer;
-    if (transportContainer == null)
-    {
-      throw new JMSException("No transport container available");
-    }
-
-    this.connectorType = connectorType;
-    this.connectorDescription = connectorDescription;
-    this.userName = userName;
-    this.password = password;
-
-    IConnector connector = Net4jUtil.getConnector(transportContainer, connectorType, connectorDescription);
-    JMSClientProtocol protocol = new JMSClientProtocol();
-    protocol.setInfraStructure(this);
-    channel = connector.openChannel(protocol);
-    channel.addListener(channelListener);
-
-    try
-    {
-      if (!new JMSLogonRequest(channel, userName, password).send())
-      {
-        throw new JMSException("Server rejected logon request");
-      }
-    }
-    catch (JMSException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new JMSException(ex.getMessage());
-    }
-  }
-
-  public ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
-      ServerSessionPool sessionPool, int maxMessages)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName,
-      String messageSelector, ServerSessionPool sessionPool, int maxMessages)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public Session createSession(boolean transacted, int acknowledgeMode) throws JMSException
-  {
-    ensureOpen();
-    setModified();
-    int sessionID = findFreeSessionID();
-    SessionImpl session = new SessionImpl(this, sessionID, transacted, acknowledgeMode);
-    addSession(session);
-
-    try
-    {
-      if (!new JMSOpenSessionRequest(channel, sessionID).send())
-      {
-        throw new JMSException("Server rejected open session request");
-      }
-    }
-    catch (JMSException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new JMSException(ex.getMessage());
-    }
-
-    return session;
-  }
-
-  public IManagedContainer getTransportContainer()
-  {
-    return transportContainer;
-  }
-
-  public String getConnectorType()
-  {
-    return connectorType;
-  }
-
-  public String getConnectorDescription()
-  {
-    return connectorDescription;
-  }
-
-  public String getUserName()
-  {
-    return userName;
-  }
-
-  public String getPassword()
-  {
-    return password;
-  }
-
-  public ConnectionMetaData getMetaData()
-  {
-    ensureOpen();
-    setModified();
-    return metaData;
-  }
-
-  public String getClientID()
-  {
-    ensureOpen();
-    setModified();
-    return clientID;
-  }
-
-  public void setClientID(String clientID)
-  {
-    ensureOpen();
-    if (clientID != null)
-    {
-      throw new IllegalStateException("clientID != null");
-    }
-
-    if (modified)
-    {
-      throw new IllegalStateException("modified == true");
-    }
-
-    this.clientID = clientID;
-  }
-
-  public ExceptionListener getExceptionListener()
-  {
-    ensureOpen();
-    setModified();
-    return exceptionListener;
-  }
-
-  public void setExceptionListener(ExceptionListener listener)
-  {
-    ensureOpen();
-    setModified();
-    exceptionListener = listener;
-  }
-
-  public long getSendTimeout()
-  {
-    return sendTimeout;
-  }
-
-  public void setSendTimeout(long sendTimeout)
-  {
-    this.sendTimeout = sendTimeout;
-  }
-
-  public synchronized void start() throws JMSException
-  {
-    ensureOpen();
-    setModified();
-    if (stopped)
-    {
-      for (SessionImpl session : getSessions())
-      {
-        try
-        {
-          session.activate();
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-          throw new JMSException(ex.getMessage());
-        }
-      }
-
-      stopped = false;
-    }
-  }
-
-  public synchronized void stop()
-  {
-    ensureOpen();
-    setModified();
-    if (!stopped)
-    {
-      for (SessionImpl session : getSessions())
-      {
-        session.deactivate();
-      }
-
-      stopped = true;
-    }
-  }
-
-  public synchronized void close()
-  {
-    if (channel != null)
-    {
-      stop();
-      for (SessionImpl session : getSessions())
-      {
-        session.close();
-      }
-
-      channel.removeListener(channelListener);
-      channel.close();
-      channel = null;
-    }
-  }
-
-  public IChannel getChannel()
-  {
-    return channel;
-  }
-
-  public void handleMessageFromSignal(int sessionID, long consumerID, MessageImpl message)
-  {
-    SessionImpl session = sessions.get(sessionID);
-    session.handleServerMessage(consumerID, message);
-  }
-
-  public SessionImpl[] getSessions()
-  {
-    List<SessionImpl> result = new ArrayList<SessionImpl>(sessions.size());
-    synchronized (sessions)
-    {
-      for (SessionImpl session : sessions)
-      {
-        if (session != null)
-        {
-          result.add(session);
-        }
-      }
-    }
-
-    return result.toArray(new SessionImpl[result.size()]);
-  }
-
-  public Session[] getElements()
-  {
-    return getSessions();
-  }
-
-  @Override
-  public boolean isEmpty()
-  {
-    return getSessions().length == 0;
-  }
-
-  private int findFreeSessionID()
-  {
-    synchronized (sessions)
-    {
-      int size = sessions.size();
-      for (int i = 0; i < size; i++)
-      {
-        if (sessions.get(i) == null)
-        {
-          return i;
-        }
-      }
-
-      return size;
-    }
-  }
-
-  private void addSession(SessionImpl session)
-  {
-    synchronized (sessions)
-    {
-      int sessionID = session.getID();
-      while (sessionID >= sessions.size())
-      {
-        sessions.add(null);
-      }
-
-      sessions.set(sessionID, session);
-    }
-  }
-
-  private boolean removeSession(SessionImpl session)
-  {
-    synchronized (sessions)
-    {
-      int sessionID = session.getID();
-      if (sessions.get(sessionID) == session)
-      {
-        session.removeListener(sessionListener);
-        sessions.set(sessionID, null);
-        return true;
-      }
-
-      return false;
-    }
-  }
-
-  private void setModified()
-  {
-    modified = true;
-  }
-
-  private void ensureOpen() throws IllegalStateException
-  {
-    if (channel == null)
-    {
-      throw new IllegalStateException("channel == null");
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
deleted file mode 100644
index 996de7f3a8..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.ConnectionMetaData;
-
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-
-public class ConnectionMetaDataImpl implements ConnectionMetaData
-{
-  private ConnectionImpl connection;
-
-  public ConnectionMetaDataImpl(ConnectionImpl connection)
-  {
-    this.connection = connection;
-  }
-
-  public ConnectionImpl getConnection()
-  {
-    return connection;
-  }
-
-  public int getJMSMajorVersion()
-  {
-    return 1;
-  }
-
-  public int getJMSMinorVersion()
-  {
-    return 1;
-  }
-
-  public String getJMSVersion()
-  {
-    return "1.1";
-  }
-
-  public String getJMSProviderName()
-  {
-    return "Net4j JMS";
-  }
-
-  public int getProviderMajorVersion()
-  {
-    return 0;
-  }
-
-  public int getProviderMinorVersion()
-  {
-    return 8;
-  }
-
-  public String getProviderVersion()
-  {
-    return "0.8.0";
-  }
-
-  public Enumeration<?> getJMSXPropertyNames()
-  {
-    return new StringTokenizer("");
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java
deleted file mode 100644
index 899748b210..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import java.io.Serializable;
-import java.rmi.Remote;
-
-public abstract class DestinationImpl implements JMSDestination, Remote, Serializable
-{
-  private static final long serialVersionUID = 1L;
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java
deleted file mode 100644
index bcb39bff5d..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.Destination;
-
-public interface JMSDestination extends Destination
-{
-  public String getName();
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java
deleted file mode 100644
index 5cc1e2d06b..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-public interface JMSTemporaryDestination extends JMSDestination
-{
-  public ConnectionImpl getOwningConnection();
-
-  public long getConnectionId();
-
-  public boolean validForConnection(ConnectionImpl connection);
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
deleted file mode 100644
index 424ce1904a..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-
-import java.io.IOException;
-import java.util.Enumeration;
-
-public class MapMessageImpl extends MessageImpl implements MapMessage
-{
-  public boolean getBoolean(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public byte getByte(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public byte[] getBytes(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public char getChar(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public double getDouble(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public float getFloat(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public int getInt(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public long getLong(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public Enumeration<?> getMapNames()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public Object getObject(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public short getShort(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public String getString(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public boolean itemExists(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setBoolean(String name, boolean value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setByte(String name, byte value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setBytes(String name, byte[] value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setBytes(String name, byte[] value, int offset, int length)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setChar(String name, char value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setDouble(String name, double value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setFloat(String name, float value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setInt(String name, int value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setLong(String name, long value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setObject(String name, Object value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setShort(String name, short value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void setString(String name, String value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  @Override
-  public void populate(Message source) throws JMSException
-  {
-    super.populate(source);
-    MapMessage map = (MapMessage)source;
-    Enumeration<?> e = map.getMapNames();
-    while (e.hasMoreElements())
-    {
-      String name = (String)e.nextElement();
-      Object value = map.getObject(name);
-      setObject(name, value);
-    }
-  }
-
-  @Override
-  public void write(ExtendedDataOutputStream out) throws IOException
-  {
-    super.write(out);
-  }
-
-  @Override
-  public void read(ExtendedDataInputStream in) throws IOException
-  {
-    super.read(in);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
deleted file mode 100644
index e4a5a997d6..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.internal.jms.bundle.OM;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-public class MessageConsumerImpl extends Lifecycle implements MessageConsumer
-{
-  private static final long DO_NOT_WAIT = -1L;
-
-  private SessionImpl session;
-
-  private long consumerID;
-
-  private DestinationImpl destination;
-
-  private String messageSelector;
-
-  private MessageListener messageListener;
-
-  /**
-   * Incoming messages
-   */
-  private BlockingQueue<MessageImpl> messages = new LinkedBlockingQueue<MessageImpl>();
-
-  public MessageConsumerImpl(SessionImpl session, long consumerID, DestinationImpl destination, String messageSelector)
-  {
-    this.session = session;
-    this.consumerID = consumerID;
-    this.destination = destination;
-    this.messageSelector = messageSelector;
-  }
-
-  public SessionImpl getSession()
-  {
-    return session;
-  }
-
-  public long getConsumerID()
-  {
-    return consumerID;
-  }
-
-  public DestinationImpl getDestination()
-  {
-    return destination;
-  }
-
-  public String getMessageSelector()
-  {
-    return messageSelector;
-  }
-
-  public MessageListener getMessageListener()
-  {
-    return messageListener;
-  }
-
-  public void setMessageListener(MessageListener listener)
-  {
-    messageListener = listener;
-    if (messageListener != null)
-    {
-      session.addWork(this);
-    }
-  }
-
-  public Message receive() throws JMSException
-  {
-    return receive(Long.MAX_VALUE);
-  }
-
-  public Message receive(long timeout) throws JMSException
-  {
-    if (messageListener != null)
-    {
-      throw new JMSException("Consumer is configured for asynchronous delivery");
-    }
-
-    if (timeout == DO_NOT_WAIT)
-    {
-      return messages.poll();
-    }
-
-    try
-    {
-      return messages.poll(timeout, TimeUnit.MILLISECONDS);
-    }
-    catch (InterruptedException ex)
-    {
-      throw new JMSException(ex.getMessage());
-    }
-  }
-
-  public Message receiveNoWait() throws JMSException
-  {
-    return receive(DO_NOT_WAIT);
-  }
-
-  public void close()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void handleServerMessage(MessageImpl message)
-  {
-    messages.add(message);
-    if (messageListener != null)
-    {
-      session.addWork(this);
-    }
-  }
-
-  public void dispatchMessage()
-  {
-    MessageListener listener = messageListener;
-    if (listener != null)
-    {
-      MessageImpl message = messages.poll();
-      if (message == null)
-      {
-        OM.LOG.warn("No message to dispatch");
-        return;
-      }
-
-      try
-      {
-        listener.onMessage(message);
-        if (!session.getTransacted() && session.getAcknowledgeMode() != Session.CLIENT_ACKNOWLEDGE)
-        {
-          session.acknowledgeMessages(this);
-        }
-      }
-      catch (RuntimeException ex)
-      {
-        OM.LOG.warn(ex);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
deleted file mode 100644
index e2075051cc..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.internal.jms.util.DestinationUtil;
-import org.eclipse.net4j.internal.jms.util.TypeUtil;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageFormatException;
-import javax.jms.Session;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-public class MessageImpl implements Message, Comparable<MessageImpl>
-{
-  private static final String[] KEYWORDS = { "and", "between", "escape", "in", "is", "like", "false", "null", "or",
-      "not", "true" };
-
-  private Map<String, Object> properties = new HashMap<String, Object>();
-
-  private byte[] correlationID;
-
-  private int deliveryMode;
-
-  private DestinationImpl destination;
-
-  private long expiration;
-
-  private String messageID;
-
-  private int priority;
-
-  private boolean redelivered;
-
-  private DestinationImpl replyTo;
-
-  private long timestamp;
-
-  private String type;
-
-  private SessionImpl receivingSession;
-
-  private MessageConsumerImpl receivingConsumer;
-
-  public MessageImpl()
-  {
-  }
-
-  public SessionImpl getReceivingSession()
-  {
-    return receivingSession;
-  }
-
-  public void setReceivingSession(SessionImpl receivingSession)
-  {
-    this.receivingSession = receivingSession;
-  }
-
-  public MessageConsumerImpl getReceivingConsumer()
-  {
-    return receivingConsumer;
-  }
-
-  public void setReceivingConsumer(MessageConsumerImpl receivingConsumer)
-  {
-    this.receivingConsumer = receivingConsumer;
-  }
-
-  public String getJMSCorrelationID()
-  {
-    if (correlationID == null)
-    {
-      return null;
-    }
-
-    return new String(correlationID);
-  }
-
-  public void setJMSCorrelationID(String correlationID)
-  {
-    this.correlationID = correlationID == null ? null : correlationID.getBytes();
-  }
-
-  public byte[] getJMSCorrelationIDAsBytes()
-  {
-    return correlationID;
-  }
-
-  public void setJMSCorrelationIDAsBytes(byte[] correlationID)
-  {
-    this.correlationID = correlationID;
-  }
-
-  public int getJMSDeliveryMode()
-  {
-    return deliveryMode;
-  }
-
-  public void setJMSDeliveryMode(int deliveryMode)
-  {
-    this.deliveryMode = deliveryMode;
-  }
-
-  public Destination getJMSDestination()
-  {
-    return destination;
-  }
-
-  public void setJMSDestination(Destination destination) throws JMSException
-  {
-    this.destination = DestinationUtil.convert(destination);
-  }
-
-  public long getJMSExpiration()
-  {
-    return expiration;
-  }
-
-  public void setJMSExpiration(long expiration)
-  {
-    this.expiration = expiration;
-  }
-
-  public String getJMSMessageID()
-  {
-    return messageID;
-  }
-
-  public void setJMSMessageID(String messageID)
-  {
-    this.messageID = messageID;
-  }
-
-  public int getJMSPriority()
-  {
-    return priority;
-  }
-
-  public void setJMSPriority(int priority)
-  {
-    this.priority = priority;
-  }
-
-  public boolean getJMSRedelivered()
-  {
-    return redelivered;
-  }
-
-  public void setJMSRedelivered(boolean redelivered)
-  {
-    this.redelivered = redelivered;
-  }
-
-  public Destination getJMSReplyTo()
-  {
-    return replyTo;
-  }
-
-  public void setJMSReplyTo(Destination replyTo) throws JMSException
-  {
-    this.replyTo = DestinationUtil.convert(replyTo);
-  }
-
-  public long getJMSTimestamp()
-  {
-    return timestamp;
-  }
-
-  public void setJMSTimestamp(long timestamp)
-  {
-    this.timestamp = timestamp;
-  }
-
-  public String getJMSType()
-  {
-    return type;
-  }
-
-  public void setJMSType(String type)
-  {
-    this.type = type;
-  }
-
-  public void clearProperties()
-  {
-    properties.clear();
-  }
-
-  public boolean propertyExists(String name)
-  {
-    return properties.containsKey(name);
-  }
-
-  public boolean getBooleanProperty(String name) throws MessageFormatException
-  {
-    return TypeUtil.getBoolean(properties.get(name));
-  }
-
-  public byte getByteProperty(String name) throws MessageFormatException
-  {
-    return TypeUtil.getByte(properties.get(name));
-  }
-
-  public short getShortProperty(String name) throws MessageFormatException
-  {
-    return TypeUtil.getShort(properties.get(name));
-  }
-
-  public int getIntProperty(String name) throws MessageFormatException
-  {
-    return TypeUtil.getInt(properties.get(name));
-  }
-
-  public long getLongProperty(String name) throws MessageFormatException
-  {
-    return TypeUtil.getLong(properties.get(name));
-  }
-
-  public float getFloatProperty(String name) throws MessageFormatException
-  {
-    return TypeUtil.getFloat(properties.get(name));
-  }
-
-  public double getDoubleProperty(String name) throws MessageFormatException
-  {
-    return TypeUtil.getDouble(properties.get(name));
-  }
-
-  public String getStringProperty(String name) throws MessageFormatException
-  {
-    return TypeUtil.getString(properties.get(name));
-  }
-
-  public Object getObjectProperty(String name)
-  {
-    return properties.get(name);
-  }
-
-  public Enumeration<String> getPropertyNames()
-  {
-    return Collections.enumeration(properties.keySet());
-  }
-
-  public void setBooleanProperty(String name, boolean value) throws JMSException
-  {
-    setProperty(name, value);
-  }
-
-  public void setByteProperty(String name, byte value) throws JMSException
-  {
-    setProperty(name, value);
-  }
-
-  public void setShortProperty(String name, short value) throws JMSException
-  {
-    setProperty(name, value);
-  }
-
-  public void setIntProperty(String name, int value) throws JMSException
-  {
-    setProperty(name, value);
-  }
-
-  public void setLongProperty(String name, long value) throws JMSException
-  {
-    setProperty(name, value);
-  }
-
-  public void setFloatProperty(String name, float value) throws JMSException
-  {
-    setProperty(name, value);
-  }
-
-  public void setDoubleProperty(String name, double value) throws JMSException
-  {
-    setProperty(name, value);
-  }
-
-  public void setStringProperty(String name, String value) throws JMSException
-  {
-    setProperty(name, value);
-  }
-
-  public void setObjectProperty(String name, Object value) throws JMSException
-  {
-    if (value instanceof Boolean || value instanceof Byte || value instanceof Short || value instanceof Integer
-        || value instanceof Long || value instanceof Float || value instanceof Double || value instanceof String
-        || value == null)
-    {
-      setProperty(name, value);
-    }
-    else
-    {
-      throw new MessageFormatException("Values of type" + value.getClass().getName() + " are not supported");
-    }
-  }
-
-  protected void setProperty(String name, Object value) throws JMSException
-  {
-    if (name == null)
-    {
-      throw new JMSException("Invalid property name: " + name);
-    }
-
-    char[] chars = name.toCharArray();
-    if (chars.length == 0)
-    {
-      throw new JMSException("Invalid property name: " + name);
-    }
-
-    if (!Character.isJavaIdentifierStart(chars[0]))
-    {
-      throw new JMSException("Invalid property name: " + name);
-    }
-
-    for (int i = 1; i < chars.length; ++i)
-    {
-      if (!Character.isJavaIdentifierPart(chars[i]))
-      {
-        throw new JMSException("Invalid property name: " + name);
-      }
-    }
-
-    for (int i = 0; i < KEYWORDS.length; ++i)
-    {
-      if (name.equalsIgnoreCase(KEYWORDS[i]))
-      {
-        throw new JMSException("Invalid property name: " + name);
-      }
-    }
-
-    properties.put(name, value);
-  }
-
-  public void acknowledge()
-  {
-    if (receivingSession == null)
-    {
-      return;
-    }
-
-    if (!receivingSession.isActive())
-    {
-      return;
-    }
-
-    if (receivingSession.getTransacted())
-    {
-      return;
-    }
-
-    if (receivingSession.getAcknowledgeMode() != Session.CLIENT_ACKNOWLEDGE)
-    {
-      return;
-    }
-
-    receivingSession.acknowledgeMessages(receivingConsumer);
-  }
-
-  public void clearBody()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public int compareTo(MessageImpl obj)
-  {
-    if (priority < obj.priority)
-    {
-      return -1;
-    }
-
-    if (priority > obj.priority)
-    {
-      return 1;
-    }
-
-    return 0;
-  }
-
-  @SuppressWarnings("unchecked")
-  public void populate(Message source) throws JMSException
-  {
-    setJMSMessageID(source.getJMSMessageID());
-    setJMSDestination(source.getJMSDestination());
-    setJMSTimestamp(source.getJMSTimestamp());
-    setJMSPriority(source.getJMSPriority());
-    setJMSExpiration(source.getJMSExpiration());
-    setJMSDeliveryMode(source.getJMSDeliveryMode());
-    setJMSCorrelationID(source.getJMSCorrelationID());
-    setJMSType(source.getJMSType());
-    setJMSReplyTo(source.getJMSReplyTo());
-
-    Enumeration<String> e = source.getPropertyNames();
-    while (e.hasMoreElements())
-    {
-      String name = e.nextElement();
-      Object value = source.getObjectProperty(name);
-      setObjectProperty(name, value);
-    }
-  }
-
-  public void write(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeByteArray(correlationID);
-    out.writeByte(deliveryMode);
-    DestinationUtil.write(out, destination);
-    out.writeLong(expiration);
-    out.writeString(messageID);
-    out.writeByte(priority);
-    out.writeBoolean(redelivered);
-    DestinationUtil.write(out, replyTo);
-    out.writeLong(timestamp);
-    out.writeString(type);
-
-    out.writeInt(properties.size());
-    for (Entry<String, Object> entry : properties.entrySet())
-    {
-      out.writeString(entry.getKey());
-      TypeUtil.write(out, entry.getValue());
-    }
-  }
-
-  public void read(ExtendedDataInputStream in) throws IOException
-  {
-    correlationID = in.readByteArray();
-    deliveryMode = in.readByte();
-    destination = DestinationUtil.read(in);
-    expiration = in.readLong();
-    messageID = in.readString();
-    priority = in.readByte();
-    redelivered = in.readBoolean();
-    replyTo = DestinationUtil.read(in);
-    timestamp = in.readLong();
-    type = in.readString();
-
-    int size = in.readInt();
-    for (int i = 0; i < size; i++)
-    {
-      String key = in.readString();
-      Object value = TypeUtil.read(in);
-      properties.put(key, value);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java
deleted file mode 100644
index e3a8b229cd..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageProducerImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageFormatException;
-import javax.jms.MessageProducer;
-
-import java.util.Date;
-
-public class MessageProducerImpl extends Lifecycle implements MessageProducer
-{
-  private SessionImpl session;
-
-  private DestinationImpl destination;
-
-  private int deliveryMode = DeliveryMode.PERSISTENT;
-
-  private int priority = Message.DEFAULT_PRIORITY;
-
-  private long timeToLive = 0;
-
-  private boolean disableMessageTimestamp = false;
-
-  private boolean disableMessageID = false;
-
-  public MessageProducerImpl(SessionImpl session, DestinationImpl destination)
-  {
-    this.session = session;
-    this.destination = destination;
-  }
-
-  public SessionImpl getSession()
-  {
-    return session;
-  }
-
-  public int getDeliveryMode()
-  {
-    return deliveryMode;
-  }
-
-  public void setDeliveryMode(int deliveryMode)
-  {
-    this.deliveryMode = deliveryMode;
-  }
-
-  public int getPriority()
-  {
-    return priority;
-  }
-
-  public void setPriority(int priority)
-  {
-    this.priority = priority;
-  }
-
-  public long getTimeToLive()
-  {
-    return timeToLive;
-  }
-
-  public void setTimeToLive(long timeToLive)
-  {
-    this.timeToLive = timeToLive;
-  }
-
-  public DestinationImpl getDestination()
-  {
-    return destination;
-  }
-
-  public boolean getDisableMessageID()
-  {
-    return disableMessageID;
-  }
-
-  public void setDisableMessageID(boolean disableMessageID)
-  {
-    this.disableMessageID = disableMessageID;
-  }
-
-  public boolean getDisableMessageTimestamp()
-  {
-    return disableMessageTimestamp;
-  }
-
-  public void setDisableMessageTimestamp(boolean disableMessageTimestamp)
-  {
-    this.disableMessageTimestamp = disableMessageTimestamp;
-  }
-
-  public void send(Message message) throws JMSException
-  {
-    send(getDestination(), message, getDeliveryMode(), getPriority(), getTimeToLive());
-  }
-
-  public void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
-  {
-    send(getDestination(), message, getDeliveryMode(), getPriority(), getTimeToLive());
-  }
-
-  public void send(Destination destination, Message message) throws JMSException
-  {
-    send(destination, message, getDeliveryMode(), getPriority(), getTimeToLive());
-  }
-
-  public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException
-  {
-    if (message == null)
-    {
-      throw new MessageFormatException("Null message");
-    }
-
-    // message.setJMSMessageID(MessageId.create());
-    message.setJMSDestination(destination);
-    message.setJMSTimestamp(new Date().getTime());
-    message.setJMSPriority(priority);
-
-    if (timeToLive > 0)
-    {
-      message.setJMSExpiration(System.currentTimeMillis() + timeToLive);
-    }
-    else
-    {
-      message.setJMSExpiration(0);
-    }
-
-    if (destination instanceof JMSTemporaryDestination)
-    {
-      message.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
-    }
-    else
-    {
-      message.setJMSDeliveryMode(deliveryMode);
-    }
-
-    session.sendMessage(message);
-  }
-
-  public void close()
-  {
-    throw new NotYetImplementedException();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java
deleted file mode 100644
index dadeff88e6..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-public class NotYetImplementedException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public NotYetImplementedException()
-  {
-  }
-
-  public NotYetImplementedException(String message)
-  {
-    super(message);
-  }
-
-  public NotYetImplementedException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public NotYetImplementedException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
deleted file mode 100644
index cf9ecb92aa..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.internal.jms.bundle.OM;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-
-public class ObjectMessageImpl extends MessageImpl implements ObjectMessage
-{
-  private Serializable object;
-
-  public ObjectMessageImpl()
-  {
-  }
-
-  public ObjectMessageImpl(Serializable object)
-  {
-    this.object = object;
-  }
-
-  public Serializable getObject()
-  {
-    return object;
-  }
-
-  public void setObject(Serializable object)
-  {
-    this.object = object;
-  }
-
-  @Override
-  public void populate(Message source) throws JMSException
-  {
-    super.populate(source);
-    ObjectMessage object = (ObjectMessage)source;
-    setObject(object.getObject());
-  }
-
-  @Override
-  public void write(ExtendedDataOutputStream out) throws IOException
-  {
-    super.write(out);
-    if (object != null)
-    {
-      out.writeBoolean(true);
-      ObjectOutputStream stream = new ObjectOutputStream(out);
-      stream.writeObject(object);
-    }
-    else
-    {
-      out.writeBoolean(false);
-    }
-  }
-
-  @Override
-  public void read(ExtendedDataInputStream in) throws IOException
-  {
-    super.read(in);
-    boolean notNull = in.readBoolean();
-    if (notNull)
-    {
-      try
-      {
-        ObjectInputStream stream = new ObjectInputStream(in);
-        object = (Serializable)stream.readObject();
-      }
-      catch (ClassNotFoundException ex)
-      {
-        OM.LOG.error(ex);
-        throw new IOException(ex.getMessage());
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
deleted file mode 100644
index a7ad077d57..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-
-import java.util.Enumeration;
-
-public class QueueBrowserImpl implements QueueBrowser
-{
-  private Queue queue;
-
-  private String messageSelector;
-
-  public QueueBrowserImpl(Queue queue, String messageSelector)
-  {
-    this.queue = queue;
-    this.messageSelector = messageSelector;
-  }
-
-  public QueueBrowserImpl(Queue queue)
-  {
-    this(queue, null);
-  }
-
-  public Queue getQueue()
-  {
-    return queue;
-  }
-
-  public String getMessageSelector()
-  {
-    return messageSelector;
-  }
-
-  public void close()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public Enumeration<?> getEnumeration()
-  {
-    throw new NotYetImplementedException();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java
deleted file mode 100644
index 934f1a4600..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.Queue;
-
-public class QueueImpl extends DestinationImpl implements Queue
-{
-  private static final long serialVersionUID = 1L;
-
-  private String queueName;
-
-  public QueueImpl(String queueName)
-  {
-    this.queueName = queueName;
-  }
-
-  public String getQueueName()
-  {
-    return queueName;
-  }
-
-  public String getName()
-  {
-    return queueName;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java
deleted file mode 100644
index c218ffcf5e..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.QueueReceiver;
-
-public class QueueReceiverImpl extends MessageConsumerImpl implements QueueReceiver
-{
-  public QueueReceiverImpl(SessionImpl session, int id, QueueImpl queue, String messageSelector)
-  {
-    super(session, id, queue, messageSelector);
-  }
-
-  public QueueImpl getQueue()
-  {
-    return (QueueImpl)getDestination();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java
deleted file mode 100644
index b38d52232f..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueSender;
-
-public class QueueSenderImpl extends MessageProducerImpl implements QueueSender
-{
-  public QueueSenderImpl(SessionImpl session, QueueImpl queue)
-  {
-    super(session, queue);
-  }
-
-  public QueueImpl getQueue()
-  {
-    return (QueueImpl)getDestination();
-  }
-
-  public void send(Queue queue, Message message) throws JMSException
-  {
-    send(queue, message, getDeliveryMode(), getPriority(), getTimeToLive());
-  }
-
-  public void send(Queue queue, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
-  {
-    super.send(queue, message, deliveryMode, priority, timeToLive);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
deleted file mode 100644
index fb027d5241..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.internal.jms.bundle.OM;
-import org.eclipse.net4j.internal.jms.protocol.JMSAcknowledgeRequest;
-import org.eclipse.net4j.internal.jms.protocol.JMSClientMessageRequest;
-import org.eclipse.net4j.internal.jms.protocol.JMSCommitRequest;
-import org.eclipse.net4j.internal.jms.protocol.JMSRecoverRequest;
-import org.eclipse.net4j.internal.jms.protocol.JMSRegisterConsumerRequest;
-import org.eclipse.net4j.internal.jms.protocol.JMSRollbackRequest;
-import org.eclipse.net4j.internal.jms.util.DestinationUtil;
-import org.eclipse.net4j.internal.jms.util.MessageUtil;
-import org.eclipse.net4j.internal.util.lifecycle.QueueWorker;
-
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.Session;
-import javax.jms.StreamMessage;
-import javax.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.TopicSubscriber;
-import javax.transaction.TransactionRolledbackException;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Session
-{
-  private ConnectionImpl connection;
-
-  private int id;
-
-  private boolean transacted;
-
-  private int acknowledgeMode;
-
-  private Map<Long, MessageConsumerImpl> consumers = new HashMap<Long, MessageConsumerImpl>();
-
-  /**
-   * Outgoing transacted messages
-   */
-  private List<MessageImpl> messages = new ArrayList<MessageImpl>();
-
-  private Set<MessageProducerImpl> producers = new HashSet<MessageProducerImpl>();
-
-  public SessionImpl(ConnectionImpl connection, int id, boolean transacted, int acknowledgeMode) throws JMSException
-  {
-    this.connection = connection;
-    this.id = id;
-    this.transacted = transacted;
-    this.acknowledgeMode = acknowledgeMode;
-
-    try
-    {
-      activate();
-    }
-    catch (Exception ex)
-    {
-      throw new JMSException(ex.getMessage());
-    }
-  }
-
-  public ConnectionImpl getConnection()
-  {
-    return connection;
-  }
-
-  public int getID()
-  {
-    return id;
-  }
-
-  public boolean getTransacted()
-  {
-    return transacted;
-  }
-
-  public int getAcknowledgeMode()
-  {
-    return acknowledgeMode;
-  }
-
-  public MessageListener getMessageListener()
-  {
-    return null;
-  }
-
-  public void setMessageListener(MessageListener listener)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public MessageProducer createProducer(Destination destination) throws JMSException
-  {
-    DestinationImpl dest = DestinationUtil.convert(destination);
-    MessageProducerImpl producer = new MessageProducerImpl(this, dest);
-    producers.add(producer);
-    return producer;
-  }
-
-  public MessageConsumer createConsumer(Destination destination) throws JMSException
-  {
-    return createConsumer(destination, null);
-  }
-
-  public MessageConsumer createConsumer(Destination destination, String messageSelector) throws JMSException
-  {
-    return createConsumer(destination, null, false);
-  }
-
-  public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal)
-      throws JMSException
-  {
-    DestinationImpl dest = DestinationUtil.convert(destination);
-    long consumerID = registerConsumer(dest, messageSelector, noLocal, false);
-    MessageConsumerImpl consumer = new MessageConsumerImpl(this, consumerID, dest, messageSelector);
-    consumers.put(consumerID, consumer);
-    return consumer;
-  }
-
-  public Queue createQueue(String queueName)
-  {
-    return new QueueImpl(queueName);
-  }
-
-  public TemporaryQueue createTemporaryQueue()
-  {
-    return new TemporaryQueueImpl();
-  }
-
-  public QueueBrowser createBrowser(Queue queue)
-  {
-    return new QueueBrowserImpl(queue);
-  }
-
-  public QueueBrowser createBrowser(Queue queue, String messageSelector)
-  {
-    return new QueueBrowserImpl(queue, messageSelector);
-  }
-
-  public Topic createTopic(String topicName)
-  {
-    return new TopicImpl(topicName);
-  }
-
-  public TemporaryTopic createTemporaryTopic()
-  {
-    return new TemporaryTopicImpl();
-  }
-
-  public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException
-  {
-    return createDurableSubscriber(topic, name, null, false);
-  }
-
-  public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
-      throws JMSException
-  {
-    TopicImpl dest = (TopicImpl)DestinationUtil.convert(topic);
-    long consumerID = registerConsumer(dest, messageSelector, noLocal, true);
-    TopicSubscriberImpl subscriber = new TopicSubscriberImpl(this, consumerID, dest, name, messageSelector, noLocal);
-    consumers.put(consumerID, subscriber);
-    return subscriber;
-  }
-
-  public void unsubscribe(String name)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public Message createMessage()
-  {
-    return new MessageImpl();
-  }
-
-  public StreamMessage createStreamMessage()
-  {
-    return new StreamMessageImpl();
-  }
-
-  public BytesMessage createBytesMessage()
-  {
-    return new BytesMessageImpl();
-  }
-
-  public MapMessage createMapMessage()
-  {
-    return new MapMessageImpl();
-  }
-
-  public ObjectMessage createObjectMessage()
-  {
-    return createObjectMessage(null);
-  }
-
-  public ObjectMessage createObjectMessage(Serializable object)
-  {
-    return new ObjectMessageImpl(object);
-  }
-
-  public TextMessage createTextMessage()
-  {
-    return createTextMessage(null);
-  }
-
-  public TextMessage createTextMessage(String text)
-  {
-    return new TextMessageImpl(text);
-  }
-
-  public void recover() throws JMSException
-  {
-    ensureNotTransacted();
-    try
-    {
-      stop();
-      new JMSRecoverRequest(connection.getChannel(), id).send();
-      start();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      close();
-    }
-  }
-
-  public void commit() throws JMSException
-  {
-    ensureTransacted();
-    synchronized (messages)
-    {
-      try
-      {
-        String[] messageIDs = new JMSCommitRequest(connection.getChannel(), id, messages).send();
-        if (messageIDs == null)
-        {
-          throw new TransactionRolledbackException("Transaction rolled back by JMS server");
-        }
-
-        for (int i = 0; i < messageIDs.length; i++)
-        {
-          messages.get(i).setJMSMessageID(messageIDs[i]);
-        }
-
-        messages.clear();
-      }
-      catch (JMSException ex)
-      {
-        throw ex;
-      }
-      catch (RuntimeException ex)
-      {
-        throw ex;
-      }
-      catch (Exception ex)
-      {
-        throw new JMSException(ex.getMessage());
-      }
-    }
-  }
-
-  public void rollback() throws JMSException
-  {
-    ensureTransacted();
-    synchronized (messages)
-    {
-      try
-      {
-        if (!new JMSRollbackRequest(connection.getChannel(), id).send())
-        {
-          throw new JMSException("JMS server failed to rolled back transaction");
-        }
-
-        messages.clear();
-      }
-      catch (JMSException ex)
-      {
-        throw ex;
-      }
-      catch (RuntimeException ex)
-      {
-        throw ex;
-      }
-      catch (Exception ex)
-      {
-        throw new JMSException(ex.getMessage());
-      }
-    }
-  }
-
-  public void close()
-  {
-    deactivate();
-  }
-
-  public void run()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public long registerConsumer(DestinationImpl destination, String messageSelector, boolean noLocal, boolean durable)
-      throws JMSException
-  {
-    try
-    {
-      return new JMSRegisterConsumerRequest(connection.getChannel(), id, destination, messageSelector, noLocal, durable)
-          .send();
-    }
-    catch (Exception ex)
-    {
-      throw new JMSException(ex.getMessage());
-    }
-  }
-
-  public void sendMessage(Message message) throws JMSException
-  {
-    if (getTransacted())
-    {
-      synchronized (messages)
-      {
-        if (message instanceof MessageImpl)
-        {
-          messages.add(MessageUtil.copy(message));
-        }
-        else
-        {
-          messages.add(MessageUtil.convert(message));
-        }
-      }
-    }
-    else
-    {
-      try
-      {
-        MessageImpl impl = MessageUtil.convert(message);
-        JMSClientMessageRequest request = new JMSClientMessageRequest(connection.getChannel(), impl);
-        String messageID = request.send(connection.getSendTimeout());
-        if (messageID == null)
-        {
-          throw new JMSException("Message not accepted by JMS server");
-        }
-
-        message.setJMSMessageID(messageID);
-      }
-      catch (JMSException ex)
-      {
-        throw ex;
-      }
-      catch (RuntimeException ex)
-      {
-        throw ex;
-      }
-      catch (Exception ex)
-      {
-        throw new JMSException(ex.getMessage());
-      }
-    }
-  }
-
-  public boolean acknowledgeMessages(MessageConsumerImpl consumer)
-  {
-    try
-    {
-      new JMSAcknowledgeRequest(connection.getChannel(), id).send();
-      return true;
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      return true;
-    }
-  }
-
-  public void handleServerMessage(long consumerID, MessageImpl message)
-  {
-    message.setReceivingSession(this);
-    MessageConsumerImpl consumer = consumers.get(consumerID);
-    if (consumer == null)
-    {
-      OM.LOG.warn("Consumer " + consumerID + " not found. Discarding message.");
-      return;
-    }
-
-    consumer.handleServerMessage(message);
-  }
-
-  @Override
-  protected String getThreadName()
-  {
-    return "jms-session";
-  }
-
-  @Override
-  protected void work(WorkContext context, MessageConsumerImpl consumer)
-  {
-    consumer.dispatchMessage();
-  }
-
-  private void ensureTransacted() throws IllegalStateException
-  {
-    if (!transacted)
-    {
-      throw new IllegalStateException("Session " + id + " not transacted");
-    }
-  }
-
-  private void ensureNotTransacted() throws IllegalStateException
-  {
-    if (transacted)
-    {
-      throw new IllegalStateException("Session " + id + " transacted");
-    }
-  }
-
-  private void start()
-  {
-  }
-
-  private void stop()
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
deleted file mode 100644
index 66f4003c20..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageEOFException;
-import javax.jms.StreamMessage;
-
-import java.io.IOException;
-
-public class StreamMessageImpl extends MessageImpl implements StreamMessage
-{
-  public boolean readBoolean()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public byte readByte()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public int readBytes(byte[] value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public char readChar()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public double readDouble()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public float readFloat()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public int readInt()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public long readLong()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public Object readObject()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public short readShort()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public String readString()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void reset()
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeBoolean(boolean value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeByte(byte value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeBytes(byte[] value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeBytes(byte[] value, int offset, int length)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeChar(char value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeDouble(double value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeFloat(float value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeInt(int value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeLong(long value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeObject(Object value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeShort(short value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  public void writeString(String value)
-  {
-    throw new NotYetImplementedException();
-  }
-
-  @Override
-  public void populate(Message source) throws JMSException
-  {
-    super.populate(source);
-    StreamMessage from = (StreamMessage)source;
-    from.reset();
-    try
-    {
-      while (true)
-      {
-        Object object = from.readObject();
-        writeObject(object);
-      }
-    }
-    catch (MessageEOFException ignore)
-    {
-    }
-  }
-
-  @Override
-  public void write(ExtendedDataOutputStream out) throws IOException
-  {
-    super.write(out);
-  }
-
-  @Override
-  public void read(ExtendedDataInputStream in) throws IOException
-  {
-    super.read(in);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryQueueImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryQueueImpl.java
deleted file mode 100644
index d1a71e1e9d..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryQueueImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.TemporaryQueue;
-
-public class TemporaryQueueImpl extends QueueImpl implements TemporaryQueue
-{
-  private static final long serialVersionUID = 1L;
-
-  private static int counter = 0;
-
-  public TemporaryQueueImpl()
-  {
-    super("TempQueue" + (++counter));
-  }
-
-  public void delete()
-  {
-    throw new NotYetImplementedException();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryTopicImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryTopicImpl.java
deleted file mode 100644
index 2b1c09ea17..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryTopicImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.TemporaryTopic;
-
-public class TemporaryTopicImpl extends TopicImpl implements TemporaryTopic
-{
-  private static final long serialVersionUID = 1L;
-
-  private static int counter = 0;
-
-  public TemporaryTopicImpl()
-  {
-    super("TempTopic" + (++counter));
-  }
-
-  public void delete()
-  {
-    throw new NotYetImplementedException();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
deleted file mode 100644
index 038deb0c38..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-
-import java.io.IOException;
-
-public class TextMessageImpl extends MessageImpl implements TextMessage
-{
-  private String text;
-
-  public TextMessageImpl()
-  {
-  }
-
-  public TextMessageImpl(String text)
-  {
-    this.text = text;
-  }
-
-  public String getText()
-  {
-    return text;
-  }
-
-  public void setText(String text)
-  {
-    this.text = text;
-  }
-
-  @Override
-  public void populate(Message source) throws JMSException
-  {
-    super.populate(source);
-    TextMessage text = (TextMessage)source;
-    setText(text.getText());
-  }
-
-  @Override
-  public void write(ExtendedDataOutputStream out) throws IOException
-  {
-    super.write(out);
-    out.writeString(text);
-  }
-
-  @Override
-  public void read(ExtendedDataInputStream in) throws IOException
-  {
-    super.read(in);
-    text = in.readString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java
deleted file mode 100644
index add4eb4302..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.Topic;
-
-public class TopicImpl extends DestinationImpl implements Topic
-{
-  private static final long serialVersionUID = 1L;
-
-  private String topicName;
-
-  public TopicImpl(String topicName)
-  {
-    this.topicName = topicName;
-  }
-
-  public String getTopicName()
-  {
-    return topicName;
-  }
-
-  public String getName()
-  {
-    return topicName;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java
deleted file mode 100644
index ccd61660c2..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Topic;
-import javax.jms.TopicPublisher;
-
-public class TopicPublisherImpl extends MessageProducerImpl implements TopicPublisher
-{
-  public TopicPublisherImpl(SessionImpl session, TopicImpl topic)
-  {
-    super(session, topic);
-  }
-
-  public TopicImpl getTopic()
-  {
-    return (TopicImpl)getDestination();
-  }
-
-  public void publish(Message message) throws JMSException
-  {
-    publish(getTopic(), message, getDeliveryMode(), getPriority(), getTimeToLive());
-  }
-
-  public void publish(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
-  {
-    publish(getTopic(), message, deliveryMode, priority, timeToLive);
-  }
-
-  public void publish(Topic topic, Message message) throws JMSException
-  {
-    publish(topic, message, getDeliveryMode(), getPriority(), getTimeToLive());
-  }
-
-  public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException
-  {
-    send(topic, message, deliveryMode, priority, timeToLive);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
deleted file mode 100644
index eefb91e59f..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms;
-
-import javax.jms.TopicSubscriber;
-
-public class TopicSubscriberImpl extends MessageConsumerImpl implements TopicSubscriber
-{
-  private String name;
-
-  private boolean noLocal;
-
-  public TopicSubscriberImpl(SessionImpl session, long id, TopicImpl topic, String name, String messageSelector,
-      boolean noLocal)
-  {
-    super(session, id, topic, messageSelector);
-    this.name = name;
-    this.noLocal = noLocal;
-  }
-
-  public boolean getNoLocal()
-  {
-    return noLocal;
-  }
-
-  public TopicImpl getTopic()
-  {
-    return (TopicImpl)getDestination();
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
deleted file mode 100644
index d16a2184a2..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.bundle;
-
-import org.eclipse.net4j.jms.JMSUtil;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.jms"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  static void start() throws Exception
-  {
-    JMSUtil.setTransportContainer(IPluginContainer.INSTANCE);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java
deleted file mode 100644
index 90c24240ea..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSAcknowledgeRequest extends Request
-{
-  private int sessionID;
-
-  public JMSAcknowledgeRequest(IChannel channel, int sessionID)
-  {
-    super(channel);
-    this.sessionID = sessionID;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_ACKNOWLEDGE;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(sessionID);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java
deleted file mode 100644
index 3220abfc1e..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.jms.util.MessageUtil;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSClientMessageRequest extends RequestWithConfirmation<String>
-{
-  private MessageImpl message;
-
-  public JMSClientMessageRequest(IChannel channel, MessageImpl message)
-  {
-    super(channel);
-    this.message = message;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_CLIENT_MESSAGE;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    MessageUtil.write(out, message);
-  }
-
-  @Override
-  protected String confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
deleted file mode 100644
index 9b8510f408..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
-
-/**
- * @author Eike Stepper
- */
-public class JMSClientProtocol extends SignalProtocol
-{
-  public JMSClientProtocol()
-  {
-  }
-
-  public String getType()
-  {
-    return JMSProtocolConstants.PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor doCreateSignalReactor(short signalID)
-  {
-    switch (signalID)
-    {
-    case JMSProtocolConstants.SIGNAL_SERVER_MESSAGE:
-      return new JMSServerMessageIndication();
-    }
-
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java
deleted file mode 100644
index abbbc33ef1..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-import org.eclipse.internal.net4j.protocol.ClientProtocolFactory;
-
-/**
- * @author Eike Stepper
- */
-public final class JMSClientProtocolFactory extends ClientProtocolFactory
-{
-  public static final String TYPE = JMSProtocolConstants.PROTOCOL_NAME;
-
-  public JMSClientProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public JMSClientProtocol create(String description)
-  {
-    return new JMSClientProtocol();
-  }
-
-  public static JMSClientProtocol get(IManagedContainer container, String description)
-  {
-    return (JMSClientProtocol)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java
deleted file mode 100644
index 6545bd4425..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSCloseSessionRequest extends RequestWithConfirmation<Boolean>
-{
-  private int sessionID;
-
-  public JMSCloseSessionRequest(IChannel channel, int sessionID)
-  {
-    super(channel);
-    this.sessionID = sessionID;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_CLOSE_SESSION;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(sessionID);
-  }
-
-  @Override
-  protected Boolean confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readBoolean();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java
deleted file mode 100644
index aca1200758..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.jms.util.MessageUtil;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class JMSCommitRequest extends RequestWithConfirmation<String[]>
-{
-  private int sessionID;
-
-  private List<MessageImpl> messages;
-
-  public JMSCommitRequest(IChannel channel, int sessionID, List<MessageImpl> messages)
-  {
-    super(channel);
-    this.sessionID = sessionID;
-    this.messages = messages;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_COMMIT;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(sessionID);
-    out.writeInt(messages.size());
-    for (MessageImpl message : messages)
-    {
-      MessageUtil.write(out, message);
-    }
-  }
-
-  @Override
-  protected String[] confirming(ExtendedDataInputStream in) throws IOException
-  {
-    int size = in.readInt();
-    if (size == -1)
-    {
-      return null;
-    }
-
-    String[] messageIDs = new String[size];
-    for (int i = 0; i < size; i++)
-    {
-      messageIDs[i] = in.readString();
-    }
-
-    return messageIDs;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java
deleted file mode 100644
index d81a0aaa68..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSDeregisterConsumerRequest extends RequestWithConfirmation<Boolean>
-{
-  private int sessionID;
-
-  private long consumerID;
-
-  public JMSDeregisterConsumerRequest(IChannel channel, int sessionID, long consumerID)
-  {
-    super(channel);
-    this.sessionID = sessionID;
-    this.consumerID = consumerID;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_DEREGISTER_CONSUMER;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(sessionID);
-    out.writeLong(consumerID);
-  }
-
-  @Override
-  protected Boolean confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readBoolean();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java
deleted file mode 100644
index 80b63e31cd..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSLogoffRequest extends Request
-{
-  public JMSLogoffRequest(IChannel channel)
-  {
-    super(channel);
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_LOGOFF;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java
deleted file mode 100644
index e5649fb72f..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSLogonRequest extends RequestWithConfirmation<Boolean>
-{
-  private String userName;
-
-  private String password;
-
-  public JMSLogonRequest(IChannel channel, String userName, String password)
-  {
-    super(channel);
-    this.userName = userName;
-    this.password = password;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_LOGON;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(userName);
-    out.writeString(password);
-  }
-
-  @Override
-  protected Boolean confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readBoolean();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java
deleted file mode 100644
index ec829f5b74..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSOpenSessionRequest extends RequestWithConfirmation<Boolean>
-{
-  private int sessionID;
-
-  public JMSOpenSessionRequest(IChannel channel, int sessionID)
-  {
-    super(channel);
-    this.sessionID = sessionID;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_OPEN_SESSION;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(sessionID);
-  }
-
-  @Override
-  protected Boolean confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readBoolean();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java
deleted file mode 100644
index 2842eb32d2..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSRecoverRequest extends RequestWithConfirmation<Object>
-{
-  private int sessionID;
-
-  public JMSRecoverRequest(IChannel channel, int sessionID)
-  {
-    super(channel);
-    this.sessionID = sessionID;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_RECOVER;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(sessionID);
-  }
-
-  @Override
-  protected Object confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
deleted file mode 100644
index 0ee1a451af..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.jms.DestinationImpl;
-import org.eclipse.net4j.internal.jms.util.DestinationUtil;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSRegisterConsumerRequest extends RequestWithConfirmation<Long>
-{
-  private int sessionID;
-
-  private DestinationImpl destination;
-
-  private String messageSelector;
-
-  private boolean noLocal;
-
-  private boolean durable;
-
-  public JMSRegisterConsumerRequest(IChannel channel, int sessionID, DestinationImpl destination,
-      String messageSelector, boolean noLocal, boolean durable)
-  {
-    super(channel);
-    this.sessionID = sessionID;
-    this.destination = destination;
-    this.messageSelector = messageSelector;
-    this.noLocal = noLocal;
-    this.durable = durable;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_REGISTER_CONSUMER;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(sessionID);
-    DestinationUtil.write(out, destination);
-    out.writeString(messageSelector);
-    out.writeBoolean(noLocal);
-    out.writeBoolean(durable);
-  }
-
-  @Override
-  protected Long confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readLong();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java
deleted file mode 100644
index c4db85ca0d..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSRollbackRequest extends RequestWithConfirmation<Boolean>
-{
-  private int sessionID;
-
-  public JMSRollbackRequest(IChannel channel, int sessionID)
-  {
-    super(channel);
-    this.sessionID = sessionID;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_ROLLBACK;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(sessionID);
-  }
-
-  @Override
-  protected Boolean confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readBoolean();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
deleted file mode 100644
index fed8f93f9e..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.internal.jms.ConnectionImpl;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.jms.util.MessageUtil;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSServerMessageIndication extends Indication
-{
-  public JMSServerMessageIndication()
-  {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_SERVER_MESSAGE;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    int sessionID = in.readInt();
-    long consumerID = in.readLong();
-    MessageImpl message = MessageUtil.read(in);
-    JMSClientProtocol protocol = (JMSClientProtocol)getProtocol();
-    ConnectionImpl connection = (ConnectionImpl)protocol.getInfraStructure();
-    connection.handleMessageFromSignal(sessionID, consumerID, message);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java
deleted file mode 100644
index e6601a5255..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class JMSSyncRequest extends RequestWithConfirmation<Long>
-{
-  private long clientTime0;
-
-  public JMSSyncRequest(IChannel channel)
-  {
-    super(channel);
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_SYNC;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    clientTime0 = System.currentTimeMillis();
-  }
-
-  @Override
-  protected Long confirming(ExtendedDataInputStream in) throws IOException
-  {
-    long serverTime = in.readLong();
-    long clientTime1 = System.currentTimeMillis();
-    long roundTripDuration = clientTime1 - clientTime0;
-    return serverTime + roundTripDuration / 2;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
deleted file mode 100644
index 5b26efdb34..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.util;
-
-import org.eclipse.net4j.internal.jms.DestinationImpl;
-import org.eclipse.net4j.internal.jms.QueueImpl;
-import org.eclipse.net4j.internal.jms.TopicImpl;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.Topic;
-
-import java.io.IOException;
-
-public final class DestinationUtil
-{
-  private DestinationUtil()
-  {
-  }
-
-  public static byte getType(Destination destination)
-  {
-    if (destination instanceof Queue)
-    {
-      return JMSProtocolConstants.DESTINATION_TYPE_QUEUE;
-    }
-
-    if (destination instanceof Topic)
-    {
-      return JMSProtocolConstants.DESTINATION_TYPE_TOPIC;
-    }
-
-    if (destination == null)
-    {
-      return JMSProtocolConstants.DESTINATION_TYPE_NULL;
-    }
-
-    throw new IllegalArgumentException("destination: " + destination);
-  }
-
-  public static String getTypeName(byte type)
-  {
-    switch (type)
-    {
-    case JMSProtocolConstants.DESTINATION_TYPE_NULL:
-      return "NULL_DESTINATION";
-
-    case JMSProtocolConstants.DESTINATION_TYPE_QUEUE:
-      return "QUEUE_DESTINATION";
-
-    case JMSProtocolConstants.DESTINATION_TYPE_TOPIC:
-      return "TOPIC_DESTINATION";
-    }
-
-    throw new IllegalArgumentException("type: " + type);
-  }
-
-  public static String getName(Destination destination) throws JMSException
-  {
-    byte type = getType(destination);
-    switch (type)
-    {
-    case JMSProtocolConstants.DESTINATION_TYPE_QUEUE:
-      return ((Queue)destination).getQueueName();
-
-    case JMSProtocolConstants.DESTINATION_TYPE_TOPIC:
-      return ((Topic)destination).getTopicName();
-    }
-
-    return null;
-  }
-
-  public static DestinationImpl create(byte type, String name)
-  {
-    switch (type)
-    {
-    case JMSProtocolConstants.DESTINATION_TYPE_QUEUE:
-      return new QueueImpl(name);
-
-    case JMSProtocolConstants.DESTINATION_TYPE_TOPIC:
-      return new TopicImpl(name);
-    }
-
-    return null;
-  }
-
-  public static DestinationImpl copy(Destination source) throws JMSException
-  {
-    byte type = getType(source);
-    switch (type)
-    {
-    case JMSProtocolConstants.DESTINATION_TYPE_QUEUE:
-      return new QueueImpl(((Queue)source).getQueueName());
-
-    case JMSProtocolConstants.DESTINATION_TYPE_TOPIC:
-      return new TopicImpl(((Topic)source).getTopicName());
-    }
-
-    return null;
-  }
-
-  public static DestinationImpl convert(Destination source) throws JMSException
-  {
-    if (source instanceof DestinationImpl)
-    {
-      return (DestinationImpl)source;
-    }
-
-    return copy(source);
-  }
-
-  public static void write(ExtendedDataOutputStream out, DestinationImpl destination) throws IOException
-  {
-    byte type = getType(destination);
-    out.writeByte(type);
-    if (type != JMSProtocolConstants.DESTINATION_TYPE_NULL)
-    {
-      out.writeString(destination.getName());
-    }
-  }
-
-  public static DestinationImpl read(ExtendedDataInputStream in) throws IOException
-  {
-    byte type = in.readByte();
-    String name = null;
-    if (type != JMSProtocolConstants.DESTINATION_TYPE_NULL)
-    {
-      name = in.readString();
-    }
-
-    return create(type, name);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
deleted file mode 100644
index 1121d499da..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.util;
-
-import org.eclipse.net4j.internal.jms.BytesMessageImpl;
-import org.eclipse.net4j.internal.jms.MapMessageImpl;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.internal.jms.ObjectMessageImpl;
-import org.eclipse.net4j.internal.jms.StreamMessageImpl;
-import org.eclipse.net4j.internal.jms.TextMessageImpl;
-import org.eclipse.net4j.internal.jms.bundle.OM;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import javax.jms.BytesMessage;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.StreamMessage;
-import javax.jms.TextMessage;
-
-import java.io.IOException;
-
-public final class MessageUtil
-{
-  private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, MessageUtil.class);
-
-  private MessageUtil()
-  {
-  }
-
-  public static byte getType(Message message)
-  {
-    if (message instanceof BytesMessage)
-    {
-      return JMSProtocolConstants.MESSAGE_TYPE_BYTES;
-    }
-
-    if (message instanceof MapMessage)
-    {
-      return JMSProtocolConstants.MESSAGE_TYPE_MAP;
-    }
-
-    if (message instanceof ObjectMessage)
-    {
-      return JMSProtocolConstants.MESSAGE_TYPE_OBJECT;
-    }
-
-    if (message instanceof StreamMessage)
-    {
-      return JMSProtocolConstants.MESSAGE_TYPE_STREAM;
-    }
-
-    if (message instanceof TextMessage)
-    {
-      return JMSProtocolConstants.MESSAGE_TYPE_TEXT;
-    }
-
-    throw new IllegalArgumentException("message: " + message);
-  }
-
-  public static String getTypeName(byte type)
-  {
-    switch (type)
-    {
-    case JMSProtocolConstants.MESSAGE_TYPE_BYTES:
-      return "BYTES_MESSAGE";
-
-    case JMSProtocolConstants.MESSAGE_TYPE_MAP:
-      return "MAP_MESSAGE";
-
-    case JMSProtocolConstants.MESSAGE_TYPE_OBJECT:
-      return "OBJECT_MESSAGE";
-
-    case JMSProtocolConstants.MESSAGE_TYPE_STREAM:
-      return "STREAM_MESSAGE";
-
-    case JMSProtocolConstants.MESSAGE_TYPE_TEXT:
-      return "TEXT_MESSAGE";
-    }
-
-    throw new IllegalArgumentException("type: " + type);
-  }
-
-  public static MessageImpl create(byte type)
-  {
-    switch (type)
-    {
-    case JMSProtocolConstants.MESSAGE_TYPE_BYTES:
-      return new BytesMessageImpl();
-
-    case JMSProtocolConstants.MESSAGE_TYPE_MAP:
-      return new MapMessageImpl();
-
-    case JMSProtocolConstants.MESSAGE_TYPE_OBJECT:
-      return new ObjectMessageImpl();
-
-    case JMSProtocolConstants.MESSAGE_TYPE_STREAM:
-      return new StreamMessageImpl();
-
-    case JMSProtocolConstants.MESSAGE_TYPE_TEXT:
-      return new TextMessageImpl();
-    }
-
-    throw new IllegalArgumentException("type: " + type);
-  }
-
-  public static MessageImpl copy(Message source) throws JMSException
-  {
-    byte type = getType(source);
-    MessageImpl result = create(type);
-    result.populate(source);
-    return result;
-  }
-
-  public static MessageImpl convert(Message source) throws JMSException
-  {
-    if (source instanceof MessageImpl)
-    {
-      return (MessageImpl)source;
-    }
-
-    return copy(source);
-  }
-
-  public static void write(ExtendedDataOutputStream out, MessageImpl message) throws IOException
-  {
-    byte type = getType(message);
-    if (PROTOCOL.isEnabled())
-    {
-      PROTOCOL.format("Writing {0}", getTypeName(type));
-    }
-
-    out.writeByte(type);
-    message.write(out);
-  }
-
-  public static MessageImpl read(ExtendedDataInputStream in) throws IOException
-  {
-    byte type = in.readByte();
-    if (PROTOCOL.isEnabled())
-    {
-      PROTOCOL.format("Reading {0}", getTypeName(type));
-    }
-
-    MessageImpl message = create(type);
-    message.read(in);
-    return message;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
deleted file mode 100644
index 75e48dc333..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jms.util;
-
-import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import javax.jms.MessageFormatException;
-
-import java.io.IOException;
-
-public final class TypeUtil
-{
-  private TypeUtil()
-  {
-  }
-
-  public static boolean getBoolean(Object value) throws MessageFormatException
-  {
-    if (value instanceof Boolean)
-    {
-      return (Boolean)value;
-    }
-    else if (value instanceof String)
-    {
-      return Boolean.valueOf((String)value);
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    throw new MessageFormatException(conversionProblem(boolean.class, value));
-  }
-
-  public static byte getByte(Object value) throws MessageFormatException
-  {
-    if (value instanceof Byte)
-    {
-      return (Byte)value;
-    }
-    else if (value instanceof String)
-    {
-      return Byte.parseByte((String)value);
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    throw new MessageFormatException(conversionProblem(byte.class, value));
-  }
-
-  public static short getShort(Object value) throws MessageFormatException
-  {
-    if (value instanceof Short)
-    {
-      return (Short)value;
-    }
-    else if (value instanceof Byte)
-    {
-      return (Byte)value;
-    }
-    else if (value instanceof String)
-    {
-      return Short.parseShort((String)value);
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    throw new MessageFormatException(conversionProblem(short.class, value));
-  }
-
-  public static char getChar(Object value) throws MessageFormatException
-  {
-    if (value instanceof Character)
-    {
-      return (Character)value;
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    throw new MessageFormatException(conversionProblem(char.class, value));
-  }
-
-  public static int getInt(Object value) throws MessageFormatException
-  {
-    if (value instanceof Integer)
-    {
-      return (Integer)value;
-    }
-    else if (value instanceof Short)
-    {
-      return (Short)value;
-    }
-    else if (value instanceof Byte)
-    {
-      return (Byte)value;
-    }
-    else if (value instanceof String)
-    {
-      return Integer.parseInt((String)value);
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    throw new MessageFormatException(conversionProblem(int.class, value));
-  }
-
-  public static long getLong(Object value) throws MessageFormatException
-  {
-    if (value instanceof Long)
-    {
-      return (Long)value;
-    }
-    else if (value instanceof Integer)
-    {
-      return (Integer)value;
-    }
-    else if (value instanceof Short)
-    {
-      return (Short)value;
-    }
-    else if (value instanceof Byte)
-    {
-      return (Byte)value;
-    }
-    else if (value instanceof String)
-    {
-      return Long.parseLong((String)value);
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    throw new MessageFormatException(conversionProblem(long.class, value));
-  }
-
-  public static float getFloat(Object value) throws MessageFormatException
-  {
-    if (value instanceof Float)
-    {
-      return (Float)value;
-    }
-    else if (value instanceof String)
-    {
-      return Float.parseFloat((String)value);
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    throw new MessageFormatException(conversionProblem(float.class, value));
-  }
-
-  public static double getDouble(Object value) throws MessageFormatException
-  {
-    if (value instanceof Double)
-    {
-      return (Double)value;
-    }
-    else if (value instanceof Float)
-    {
-      return (Float)value;
-    }
-    else if (value instanceof String)
-    {
-      return Double.parseDouble((String)value);
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    throw new MessageFormatException(conversionProblem(double.class, value));
-  }
-
-  public static String getString(Object value) throws MessageFormatException
-  {
-    if (value instanceof byte[])
-    {
-      throw new MessageFormatException(conversionProblem(String.class, value));
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    return String.valueOf(value);
-  }
-
-  public static byte[] getBytes(Object value) throws MessageFormatException
-  {
-    if (value instanceof byte[])
-    {
-      byte[] bytes = (byte[])value;
-      byte[] result = new byte[bytes.length];
-      System.arraycopy(bytes, 0, result, 0, bytes.length);
-    }
-    else if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    throw new MessageFormatException(conversionProblem(byte[].class, value));
-  }
-
-  public static void write(ExtendedDataOutputStream out, Object value) throws IOException
-  {
-    if (value instanceof Boolean)
-    {
-      out.writeByte(JMSProtocolConstants.TYPE_BOOLEAN);
-      out.writeBoolean((Boolean)value);
-    }
-    else if (value instanceof Byte)
-    {
-      out.writeByte(JMSProtocolConstants.TYPE_BYTE);
-      out.writeByte((Byte)value);
-    }
-    else if (value instanceof Character)
-    {
-      out.writeByte(JMSProtocolConstants.TYPE_CHAR);
-      out.writeChar((Character)value);
-    }
-    else if (value instanceof Double)
-    {
-      out.writeByte(JMSProtocolConstants.TYPE_DOUBLE);
-      out.writeDouble((Double)value);
-    }
-    else if (value instanceof Float)
-    {
-      out.writeByte(JMSProtocolConstants.TYPE_FLOAT);
-      out.writeFloat((Float)value);
-    }
-    else if (value instanceof Long)
-    {
-      out.writeByte(JMSProtocolConstants.TYPE_LONG);
-      out.writeLong((Long)value);
-    }
-    else if (value instanceof Short)
-    {
-      out.writeByte(JMSProtocolConstants.TYPE_SHORT);
-      out.writeShort((Short)value);
-    }
-    else if (value instanceof String)
-    {
-      out.writeByte(JMSProtocolConstants.TYPE_STRING);
-      out.writeString((String)value);
-    }
-
-    throw new IllegalArgumentException("value: " + value);
-  }
-
-  public static Object read(ExtendedDataInputStream in) throws IOException
-  {
-    byte type = in.readByte();
-    switch (type)
-    {
-    case JMSProtocolConstants.TYPE_BOOLEAN:
-      return in.readBoolean();
-    case JMSProtocolConstants.TYPE_BYTE:
-      return in.readByte();
-    case JMSProtocolConstants.TYPE_CHAR:
-      return in.readChar();
-    case JMSProtocolConstants.TYPE_DOUBLE:
-      return in.readDouble();
-    case JMSProtocolConstants.TYPE_FLOAT:
-      return in.readFloat();
-    case JMSProtocolConstants.TYPE_LONG:
-      return in.readLong();
-    case JMSProtocolConstants.TYPE_SHORT:
-      return in.readShort();
-    case JMSProtocolConstants.TYPE_STRING:
-      return in.readString();
-    }
-
-    throw new IOException("Invalid type: " + type);
-  }
-
-  private static String conversionProblem(Class<?> type, Object value)
-  {
-    return "Cannot convert values of type " + value.getClass().getName() + " to " + type.getName();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java
deleted file mode 100644
index 8a2426dcd9..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms;
-
-/**
- * @author Eike Stepper
- */
-public interface JMSAdminProtocolConstants
-{
-  public static final String PROTOCOL_NAME = "jmsadmin";
-
-  public static final short SIGNAL_CREATE_DESTINATION = 1;
-
-  public static final byte DESTINATION_TYPE_QUEUE = JMSProtocolConstants.DESTINATION_TYPE_QUEUE;
-
-  public static final byte DESTINATION_TYPE_TOPIC = JMSProtocolConstants.DESTINATION_TYPE_TOPIC;
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
deleted file mode 100644
index aa94ab3d3b..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms;
-
-import org.eclipse.net4j.internal.jms.ConnectionFactoryImpl;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-
-import java.util.Hashtable;
-
-/**
- * @author Eike Stepper
- */
-public class JMSInitialContext extends InitialContext
-{
-  private IManagedContainer transportContainer;
-
-  public JMSInitialContext(IManagedContainer transportContainer) throws NamingException
-  {
-    this.transportContainer = transportContainer;
-  }
-
-  public JMSInitialContext(boolean lazy, IManagedContainer transportContainer) throws NamingException
-  {
-    super(lazy);
-    this.transportContainer = transportContainer;
-  }
-
-  public JMSInitialContext(Hashtable<?, ?> environment, IManagedContainer transportContainer) throws NamingException
-  {
-    super(environment);
-    this.transportContainer = transportContainer;
-  }
-
-  public IManagedContainer getTransportContainer()
-  {
-    return transportContainer;
-  }
-
-  @Override
-  public Object lookup(Name name) throws NamingException
-  {
-    return postProcess(super.lookup(name));
-  }
-
-  @Override
-  public Object lookup(String name) throws NamingException
-  {
-    return postProcess(super.lookup(name));
-  }
-
-  @Override
-  public Object lookupLink(Name name) throws NamingException
-  {
-    return postProcess(super.lookupLink(name));
-  }
-
-  @Override
-  public Object lookupLink(String name) throws NamingException
-  {
-    return postProcess(super.lookupLink(name));
-  }
-
-  protected Object postProcess(Object object)
-  {
-    if (object instanceof ConnectionFactoryImpl)
-    {
-      ConnectionFactoryImpl factory = (ConnectionFactoryImpl)object;
-      factory.setTransportContainer(transportContainer);
-    }
-
-    return object;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java
deleted file mode 100644
index fd3ab49dd5..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms;
-
-/**
- * @author Eike Stepper
- */
-public interface JMSProtocolConstants
-{
-  public static final String PROTOCOL_NAME = "jms";
-
-  // Signals
-
-  public static final short SIGNAL_SYNC = 1;
-
-  public static final short SIGNAL_LOGON = 2;
-
-  public static final short SIGNAL_LOGOFF = 3;
-
-  public static final short SIGNAL_OPEN_SESSION = 4;
-
-  public static final short SIGNAL_CLOSE_SESSION = 5;
-
-  public static final short SIGNAL_REGISTER_CONSUMER = 6;
-
-  public static final short SIGNAL_DEREGISTER_CONSUMER = 7;
-
-  public static final short SIGNAL_CLIENT_MESSAGE = 8;
-
-  public static final short SIGNAL_SERVER_MESSAGE = 9;
-
-  public static final short SIGNAL_ACKNOWLEDGE = 10;
-
-  public static final short SIGNAL_RECOVER = 11;
-
-  public static final short SIGNAL_COMMIT = 12;
-
-  public static final short SIGNAL_ROLLBACK = 13;
-
-  // Message Types
-
-  public static final byte MESSAGE_TYPE_BYTES = 1;
-
-  public static final byte MESSAGE_TYPE_MAP = 2;
-
-  public static final byte MESSAGE_TYPE_OBJECT = 3;
-
-  public static final byte MESSAGE_TYPE_STREAM = 4;
-
-  public static final byte MESSAGE_TYPE_TEXT = 5;
-
-  // Destination Types
-
-  public static final byte DESTINATION_TYPE_NULL = 0;
-
-  public static final byte DESTINATION_TYPE_QUEUE = 1;
-
-  public static final byte DESTINATION_TYPE_TOPIC = 2;
-
-  // Data Types
-
-  public static final byte TYPE_BOOLEAN = 1;
-
-  public static final byte TYPE_BYTE = 2;
-
-  public static final byte TYPE_CHAR = 3;
-
-  public static final byte TYPE_DOUBLE = 4;
-
-  public static final byte TYPE_FLOAT = 5;
-
-  public static final byte TYPE_LONG = 6;
-
-  public static final byte TYPE_SHORT = 7;
-
-  public static final byte TYPE_STRING = 8;
-}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
deleted file mode 100644
index 1cfa876d56..0000000000
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jms;
-
-import org.eclipse.net4j.internal.jms.protocol.JMSClientProtocolFactory;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-/**
- * @author Eike Stepper
- */
-public final class JMSUtil
-{
-  private static IManagedContainer transportContainer;
-
-  private JMSUtil()
-  {
-  }
-
-  public static void prepareContainer(IManagedContainer container)
-  {
-    container.registerFactory(new JMSClientProtocolFactory());
-  }
-
-  public static Context createInitialContext() throws NamingException
-  {
-    if (transportContainer == null)
-    {
-      throw new IllegalStateException("transportContainer == null");
-    }
-
-    return new JMSInitialContext(transportContainer);
-  }
-
-  public static IManagedContainer getTransportContainer()
-  {
-    return transportContainer;
-  }
-
-  public static void setTransportContainer(IManagedContainer transportContainer)
-  {
-    JMSUtil.transportContainer = transportContainer;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/.classpath b/plugins/org.eclipse.net4j.jvm/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.jvm/.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.jvm/.cvsignore b/plugins/org.eclipse.net4j.jvm/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.net4j.jvm/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.net4j.jvm/.options b/plugins/org.eclipse.net4j.jvm/.options
deleted file mode 100644
index 86d7399f01..0000000000
--- a/plugins/org.eclipse.net4j.jvm/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.jvm/debug = true
diff --git a/plugins/org.eclipse.net4j.jvm/.project b/plugins/org.eclipse.net4j.jvm/.project
deleted file mode 100644
index 7faa074437..0000000000
--- a/plugins/org.eclipse.net4j.jvm/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.jvm</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e001b0bcff..0000000000
--- a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:43:58 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 41c62594ae..0000000000
--- a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:43:58 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
deleted file mode 100644
index 72b1c972e9..0000000000
--- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.jvm;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.net4j.internal.jvm.bundle.OM$Activator
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j;visibility:=reexport
-Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.jvm;version="0.8.0",
- org.eclipse.net4j.jvm;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.jvm/about.html b/plugins/org.eclipse.net4j.jvm/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.jvm/about.html
+++ /dev/null
@@ -1,28 +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.jvm/build.properties b/plugins/org.eclipse.net4j.jvm/build.properties
deleted file mode 100644
index 06fe287a6d..0000000000
--- a/plugins/org.eclipse.net4j.jvm/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               plugin.properties,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.xml
diff --git a/plugins/org.eclipse.net4j.jvm/copyright.txt b/plugins/org.eclipse.net4j.jvm/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.jvm/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jvm/epl-v10.html b/plugins/org.eclipse.net4j.jvm/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jvm/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jvm/license.html b/plugins/org.eclipse.net4j.jvm/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.jvm/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jvm/plugin.properties b/plugins/org.eclipse.net4j.jvm/plugin.properties
deleted file mode 100644
index 50b1cba740..0000000000
--- a/plugins/org.eclipse.net4j.jvm/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Transport JVM (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.jvm/plugin.xml b/plugins/org.eclipse.net4j.jvm/plugin.xml
deleted file mode 100644
index 751d033b26..0000000000
--- a/plugins/org.eclipse.net4j.jvm/plugin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.net4j.util.factories">
-      <factory
-            class="org.eclipse.net4j.internal.jvm.JVMAcceptorFactory"
-            productGroup="org.eclipse.net4j.acceptors"
-            type="jvm"/>
-      <factory
-            class="org.eclipse.net4j.internal.jvm.JVMConnectorFactory"
-            productGroup="org.eclipse.net4j.connectors"
-            type="jvm"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java
deleted file mode 100644
index 49f2bf1fc5..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jvm;
-
-import org.eclipse.net4j.jvm.IJVMAcceptor;
-import org.eclipse.net4j.util.StringUtil;
-
-import org.eclipse.internal.net4j.acceptor.Acceptor;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class JVMAcceptor extends Acceptor implements IJVMAcceptor
-{
-  private String name;
-
-  public JVMAcceptor()
-  {
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  public JVMServerConnector handleAccept(JVMClientConnector client)
-  {
-    JVMServerConnector connector = new JVMServerConnector(client);
-    connector.setName(client.getName());
-    connector.setBufferProvider(client.getBufferProvider());
-    connector.setReceiveExecutor(client.getReceiveExecutor());
-    connector.setProtocolFactoryRegistry(client.getProtocolFactoryRegistry());
-    connector.setProtocolPostProcessors(client.getProtocolPostProcessors());
-    connector.activate();
-    addConnector(connector);
-    return connector;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("JVMAcceptor[{0}]", name); //$NON-NLS-1$ 
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (StringUtil.isEmpty(name))
-    {
-      throw new IllegalStateException("No name"); //$NON-NLS-1$
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    JVMAcceptorManager.INSTANCE.registerAcceptor(this);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    JVMAcceptorManager.INSTANCE.deregisterAcceptor(this);
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java
deleted file mode 100644
index 9a933d6ceb..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jvm;
-
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-import org.eclipse.internal.net4j.acceptor.AcceptorFactory;
-
-/**
- * @author Eike Stepper
- */
-public class JVMAcceptorFactory extends AcceptorFactory
-{
-  public static final String TYPE = "jvm";
-
-  public JVMAcceptorFactory()
-  {
-    super(TYPE);
-  }
-
-  public JVMAcceptor create(String description) throws ProductCreationException
-  {
-    JVMAcceptor acceptor = new JVMAcceptor();
-    acceptor.setName(description);
-    return acceptor;
-  }
-
-  @Override
-  public String getDescriptionFor(Object acceptor)
-  {
-    if (acceptor instanceof JVMAcceptor)
-    {
-      return ((JVMAcceptor)acceptor).getName();
-    }
-
-    return null;
-  }
-
-  public static JVMAcceptor get(IManagedContainer container, String description)
-  {
-    return (JVMAcceptor)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java
deleted file mode 100644
index d39ad756a4..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jvm;
-
-import org.eclipse.net4j.internal.util.registry.HashMapRegistry;
-import org.eclipse.net4j.jvm.IJVMAcceptor;
-import org.eclipse.net4j.jvm.IJVMAcceptorManager;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-/**
- * @author Eike Stepper
- */
-public class JVMAcceptorManager implements IJVMAcceptorManager
-{
-  // @Singleton
-  public static final JVMAcceptorManager INSTANCE = new JVMAcceptorManager();
-
-  private IRegistry<String, IJVMAcceptor> acceptorRegistry = new HashMapRegistry<String, IJVMAcceptor>();
-
-  public IRegistry<String, IJVMAcceptor> getAcceptorRegistry()
-  {
-    // TODO Introduce UnmodifiableRegistry
-    return acceptorRegistry;
-  }
-
-  public JVMAcceptor getAcceptor(String name)
-  {
-    return (JVMAcceptor)acceptorRegistry.get(name);
-  }
-
-  public boolean registerAcceptor(JVMAcceptor acceptor)
-  {
-    String name = acceptor.getName();
-    if (!acceptorRegistry.containsKey(name))
-    {
-      acceptorRegistry.put(name, acceptor);
-      return true;
-    }
-
-    return false;
-  }
-
-  public boolean deregisterAcceptor(JVMAcceptor acceptor)
-  {
-    return acceptorRegistry.remove(acceptor.getName()) != null;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java
deleted file mode 100644
index 23901b8f16..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jvm;
-
-import org.eclipse.net4j.connector.ConnectorLocation;
-import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-/**
- * @author Eike Stepper
- */
-public class JVMClientConnector extends JVMConnector
-{
-  private JVMAcceptor acceptor;
-
-  private IListener peerLifecycleListener = new LifecycleEventAdapter()
-  {
-    @Override
-    protected void onAboutToDeactivate(ILifecycle lifecycle)
-    {
-      setPeer(null);
-      deactivate();
-    }
-  };
-
-  public JVMClientConnector()
-  {
-  }
-
-  public ConnectorLocation getLocation()
-  {
-    return ConnectorLocation.CLIENT;
-  }
-
-  public JVMAcceptor getAcceptor()
-  {
-    return acceptor;
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    acceptor = JVMAcceptorManager.INSTANCE.getAcceptor(getName());
-    if (acceptor == null)
-    {
-      throw new IllegalStateException("acceptor == null");
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    JVMConnector peer = acceptor.handleAccept(this);
-    peer.addListener(peerLifecycleListener);
-    setPeer(peer);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    LifecycleUtil.deactivateNoisy(getPeer());
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java
deleted file mode 100644
index a3e9fe63d8..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jvm;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.ConnectorException;
-import org.eclipse.net4j.connector.ConnectorLocation;
-import org.eclipse.net4j.connector.ConnectorState;
-import org.eclipse.net4j.internal.jvm.bundle.OM;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.jvm.IJVMConnector;
-import org.eclipse.net4j.protocol.IProtocol;
-import org.eclipse.net4j.util.security.INegotiationContext;
-
-import org.eclipse.internal.net4j.buffer.Buffer;
-import org.eclipse.internal.net4j.channel.InternalChannel;
-import org.eclipse.internal.net4j.connector.Connector;
-
-import java.util.Queue;
-
-/**
- * TODO Remove peer channels
- * 
- * @author Eike Stepper
- */
-public abstract class JVMConnector extends Connector implements IJVMConnector
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, JVMConnector.class);
-
-  private JVMConnector peer;
-
-  private String name;
-
-  public JVMConnector()
-  {
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  public JVMConnector getPeer()
-  {
-    return peer;
-  }
-
-  public void setPeer(JVMConnector peer)
-  {
-    this.peer = peer;
-  }
-
-  public String getURL()
-  {
-    return "jvm://" + name;
-  }
-
-  public ConnectorLocation getLocation()
-  {
-    return null;
-  }
-
-  @Override
-  public void setState(ConnectorState newState) throws ConnectorException
-  {
-    super.setState(newState);
-  }
-
-  @Override
-  public boolean waitForConnection(long timeout) throws ConnectorException
-  {
-    return super.waitForConnection(timeout);
-  }
-
-  public void multiplexChannel(IChannel localChannel)
-  {
-    short channelIndex = localChannel.getChannelIndex();
-    InternalChannel peerChannel = peer.getChannel(channelIndex);
-    if (peerChannel == null)
-    {
-      throw new IllegalStateException("peerChannel == null"); //$NON-NLS-1$
-    }
-
-    Queue<IBuffer> localQueue = ((InternalChannel)localChannel).getSendQueue();
-    IBuffer buffer = localQueue.poll();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Multiplexing " + ((Buffer)buffer).formatContent(true));
-    }
-
-    buffer.flip();
-    peerChannel.handleBufferFromMultiplexer(buffer);
-  }
-
-  @Override
-  protected INegotiationContext createNegotiationContext()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  protected void registerChannelWithPeer(int channelID, short channelIndex, IProtocol protocol)
-      throws ConnectorException
-  {
-    try
-    {
-      InternalChannel channel = getPeer().createChannel(channelID, channelIndex, protocol.getType());
-      if (channel == null)
-      {
-        throw new ConnectorException("Failed to register channel with peer");
-      }
-
-      channel.activate();
-    }
-    catch (ConnectorException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new ConnectorException(ex);
-    }
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    checkState(name, "name");
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    leaveConnecting();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java
deleted file mode 100644
index 51b72b2024..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jvm;
-
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-import org.eclipse.internal.net4j.connector.ConnectorFactory;
-
-/**
- * @author Eike Stepper
- */
-public class JVMConnectorFactory extends ConnectorFactory
-{
-  public static final String TYPE = "jvm";
-
-  public JVMConnectorFactory()
-  {
-    super(TYPE);
-  }
-
-  public JVMClientConnector create(String description) throws ProductCreationException
-  {
-    JVMClientConnector connector = new JVMClientConnector();
-    connector.setName(description);
-    return connector;
-  }
-
-  @Override
-  public String getDescriptionFor(Object connector)
-  {
-    if (connector instanceof JVMClientConnector)
-    {
-      return ((JVMClientConnector)connector).getName();
-    }
-
-    return null;
-  }
-
-  public static JVMClientConnector get(IManagedContainer container, String description)
-  {
-    return (JVMClientConnector)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java
deleted file mode 100644
index 3e86e9e488..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jvm;
-
-import org.eclipse.net4j.connector.ConnectorLocation;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-/**
- * @author Eike Stepper
- */
-public class JVMServerConnector extends JVMConnector
-{
-  public JVMServerConnector(JVMClientConnector clientPeer)
-  {
-    setPeer(clientPeer);
-  }
-
-  public ConnectorLocation getLocation()
-  {
-    return ConnectorLocation.SERVER;
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    LifecycleUtil.deactivateNoisy(getPeer());
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
deleted file mode 100644
index bdc55673a0..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.jvm.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.jvm"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java
deleted file mode 100644
index 0e00d519de..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jvm;
-
-import org.eclipse.net4j.acceptor.IAcceptor;
-
-/**
- * @author Eike Stepper
- */
-public interface IJVMAcceptor extends IAcceptor
-{
-  public String getName();
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java
deleted file mode 100644
index 039f320afe..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jvm;
-
-import org.eclipse.net4j.internal.jvm.JVMAcceptorManager;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-/**
- * @author Eike Stepper
- */
-public interface IJVMAcceptorManager
-{
-  public static final IJVMAcceptorManager INSTANCE = JVMAcceptorManager.INSTANCE;
-
-  public IRegistry<String, IJVMAcceptor> getAcceptorRegistry();
-
-  public IJVMAcceptor getAcceptor(String name);
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java
deleted file mode 100644
index 877c88c5e1..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jvm;
-
-import org.eclipse.net4j.connector.IConnector;
-
-/**
- * @author Eike Stepper
- */
-public interface IJVMConnector extends IConnector
-{
-  public String getName();
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java
deleted file mode 100644
index 69c8410992..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.jvm;
-
-import org.eclipse.net4j.internal.jvm.JVMAcceptorFactory;
-import org.eclipse.net4j.internal.jvm.JVMConnectorFactory;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public final class JVMUtil
-{
-  private JVMUtil()
-  {
-  }
-
-  public static void prepareContainer(IManagedContainer container)
-  {
-    container.registerFactory(new JVMAcceptorFactory());
-    container.registerFactory(new JVMConnectorFactory());
-  }
-
-  public static IJVMAcceptor getAcceptor(IManagedContainer container, String description)
-  {
-    return (IJVMAcceptor)container.getElement(JVMAcceptorFactory.PRODUCT_GROUP, JVMAcceptorFactory.TYPE, description);
-  }
-
-  public static IJVMConnector getConnector(IManagedContainer container, String description)
-  {
-    return (IJVMConnector)container
-        .getElement(JVMConnectorFactory.PRODUCT_GROUP, JVMConnectorFactory.TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package.html b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package.html
deleted file mode 100644
index 8f8b140ebb..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Transport layer extension with support for JVM embedded connections. 
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.tcp/.classpath b/plugins/org.eclipse.net4j.tcp/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.tcp/.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.tcp/.cvsignore b/plugins/org.eclipse.net4j.tcp/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.net4j.tcp/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.net4j.tcp/.options b/plugins/org.eclipse.net4j.tcp/.options
deleted file mode 100644
index 6dd14bc481..0000000000
--- a/plugins/org.eclipse.net4j.tcp/.options
+++ /dev/null
@@ -1,5 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.tcp/debug = true
-
-org.eclipse.net4j.tcp/protocol.registration.timeout = 10000
diff --git a/plugins/org.eclipse.net4j.tcp/.project b/plugins/org.eclipse.net4j.tcp/.project
deleted file mode 100644
index 43df6e8d96..0000000000
--- a/plugins/org.eclipse.net4j.tcp/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.tcp</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5a7f041345..0000000000
--- a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:44:06 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 2eab528553..0000000000
--- a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:44:06 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
deleted file mode 100644
index 8bd74a1e43..0000000000
--- a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.tcp;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.net4j.internal.tcp.bundle.OM$Activator
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j;visibility:=reexport
-Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.tcp;version="0.8.0",
- org.eclipse.net4j.tcp;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.tcp/about.html b/plugins/org.eclipse.net4j.tcp/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.tcp/about.html
+++ /dev/null
@@ -1,28 +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.tcp/build.properties b/plugins/org.eclipse.net4j.tcp/build.properties
deleted file mode 100644
index ca446c6de7..0000000000
--- a/plugins/org.eclipse.net4j.tcp/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               plugin.properties,\
-               plugin.xml,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html
diff --git a/plugins/org.eclipse.net4j.tcp/copyright.txt b/plugins/org.eclipse.net4j.tcp/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.tcp/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.tcp/epl-v10.html b/plugins/org.eclipse.net4j.tcp/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.tcp/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.tcp/license.html b/plugins/org.eclipse.net4j.tcp/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.tcp/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.tcp/plugin.properties b/plugins/org.eclipse.net4j.tcp/plugin.properties
deleted file mode 100644
index 84ee0d8e9e..0000000000
--- a/plugins/org.eclipse.net4j.tcp/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Transport TCP (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.tcp/plugin.xml b/plugins/org.eclipse.net4j.tcp/plugin.xml
deleted file mode 100644
index c42d1f668a..0000000000
--- a/plugins/org.eclipse.net4j.tcp/plugin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.net4j.util.factories">
-      <factory
-            class="org.eclipse.net4j.internal.tcp.TCPAcceptorFactory"
-            productGroup="org.eclipse.net4j.acceptors"
-            type="tcp"/>
-      <factory
-            class="org.eclipse.net4j.internal.tcp.TCPConnectorFactory"
-            productGroup="org.eclipse.net4j.connectors"
-            type="tcp"/>
-      <factory
-            class="org.eclipse.net4j.internal.tcp.TCPSelectorFactory"
-            productGroup="org.eclipse.net4j.selectors"
-            type="tcp"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.net4j.util.elementProcessors">
-      <elementProcessor
-            class="org.eclipse.net4j.internal.tcp.TCPSelectorInjector">
-      </elementProcessor>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java
deleted file mode 100644
index 4dff2d4dee..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.internal.tcp.bundle.OM;
-import org.eclipse.net4j.internal.util.concurrent.SynchronizingCorrelator;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.protocol.IProtocol;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-import org.eclipse.net4j.util.concurrent.ISynchronizer;
-import org.eclipse.net4j.util.concurrent.TimeoutRuntimeException;
-import org.eclipse.net4j.util.security.INegotiationContext;
-import org.eclipse.net4j.util.security.INegotiationContext.Receiver;
-
-import org.eclipse.internal.net4j.buffer.BufferUtil;
-import org.eclipse.internal.net4j.channel.Channel;
-import org.eclipse.internal.net4j.channel.InternalChannel;
-
-import java.nio.ByteBuffer;
-
-/**
- * @author Eike Stepper
- */
-public final class ControlChannel extends Channel
-{
-  public static final long REGISTRATION_TIMEOUT = OM.PROTOCOL_REGISTRATION_TIMEOUT;
-
-  public static final short CONTROL_CHANNEL_INDEX = -1;
-
-  public static final byte OPCODE_NEGOTIATION = 1;
-
-  public static final byte OPCODE_REGISTRATION = 2;
-
-  public static final byte OPCODE_REGISTRATION_ACK = 3;
-
-  public static final byte OPCODE_DEREGISTRATION = 4;
-
-  public static final byte SUCCESS = 1;
-
-  public static final byte FAILURE = 0;
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, ControlChannel.class);
-
-  private SynchronizingCorrelator<Short, Boolean> registrations = new SynchronizingCorrelator<Short, Boolean>();
-
-  public ControlChannel(int channelID, TCPConnector connector)
-  {
-    setChannelID(channelID);
-    setChannelIndex(CONTROL_CHANNEL_INDEX);
-    setChannelMultiplexer(connector);
-    setReceiveExecutor(connector.getReceiveExecutor());
-  }
-
-  public TCPConnector getConnector()
-  {
-    return (TCPConnector)getChannelMultiplexer();
-  }
-
-  public boolean registerChannel(int channelID, short channelIndex, IProtocol protocol)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Registering channel {0} with protocol {1}", channelIndex, protocol);
-    }
-
-    assertValidChannelIndex(channelIndex);
-    ISynchronizer<Boolean> registration = registrations.correlate(channelIndex);
-
-    IBuffer buffer = provideBuffer();
-    ByteBuffer byteBuffer = buffer.startPutting(CONTROL_CHANNEL_INDEX);
-    byteBuffer.put(OPCODE_REGISTRATION);
-    byteBuffer.putInt(channelID);
-    byteBuffer.putShort(channelIndex);
-    BufferUtil.putUTF8(byteBuffer, protocol == null ? null : protocol.getType());
-    handleBuffer(buffer);
-
-    Boolean acknowledged = registration.get(REGISTRATION_TIMEOUT);
-    if (acknowledged == null)
-    {
-      throw new TimeoutRuntimeException("Registration timeout after " + REGISTRATION_TIMEOUT + " milliseconds");
-    }
-
-    return acknowledged;
-  }
-
-  public void deregisterChannel(int channelID, short channelIndex)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Deregistering channel {0}", channelIndex);
-    }
-
-    assertValidChannelIndex(channelIndex);
-
-    IBuffer buffer = provideBuffer();
-    ByteBuffer byteBuffer = buffer.startPutting(CONTROL_CHANNEL_INDEX);
-    byteBuffer.put(OPCODE_DEREGISTRATION);
-    byteBuffer.putInt(channelID);
-    byteBuffer.putShort(channelIndex);
-    handleBuffer(buffer);
-  }
-
-  @Override
-  public void handleBufferFromMultiplexer(IBuffer buffer)
-  {
-    try
-    {
-      ByteBuffer byteBuffer = buffer.getByteBuffer();
-      byte opcode = byteBuffer.get();
-      switch (opcode)
-      {
-      case OPCODE_NEGOTIATION:
-      {
-        assertNegotiating();
-        INegotiationContext negotiationContext = getConnector().getNegotiationContext();
-        while (negotiationContext == null)
-        {
-          ConcurrencyUtil.sleep(20);
-          negotiationContext = getConnector().getNegotiationContext();
-        }
-
-        Receiver receiver = negotiationContext.getReceiver();
-        receiver.receiveBuffer(negotiationContext, byteBuffer);
-        break;
-      }
-
-      case OPCODE_REGISTRATION:
-      {
-        assertConnected();
-        int channelID = byteBuffer.getInt();
-        short channelIndex = byteBuffer.getShort();
-        assertValidChannelIndex(channelIndex);
-        boolean success = true;
-
-        try
-        {
-          byte[] handlerFactoryUTF8 = BufferUtil.getByteArray(byteBuffer);
-          String protocolID = BufferUtil.fromUTF8(handlerFactoryUTF8);
-          InternalChannel channel = getConnector().createChannel(channelID, channelIndex, protocolID);
-          if (channel != null)
-          {
-            channel.activate();
-          }
-          else
-          {
-            success = false;
-          }
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-          success = false;
-        }
-
-        sendStatus(OPCODE_REGISTRATION_ACK, channelIndex, success);
-        break;
-      }
-
-      case OPCODE_REGISTRATION_ACK:
-      {
-        assertConnected();
-        short channelIndex = byteBuffer.getShort();
-        boolean success = byteBuffer.get() == SUCCESS;
-        registrations.put(channelIndex, success);
-        break;
-      }
-
-      case OPCODE_DEREGISTRATION:
-      {
-        assertConnected();
-        int channelID = byteBuffer.getInt();
-        short channelIndex = byteBuffer.getShort();
-        if (channelIndex != CONTROL_CHANNEL_INDEX)
-        {
-          try
-          {
-            getConnector().inverseRemoveChannel(channelID, channelIndex);
-          }
-          catch (Exception ex)
-          {
-            OM.LOG.error(ex);
-          }
-        }
-
-        break;
-      }
-
-      default:
-        OM.LOG.error("Invalid opcode: " + opcode); //$NON-NLS-1$
-        getConnector().deactivate();
-      }
-    }
-    finally
-    {
-      buffer.release();
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    return "Channel[Control]";
-  }
-
-  private void sendStatus(byte opcode, short channelIndex, boolean status)
-  {
-    IBuffer buffer = provideBuffer();
-    ByteBuffer byteBuffer = buffer.startPutting(CONTROL_CHANNEL_INDEX);
-    byteBuffer.put(opcode);
-    byteBuffer.putShort(channelIndex);
-    byteBuffer.put(status ? SUCCESS : FAILURE);
-    handleBuffer(buffer);
-  }
-
-  private IBuffer provideBuffer()
-  {
-    return getConnector().getBufferProvider().provideBuffer();
-  }
-
-  private void assertNegotiating()
-  {
-    if (!getConnector().isNegotiating())
-    {
-      getConnector().deactivate();
-      throw new IllegalStateException("Connector is not negotiating");
-    }
-  }
-
-  private void assertConnected()
-  {
-    if (!getConnector().isConnected())
-    {
-      throw new IllegalStateException("Connector is not connected");
-    }
-  }
-
-  private void assertValidChannelIndex(short channelIndex)
-  {
-    if (channelIndex <= CONTROL_CHANNEL_INDEX)
-    {
-      throw new IllegalArgumentException("channelIndex <= CONTROL_CHANNEL_ID"); //$NON-NLS-1$
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
deleted file mode 100644
index 69e5a1ea1b..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.internal.tcp.bundle.OM;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-import java.nio.channels.CancelledKeyException;
-import java.nio.channels.SelectionKey;
-
-/**
- * @author Eike Stepper
- */
-public final class SelectorUtil
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, SelectorUtil.class);
-
-  private SelectorUtil()
-  {
-  }
-
-  public static String formatInterestOps(int newOps)
-  {
-    StringBuilder builder = new StringBuilder();
-    if ((newOps & SelectionKey.OP_ACCEPT) != 0)
-    {
-      addInterestOp(builder, "ACCEPT"); //$NON-NLS-1$
-    }
-
-    if ((newOps & SelectionKey.OP_CONNECT) != 0)
-    {
-      addInterestOp(builder, "CONNECT"); //$NON-NLS-1$
-    }
-
-    if ((newOps & SelectionKey.OP_READ) != 0)
-    {
-      addInterestOp(builder, "READ"); //$NON-NLS-1$
-    }
-
-    if ((newOps & SelectionKey.OP_WRITE) != 0)
-    {
-      addInterestOp(builder, "WRITE"); //$NON-NLS-1$
-    }
-
-    return builder.toString();
-  }
-
-  public static void setInterest(SelectionKey selectionKey, int operation, boolean interested)
-  {
-    if (selectionKey == null || !selectionKey.isValid())
-    {
-      return;
-    }
-
-    try
-    {
-      int newOps;
-      int oldOps = selectionKey.interestOps();
-      if (interested)
-      {
-        newOps = oldOps | operation;
-      }
-      else
-      {
-        newOps = oldOps & ~operation;
-      }
-
-      if (oldOps != newOps)
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Setting interest " //$NON-NLS-1$
-              + formatInterestOps(newOps)
-              + (oldOps == 0 ? "" : " (was " + formatInterestOps(oldOps).toLowerCase() + ")")); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-
-        selectionKey.interestOps(newOps);
-      }
-    }
-    catch (CancelledKeyException ignore)
-    {
-    }
-  }
-
-  public static void setAcceptInterest(SelectionKey selectionKey, boolean interested)
-  {
-    setInterest(selectionKey, SelectionKey.OP_ACCEPT, interested);
-  }
-
-  public static void setConnectInterest(SelectionKey selectionKey, boolean interested)
-  {
-    setInterest(selectionKey, SelectionKey.OP_CONNECT, interested);
-  }
-
-  public static void setReadInterest(SelectionKey selectionKey, boolean interested)
-  {
-    setInterest(selectionKey, SelectionKey.OP_READ, interested);
-  }
-
-  public static void setWriteInterest(SelectionKey selectionKey, boolean interested)
-  {
-    setInterest(selectionKey, SelectionKey.OP_WRITE, interested);
-  }
-
-  private static void addInterestOp(StringBuilder builder, String op)
-  {
-    if (builder.length() != 0)
-    {
-      builder.append("|"); //$NON-NLS-1$
-    }
-
-    builder.append(op);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
deleted file mode 100644
index 1960e01f7b..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.internal.tcp.bundle.OM;
-import org.eclipse.net4j.internal.util.lifecycle.Worker;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.tcp.ITCPAcceptor;
-import org.eclipse.net4j.tcp.ITCPPassiveSelectorListener;
-import org.eclipse.net4j.tcp.ITCPSelector;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import org.eclipse.internal.net4j.acceptor.Acceptor;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.text.MessageFormat;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-public class TCPAcceptor extends Acceptor implements ITCPAcceptor, ITCPPassiveSelectorListener
-{
-  public static final boolean DEFAULT_START_SYNCHRONOUSLY = true;
-
-  public static final long DEFAULT_SYNCHRONOUS_START_TIMEOUT = 2 * Worker.DEFAULT_TIMEOUT;
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, TCPAcceptor.class);
-
-  private TCPSelector selector;
-
-  private SelectionKey selectionKey;
-
-  private boolean startSynchronously = DEFAULT_START_SYNCHRONOUSLY;
-
-  private long synchronousStartTimeout = DEFAULT_SYNCHRONOUS_START_TIMEOUT;
-
-  private CountDownLatch startLatch;
-
-  private ServerSocketChannel serverSocketChannel;
-
-  private String address = DEFAULT_ADDRESS;
-
-  private int port = DEFAULT_PORT;
-
-  public TCPAcceptor()
-  {
-  }
-
-  public String getAddress()
-  {
-    return address;
-  }
-
-  public void setAddress(String address)
-  {
-    this.address = address;
-  }
-
-  public int getPort()
-  {
-    return port;
-  }
-
-  public void setPort(int port)
-  {
-    this.port = port;
-  }
-
-  public TCPSelector getSelector()
-  {
-    return selector;
-  }
-
-  public void setSelector(TCPSelector selector)
-  {
-    this.selector = selector;
-  }
-
-  public boolean isStartSynchronously()
-  {
-    return startSynchronously;
-  }
-
-  public void setStartSynchronously(boolean startSynchronously)
-  {
-    this.startSynchronously = startSynchronously;
-  }
-
-  public SelectionKey getSelectionKey()
-  {
-    return selectionKey;
-  }
-
-  public long getSynchronousStartTimeout()
-  {
-    return synchronousStartTimeout;
-  }
-
-  public void setSynchronousStartTimeout(long synchronousStartTimeout)
-  {
-    this.synchronousStartTimeout = synchronousStartTimeout;
-  }
-
-  public void handleRegistration(ITCPSelector selector, ServerSocketChannel serverSocketChannel)
-  {
-    try
-    {
-      InetSocketAddress addr = null;
-      if (address != null)
-      {
-        addr = new InetSocketAddress(InetAddress.getByName(address), port);
-      }
-
-      ServerSocket socket = serverSocketChannel.socket();
-      socket.bind(addr);
-
-      if (addr == null)
-      {
-        address = socket.getInetAddress().toString();
-        if (address.startsWith("/"))
-        {
-          address = address.substring(1);
-        }
-
-        int colon = address.indexOf(':');
-        if (colon != -1)
-        {
-          port = Integer.parseInt(address.substring(colon + 1));
-          address = address.substring(0, colon);
-        }
-      }
-
-      // [MACOSX] Must occur AFTER binding!
-      selectionKey = serverSocketChannel.register(selector.getSocketSelector(), SelectionKey.OP_ACCEPT, this);
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      deactivate();
-    }
-    finally
-    {
-      if (startLatch != null)
-      {
-        startLatch.countDown();
-      }
-    }
-  }
-
-  public void handleAccept(ITCPSelector selector, ServerSocketChannel serverSocketChannel)
-  {
-    try
-    {
-      SocketChannel socketChannel = serverSocketChannel.accept();
-      if (socketChannel != null)
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Accepted socketChannel " + socketChannel); //$NON-NLS-1$
-        }
-
-        // socketChannel.socket().setReuseAddress(true);
-        // socketChannel.socket().setKeepAlive(true);
-        socketChannel.configureBlocking(false);
-
-        TCPServerConnector connector = new TCPServerConnector(this);
-        prepareConnector(connector);
-        connector.setSocketChannel(socketChannel);
-        connector.setSelector(selector);
-        connector.activate();
-      }
-    }
-    catch (ClosedChannelException ex)
-    {
-      deactivate();
-    }
-    catch (Exception ex)
-    {
-      if (isActive())
-      {
-        OM.LOG.error(ex);
-      }
-      deactivate();
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("TCPAcceptor[{0}:{1}]", address, port); //$NON-NLS-1$ 
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (selector == null)
-    {
-      throw new IllegalStateException("selector == null");
-    }
-
-    if (startSynchronously)
-    {
-      startLatch = new CountDownLatch(1);
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    serverSocketChannel = ServerSocketChannel.open();
-    serverSocketChannel.configureBlocking(false);
-    selector.orderRegistration(serverSocketChannel, this);
-
-    if (startLatch != null)
-    {
-      if (!startLatch.await(synchronousStartTimeout, TimeUnit.MILLISECONDS))
-      {
-        startLatch = null;
-        IOUtil.closeSilent(serverSocketChannel);
-        throw new IOException("Registration with selector timed out after " + synchronousStartTimeout + " millis");
-      }
-    }
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    serverSocketChannel.close();
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java
deleted file mode 100644
index bc07b4354b..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.tcp.ITCPAcceptor;
-import org.eclipse.net4j.util.StringUtil;
-
-import org.eclipse.internal.net4j.acceptor.AcceptorFactory;
-
-/**
- * @author Eike Stepper
- */
-public class TCPAcceptorFactory extends AcceptorFactory
-{
-  public static final String TYPE = "tcp";
-
-  private static final String SEPARATOR = ":"; //$NON-NLS-1$
-
-  public TCPAcceptorFactory()
-  {
-    super(TYPE);
-  }
-
-  public TCPAcceptor create(String description)
-  {
-    String address = ITCPAcceptor.DEFAULT_ADDRESS;
-    int port = ITCPAcceptor.DEFAULT_PORT;
-
-    if (!StringUtil.isEmpty(description))
-    {
-      String[] tokens = description.split(SEPARATOR);
-      if (!StringUtil.isEmpty(tokens[0]))
-      {
-        address = tokens[0];
-      }
-
-      if (tokens.length > 1 && !StringUtil.isEmpty(tokens[1]))
-      {
-        port = Integer.parseInt(tokens[1]);
-      }
-    }
-
-    TCPAcceptor acceptor = new TCPAcceptor();
-    acceptor.setAddress(address);
-    acceptor.setPort(port);
-    return acceptor;
-  }
-
-  @Override
-  public String getDescriptionFor(Object object)
-  {
-    if (object instanceof TCPAcceptor)
-    {
-      TCPAcceptor acceptor = (TCPAcceptor)object;
-      return acceptor.getAddress() + SEPARATOR + acceptor.getPort();
-    }
-
-    return null;
-
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java
deleted file mode 100644
index 418de75ed7..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.connector.ConnectorLocation;
-import org.eclipse.net4j.internal.tcp.bundle.OM;
-import org.eclipse.net4j.tcp.ITCPSelector;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.channels.SocketChannel;
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class TCPClientConnector extends TCPConnector
-{
-  public TCPClientConnector()
-  {
-    try
-    {
-      SocketChannel socketChannel = SocketChannel.open();
-      // socketChannel.socket().setReuseAddress(true);
-      // socketChannel.socket().setKeepAlive(true);
-      socketChannel.configureBlocking(false);
-      setSocketChannel(socketChannel);
-    }
-    catch (IOException ex)
-    {
-      OM.LOG.error(ex);
-    }
-  }
-
-  public ConnectorLocation getLocation()
-  {
-    return ConnectorLocation.CLIENT;
-  }
-
-  @Override
-  public void setHost(String host)
-  {
-    super.setHost(host);
-  }
-
-  @Override
-  public void setPort(int port)
-  {
-    super.setPort(port);
-  }
-
-  @Override
-  public String toString()
-  {
-    if (getUserID() == null)
-    {
-      return MessageFormat.format("ClientTCPConnector[{0}:{1}]", getHost(), getPort()); //$NON-NLS-1$
-    }
-
-    return MessageFormat.format("ClientTCPConnector[{3}@{0}:{1}]", getHost(), getPort(), getUserID()); //$NON-NLS-1$
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (getHost() == null)
-    {
-      throw new IllegalStateException("host == null");
-    }
-
-    if (getPort() == 0)
-    {
-      throw new IllegalStateException("port == 0");
-    }
-  }
-
-  @Override
-  public void handleRegistration(ITCPSelector selector, SocketChannel socketChannel)
-  {
-    super.handleRegistration(selector, socketChannel);
-
-    try
-    {
-      InetAddress addr = InetAddress.getByName(getHost());
-      InetSocketAddress sAddr = new InetSocketAddress(addr, getPort());
-      getSocketChannel().connect(sAddr);
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      deactivate();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
deleted file mode 100644
index b3db21a364..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.ConnectorException;
-import org.eclipse.net4j.connector.ConnectorState;
-import org.eclipse.net4j.internal.tcp.bundle.OM;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.internal.util.security.NegotiationContext;
-import org.eclipse.net4j.protocol.IProtocol;
-import org.eclipse.net4j.tcp.ITCPActiveSelectorListener;
-import org.eclipse.net4j.tcp.ITCPConnector;
-import org.eclipse.net4j.tcp.ITCPSelector;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.security.INegotiationContext;
-
-import org.eclipse.internal.net4j.channel.InternalChannel;
-import org.eclipse.internal.net4j.connector.Connector;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.SocketChannel;
-import java.util.Queue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-/**
- * @author Eike Stepper
- */
-public abstract class TCPConnector extends Connector implements ITCPConnector, ITCPActiveSelectorListener
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, TCPConnector.class);
-
-  private SocketChannel socketChannel;
-
-  private ITCPSelector selector;
-
-  private SelectionKey selectionKey;
-
-  private BlockingQueue<InternalChannel> writeQueue = new LinkedBlockingQueue<InternalChannel>();
-
-  private IBuffer inputBuffer;
-
-  private ControlChannel controlChannel;
-
-  private String host;
-
-  private int port;
-
-  public TCPConnector()
-  {
-  }
-
-  public String getHost()
-  {
-    return host;
-  }
-
-  void setHost(String host)
-  {
-    this.host = host;
-  }
-
-  public int getPort()
-  {
-    return port;
-  }
-
-  void setPort(int port)
-  {
-    this.port = port;
-  }
-
-  public ITCPSelector getSelector()
-  {
-    return selector;
-  }
-
-  public void setSelector(ITCPSelector selector)
-  {
-    this.selector = selector;
-  }
-
-  public SocketChannel getSocketChannel()
-  {
-    return socketChannel;
-  }
-
-  /**
-   * SocketChannel must already be non-blocking!
-   */
-  public void setSocketChannel(SocketChannel socketChannel)
-  {
-    this.socketChannel = socketChannel;
-  }
-
-  public String getURL()
-  {
-    return "tcp://" + host + ":" + port;
-  }
-
-  public void handleRegistration(ITCPSelector selector, SocketChannel socketChannel)
-  {
-    try
-    {
-      int interest = isClient() ? SelectionKey.OP_CONNECT : SelectionKey.OP_READ;
-      selectionKey = socketChannel.register(selector.getSocketSelector(), interest, this);
-
-      if (isServer())
-      {
-        leaveConnecting();
-      }
-    }
-    catch (ClosedChannelException ex)
-    {
-      deactivate();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      deactivate();
-    }
-  }
-
-  public void handleConnect(ITCPSelector selector, SocketChannel channel)
-  {
-    try
-    {
-      if (channel.finishConnect())
-      {
-        selector.orderConnectInterest(selectionKey, true, false);
-        selector.orderReadInterest(selectionKey, true, true);
-        leaveConnecting();
-      }
-    }
-    catch (ClosedChannelException ex)
-    {
-      deactivate();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      deactivate();
-    }
-  }
-
-  public void handleRead(ITCPSelector selector, SocketChannel socketChannel)
-  {
-    try
-    {
-      if (inputBuffer == null)
-      {
-        inputBuffer = getBufferProvider().provideBuffer();
-      }
-
-      ByteBuffer byteBuffer = inputBuffer.startGetting(socketChannel);
-      if (byteBuffer != null)
-      {
-        short channelIndex = inputBuffer.getChannelIndex();
-        InternalChannel channel = channelIndex == ControlChannel.CONTROL_CHANNEL_INDEX ? controlChannel
-            : getChannel(channelIndex);
-        if (channel != null)
-        {
-          channel.handleBufferFromMultiplexer(inputBuffer);
-        }
-        else
-        {
-          if (TRACER.isEnabled())
-          {
-            TRACER.trace("Discarding buffer from unknown channel"); //$NON-NLS-1$
-          }
-
-          inputBuffer.release();
-        }
-
-        inputBuffer = null;
-      }
-    }
-    catch (IOException ex)
-    {
-      deactivate();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      deactivate();
-    }
-  }
-
-  /**
-   * Called by an {@link IChannel} each time a new buffer is available for multiplexing. This or another buffer can be
-   * dequeued from the outputQueue of the {@link IChannel}.
-   */
-  public void multiplexChannel(IChannel channel)
-  {
-    synchronized (writeQueue)
-    {
-      boolean firstChannel = writeQueue.isEmpty();
-
-      try
-      {
-        writeQueue.put((InternalChannel)channel);
-      }
-      catch (InterruptedException ex)
-      {
-        throw WrappedException.wrap(ex);
-      }
-
-      if (firstChannel)
-      {
-        checkSelectionKey();
-        selector.orderWriteInterest(selectionKey, isClient(), true);
-      }
-    }
-  }
-
-  public void handleWrite(ITCPSelector selector, SocketChannel socketChannel)
-  {
-    try
-    {
-      synchronized (writeQueue)
-      {
-        InternalChannel channel = writeQueue.peek();
-        if (channel != null)
-        {
-          Queue<IBuffer> bufferQueue = channel.getSendQueue();
-          if (bufferQueue != null)
-          {
-            IBuffer buffer = bufferQueue.peek();
-            if (buffer != null)
-            {
-              if (buffer.write(socketChannel))
-              {
-                writeQueue.poll();
-                bufferQueue.poll();
-                buffer.release();
-              }
-            }
-          }
-        }
-
-        if (writeQueue.isEmpty())
-        {
-          checkSelectionKey();
-          selector.orderWriteInterest(selectionKey, isClient(), false);
-        }
-      }
-    }
-    catch (NullPointerException ignore)
-    {
-    }
-    catch (ClosedChannelException ex)
-    {
-      deactivate();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      deactivate();
-    }
-  }
-
-  @Override
-  protected void registerChannelWithPeer(int channelID, short channelIndex, IProtocol protocol)
-      throws ConnectorException
-  {
-    try
-    {
-      if (!controlChannel.registerChannel(channelID, channelIndex, protocol))
-      {
-        throw new ConnectorException("Failed to register channel with peer"); //$NON-NLS-1$
-      }
-    }
-    catch (RuntimeException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new ConnectorException(ex);
-    }
-  }
-
-  @Override
-  public void inverseRemoveChannel(int channelID, short channelIndex)
-  {
-    try
-    {
-      InternalChannel channel = getChannel(channelIndex);
-      if (channel instanceof ControlChannel)
-      {
-        return;
-      }
-
-      if (channel != null)
-      {
-        super.removeChannel(channel);
-      }
-    }
-    catch (RuntimeException ex)
-    {
-      OM.LOG.warn(ex);
-    }
-  }
-
-  @Override
-  public boolean removeChannel(IChannel channel)
-  {
-    if (channel instanceof ControlChannel)
-    {
-      return true;
-    }
-
-    if (super.removeChannel(channel))
-    {
-      if (controlChannel != null && isConnected())
-      {
-        controlChannel.deregisterChannel(channel.getChannelID(), channel.getChannelIndex());
-      }
-
-      return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  protected INegotiationContext createNegotiationContext()
-  {
-    return new TCPNegotiationContext();
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (socketChannel == null)
-    {
-      throw new IllegalStateException("socketChannel == null");
-    }
-
-    if (selector == null)
-    {
-      throw new IllegalStateException("selector == null");
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    controlChannel = new ControlChannel(getNextChannelID(), this);
-    controlChannel.activate();
-    selector.orderRegistration(socketChannel, isClient(), this);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    selectionKey.cancel();
-
-    LifecycleUtil.deactivate(controlChannel);
-    IOUtil.closeSilent(socketChannel);
-    controlChannel = null;
-    socketChannel = null;
-    super.doDeactivate();
-  }
-
-  private void checkSelectionKey()
-  {
-    if (selectionKey == null)
-    {
-      throw new IllegalStateException("selectionKey == null");
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class TCPNegotiationContext extends NegotiationContext
-  {
-    private IBuffer buffer;
-
-    public TCPNegotiationContext()
-    {
-    }
-
-    public void setUserID(String userID)
-    {
-      TCPConnector.this.setUserID(userID);
-    }
-
-    public ByteBuffer getBuffer()
-    {
-      buffer = getBufferProvider().provideBuffer();
-      ByteBuffer byteBuffer = buffer.startPutting(ControlChannel.CONTROL_CHANNEL_INDEX);
-      byteBuffer.put(ControlChannel.OPCODE_NEGOTIATION);
-      return byteBuffer;
-    }
-
-    public void transmitBuffer(ByteBuffer byteBuffer)
-    {
-      if (buffer.getByteBuffer() != byteBuffer)
-      {
-        throw new IllegalArgumentException("The passed buffer is not the last that was produced");
-      }
-
-      controlChannel.sendBuffer(buffer);
-    }
-
-    @Override
-    public void setFinished(boolean success)
-    {
-      if (success)
-      {
-        TCPConnector.this.setState(ConnectorState.CONNECTED);
-      }
-      else
-      {
-        OM.LOG.error("Connector negotiation failed: " + TCPConnector.this);
-        deactivate();
-      }
-
-      super.setFinished(success);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java
deleted file mode 100644
index 1f02be5233..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.tcp.ITCPConnector;
-import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-import org.eclipse.internal.net4j.connector.ConnectorFactory;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-/**
- * @author Eike Stepper
- */
-public class TCPConnectorFactory extends ConnectorFactory
-{
-  public static final String TYPE = "tcp";
-
-  private static final String URL_SCHEME = "http://";
-
-  public TCPConnectorFactory()
-  {
-    super(TYPE);
-  }
-
-  public TCPClientConnector create(String description)
-  {
-    try
-    {
-      // TODO Don't use URL
-      // Scheme "tcp://" would be rejected!
-      URL url = new URL(URL_SCHEME + description);
-      String userID = url.getUserInfo();
-      String host = url.getHost();
-      int port = url.getPort();
-      if (port == -1)
-      {
-        port = ITCPConnector.DEFAULT_PORT;
-      }
-
-      TCPClientConnector connector = new TCPClientConnector();
-      connector.setUserID(userID);
-      connector.setHost(host);
-      connector.setPort(port);
-      return connector;
-    }
-    catch (MalformedURLException ex)
-    {
-      throw new ProductCreationException(ex);
-    }
-  }
-
-  @Override
-  public String getDescriptionFor(Object object)
-  {
-    if (object instanceof TCPClientConnector)
-    {
-      TCPClientConnector connector = (TCPClientConnector)object;
-      String description = connector.getHost();
-      String userID = connector.getUserID();
-      if (!StringUtil.isEmpty(userID))
-      {
-        description = userID + "@" + description;
-      }
-
-      int port = connector.getPort();
-      if (port != ITCPConnector.DEFAULT_PORT)
-      {
-        description = description + ":" + port;
-      }
-
-      return description;
-    }
-
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
deleted file mode 100644
index 09e745c72d..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.internal.tcp.bundle.OM;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.tcp.ITCPActiveSelectorListener;
-import org.eclipse.net4j.tcp.ITCPPassiveSelectorListener;
-import org.eclipse.net4j.tcp.ITCPSelector;
-
-import java.io.IOException;
-import java.nio.channels.CancelledKeyException;
-import java.nio.channels.ClosedSelectorException;
-import java.nio.channels.SelectableChannel;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.util.Iterator;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-/**
- * @author Eike Stepper
- */
-public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, TCPSelector.class);
-
-  private Selector selector;
-
-  /**
-   * Always processed <b>after</b> {@link #serverOperations}.
-   */
-  private transient Queue<Runnable> clientOperations = new ConcurrentLinkedQueue<Runnable>();
-
-  /**
-   * Always processed <b>before</b> {@link #clientOperations}.
-   */
-  private transient Queue<Runnable> serverOperations = new ConcurrentLinkedQueue<Runnable>();
-
-  private transient Thread thread;
-
-  private transient boolean running;
-
-  public TCPSelector()
-  {
-  }
-
-  public Selector getSocketSelector()
-  {
-    return selector;
-  }
-
-  public void orderRegistration(final ServerSocketChannel channel, final ITCPPassiveSelectorListener listener)
-  {
-    assertValidListener(listener);
-    order(false, new Runnable()
-    {
-      public void run()
-      {
-        executeRegistration(channel, listener);
-      }
-
-      @Override
-      public String toString()
-      {
-        return "REGISTER " + channel;
-      }
-    });
-  }
-
-  public void orderRegistration(final SocketChannel channel, final boolean client,
-      final ITCPActiveSelectorListener listener)
-  {
-    assertValidListener(listener);
-    order(client, new Runnable()
-    {
-      public void run()
-      {
-        executeRegistration(channel, listener, client);
-      }
-
-      @Override
-      public String toString()
-      {
-        return "REGISTER " + channel;
-      }
-    });
-  }
-
-  public void orderConnectInterest(final SelectionKey selectionKey, boolean client, final boolean on)
-  {
-    order(client, new Runnable()
-    {
-      public void run()
-      {
-        SelectorUtil.setConnectInterest(selectionKey, on);
-      }
-
-      @Override
-      public String toString()
-      {
-        return "INTEREST CONNECT " + selectionKey.channel() + " = " + on;
-      }
-    });
-  }
-
-  public void orderReadInterest(final SelectionKey selectionKey, boolean client, final boolean on)
-  {
-    order(client, new Runnable()
-    {
-      public void run()
-      {
-        SelectorUtil.setReadInterest(selectionKey, on);
-      }
-
-      @Override
-      public String toString()
-      {
-        return "INTEREST READ " + selectionKey.channel() + " = " + on;
-      }
-    });
-  }
-
-  public void orderWriteInterest(final SelectionKey selectionKey, boolean client, final boolean on)
-  {
-    order(client, new Runnable()
-    {
-      public void run()
-      {
-        SelectorUtil.setWriteInterest(selectionKey, on);
-      }
-
-      @Override
-      public String toString()
-      {
-        return "INTEREST WRITE " + selectionKey.channel() + " = " + on;
-      }
-    });
-  }
-
-  public void run()
-  {
-    while (running && !Thread.interrupted())
-    {
-      try
-      {
-        processOperations(false);
-        processOperations(true);
-        if (selector != null && selector.select() > 0)
-        {
-          Iterator<SelectionKey> it = selector.selectedKeys().iterator();
-          while (it.hasNext())
-          {
-            SelectionKey selKey = it.next();
-            it.remove();
-
-            try
-            {
-              handleSelection(selKey);
-            }
-            catch (CancelledKeyException ignore)
-            {
-              ; // Do nothing
-            }
-            catch (NullPointerException ignore)
-            {
-              ; // Do nothing
-            }
-            catch (Exception ex)
-            {
-              OM.LOG.info(ex.getMessage());
-              selKey.cancel();
-            }
-          }
-        }
-      }
-      catch (NullPointerException ex)
-      {
-        break;
-      }
-      catch (ClosedSelectorException ex)
-      {
-        break;
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-        break;
-      }
-    }
-
-    deactivate();
-  }
-
-  @Override
-  public String toString()
-  {
-    return "TCPSelector"; //$NON-NLS-1$
-  }
-
-  protected void handleSelection(SelectionKey selKey) throws IOException
-  {
-    SelectableChannel channel = selKey.channel();
-    if (channel instanceof ServerSocketChannel)
-    {
-      ServerSocketChannel ssChannel = (ServerSocketChannel)selKey.channel();
-      if (ssChannel.isOpen())
-      {
-        ITCPPassiveSelectorListener listener = (ITCPPassiveSelectorListener)selKey.attachment();
-
-        if (selKey.isAcceptable())
-        {
-          if (TRACER.isEnabled())
-          {
-            TRACER.trace("Accepting " + ssChannel); //$NON-NLS-1$
-          }
-
-          listener.handleAccept(this, ssChannel);
-        }
-      }
-    }
-    else if (channel instanceof SocketChannel)
-    {
-      SocketChannel sChannel = (SocketChannel)channel;
-      ITCPActiveSelectorListener listener = (ITCPActiveSelectorListener)selKey.attachment();
-
-      if (selKey.isConnectable())
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Connecting " + sChannel); //$NON-NLS-1$
-        }
-
-        listener.handleConnect(this, sChannel);
-      }
-
-      if (selKey.isReadable())
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Reading " + sChannel); //$NON-NLS-1$
-        }
-
-        listener.handleRead(this, sChannel);
-      }
-
-      if (selKey.isWritable())
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Writing " + sChannel); //$NON-NLS-1$
-        }
-
-        listener.handleWrite(this, sChannel);
-      }
-    }
-  }
-
-  protected Selector openSelector() throws IOException
-  {
-    return Selector.open();
-  }
-
-  protected void closeSelector() throws IOException
-  {
-    selector.close();
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    running = true;
-    selector = openSelector();
-
-    thread = new Thread(this, "TCPSelector"); //$NON-NLS-1$
-    thread.setDaemon(true);
-    thread.start();
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    running = false;
-    selector.wakeup();
-    Exception exception = null;
-
-    try
-    {
-      thread.join(200);
-    }
-    catch (RuntimeException ex)
-    {
-      if (exception == null)
-      {
-        exception = ex;
-      }
-    }
-    finally
-    {
-      thread = null;
-    }
-
-    try
-    {
-      closeSelector();
-    }
-    catch (Exception ex)
-    {
-      if (exception == null)
-      {
-        exception = ex;
-      }
-    }
-    finally
-    {
-      selector = null;
-    }
-
-    super.doDeactivate();
-    if (exception != null)
-    {
-      throw exception;
-    }
-  }
-
-  private void assertValidListener(Object listener)
-  {
-    if (listener == null)
-    {
-      throw new IllegalArgumentException("listener == null"); //$NON-NLS-1$
-    }
-  }
-
-  private void order(boolean client, Runnable operation)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Ordering {0} operation {1}", client ? "client" : "server", operation);
-    }
-
-    if (client)
-    {
-      clientOperations.add(operation);
-    }
-    else
-    {
-      serverOperations.add(operation);
-    }
-
-    if (selector != null)
-    {
-      selector.wakeup();
-    }
-  }
-
-  private void processOperations(boolean client)
-  {
-    Runnable operation;
-    Queue<Runnable> operations = client ? clientOperations : serverOperations;
-    while ((operation = operations.poll()) != null)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.format("Executing {0} operation {1}", client ? "client" : "server", operation);
-      }
-
-      operation.run();
-    }
-  }
-
-  private void executeRegistration(final ServerSocketChannel channel, final ITCPPassiveSelectorListener listener)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Registering " + channel); //$NON-NLS-1$
-    }
-
-    try
-    {
-      listener.handleRegistration(this, channel);
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.debug(ex);
-    }
-  }
-
-  private void executeRegistration(final SocketChannel channel, final ITCPActiveSelectorListener listener,
-      boolean client)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Registering " + channel); //$NON-NLS-1$
-    }
-
-    try
-    {
-      listener.handleRegistration(this, channel);
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.debug(ex);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
deleted file mode 100644
index 571cffd297..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.internal.util.factory.Factory;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public class TCPSelectorFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.selectors";
-
-  public static final String TYPE = "tcp";
-
-  public TCPSelectorFactory()
-  {
-    super(PRODUCT_GROUP, TYPE);
-  }
-
-  public TCPSelector create(String description)
-  {
-    return new TCPSelector();
-  }
-
-  public static TCPSelector get(IManagedContainer container, String description)
-  {
-    return (TCPSelector)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java
deleted file mode 100644
index 15e3125228..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public class TCPSelectorInjector implements IElementProcessor
-{
-  public static final String TYPE = null;
-
-  public TCPSelectorInjector()
-  {
-  }
-
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
-  {
-    if (element instanceof TCPAcceptor)
-    {
-      TCPAcceptor acceptor = (TCPAcceptor)element;
-      if (acceptor.getSelector() == null)
-      {
-        acceptor.setSelector(getSelector(container));
-      }
-    }
-    else if (element instanceof TCPConnector)
-    {
-      TCPConnector connector = (TCPConnector)element;
-      if (connector.getSelector() == null)
-      {
-        connector.setSelector(getSelector(container));
-      }
-    }
-
-    return element;
-  }
-
-  protected TCPSelector getSelector(IManagedContainer container)
-  {
-    return TCPSelectorFactory.get(container, null);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java
deleted file mode 100644
index 57570720fb..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp;
-
-import org.eclipse.net4j.connector.ConnectorLocation;
-import org.eclipse.net4j.internal.tcp.bundle.OM;
-import org.eclipse.net4j.tcp.ITCPSelector;
-
-import java.nio.channels.SocketChannel;
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class TCPServerConnector extends TCPConnector
-{
-  private TCPAcceptor acceptor;
-
-  public TCPServerConnector(TCPAcceptor acceptor)
-  {
-    this.acceptor = acceptor;
-  }
-
-  public TCPAcceptor getAcceptor()
-  {
-    return acceptor;
-  }
-
-  public ConnectorLocation getLocation()
-  {
-    return ConnectorLocation.SERVER;
-  }
-
-  @Override
-  public String getHost()
-  {
-    try
-    {
-      return getSocketChannel().socket().getInetAddress().getHostAddress();
-    }
-    catch (RuntimeException ex)
-    {
-      return null;
-    }
-  }
-
-  @Override
-  public int getPort()
-  {
-    try
-    {
-      return getSocketChannel().socket().getPort();
-    }
-    catch (RuntimeException ex)
-    {
-      return 0;
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    if (getUserID() == null)
-    {
-      return MessageFormat.format("ServerTCPConnector[{0}:{1}]", getHost(), getPort()); //$NON-NLS-1$
-    }
-
-    return MessageFormat.format("ServerTCPConnector[{3}@{0}:{1}]", getHost(), getPort(), getUserID()); //$NON-NLS-1$
-  }
-
-  @Override
-  public void handleRegistration(ITCPSelector selector, SocketChannel socketChannel)
-  {
-    super.handleRegistration(selector, socketChannel);
-
-    try
-    {
-      acceptor.addConnector(this);
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      deactivate();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
deleted file mode 100644
index 7600c05df5..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.tcp.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.tcp"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final int PROTOCOL_REGISTRATION_TIMEOUT = BUNDLE.getDebugSupport().getDebugOption(
-      "protocol.registration.timeout", 10000); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
deleted file mode 100644
index bb965573d8..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tcp;
-
-import org.eclipse.net4j.acceptor.IAcceptor;
-
-/**
- * @author Eike Stepper
- */
-public interface ITCPAcceptor extends IAcceptor
-{
-  public static final String DEFAULT_ADDRESS = "0.0.0.0"; //$NON-NLS-1$
-
-  public static final int DEFAULT_PORT = 2036;
-
-  public String getAddress();
-
-  public int getPort();
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPActiveSelectorListener.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPActiveSelectorListener.java
deleted file mode 100644
index 95b8c73ec5..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPActiveSelectorListener.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tcp;
-
-import java.nio.channels.SocketChannel;
-
-/**
- * @author Eike Stepper
- */
-public interface ITCPActiveSelectorListener
-{
-  public void handleRegistration(ITCPSelector selector, SocketChannel socketChannel);
-
-  public void handleConnect(ITCPSelector selector, SocketChannel socketChannel);
-
-  public void handleRead(ITCPSelector selector, SocketChannel socketChannel);
-
-  public void handleWrite(ITCPSelector selector, SocketChannel socketChannel);
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java
deleted file mode 100644
index 91c7c4f843..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tcp;
-
-import org.eclipse.net4j.connector.IConnector;
-
-/**
- * @author Eike Stepper
- */
-public interface ITCPConnector extends IConnector
-{
-  public static final int DEFAULT_PORT = ITCPAcceptor.DEFAULT_PORT;
-
-  public String getHost();
-
-  public int getPort();
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java
deleted file mode 100644
index caf1662399..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tcp;
-
-import java.nio.channels.ServerSocketChannel;
-
-/**
- * @author Eike Stepper
- */
-public interface ITCPPassiveSelectorListener
-{
-  public void handleRegistration(ITCPSelector selector, ServerSocketChannel serverSocketChannel);
-
-  public void handleAccept(ITCPSelector selector, ServerSocketChannel serverSocketChannel);
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java
deleted file mode 100644
index 34e19f0491..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tcp;
-
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-
-/**
- * @author Eike Stepper
- */
-public interface ITCPSelector
-{
-  public Selector getSocketSelector();
-
-  public void orderRegistration(ServerSocketChannel channel, ITCPPassiveSelectorListener listener);
-
-  public void orderRegistration(SocketChannel channel, boolean client, ITCPActiveSelectorListener listener);
-
-  public void orderConnectInterest(SelectionKey selectionKey, boolean client, boolean on);
-
-  public void orderReadInterest(SelectionKey selectionKey, boolean client, boolean on);
-
-  public void orderWriteInterest(SelectionKey selectionKey, boolean client, boolean on);
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/TCPUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/TCPUtil.java
deleted file mode 100644
index c8983e83e1..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/TCPUtil.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tcp;
-
-import org.eclipse.net4j.internal.tcp.TCPAcceptorFactory;
-import org.eclipse.net4j.internal.tcp.TCPConnectorFactory;
-import org.eclipse.net4j.internal.tcp.TCPSelectorFactory;
-import org.eclipse.net4j.internal.tcp.TCPSelectorInjector;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public final class TCPUtil
-{
-  private TCPUtil()
-  {
-  }
-
-  public static void prepareContainer(IManagedContainer container)
-  {
-    container.registerFactory(new TCPSelectorFactory());
-    container.registerFactory(new TCPAcceptorFactory());
-    container.registerFactory(new TCPConnectorFactory());
-    container.addPostProcessor(new TCPSelectorInjector());
-  }
-
-  public static ITCPAcceptor getAcceptor(IManagedContainer container, String description)
-  {
-    return (ITCPAcceptor)container.getElement(TCPAcceptorFactory.PRODUCT_GROUP, TCPAcceptorFactory.TYPE, description);
-  }
-
-  public static ITCPConnector getConnector(IManagedContainer container, String description)
-  {
-    return (ITCPConnector)container
-        .getElement(TCPConnectorFactory.PRODUCT_GROUP, TCPConnectorFactory.TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package.html b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package.html
deleted file mode 100644
index 55417917d1..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Transport layer extension with support for TCP socket connections. 
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.tests/.classpath b/plugins/org.eclipse.net4j.tests/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.tests/.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.tests/.cvsignore b/plugins/org.eclipse.net4j.tests/.cvsignore
deleted file mode 100644
index 4824d73869..0000000000
--- a/plugins/org.eclipse.net4j.tests/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-*.zip
-testMap.dat
diff --git a/plugins/org.eclipse.net4j.tests/.project b/plugins/org.eclipse.net4j.tests/.project
deleted file mode 100644
index 513e06956d..0000000000
--- a/plugins/org.eclipse.net4j.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.tests</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 00ca9476a2..0000000000
--- a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:44:22 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 847ae49ad6..0000000000
--- a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:44:22 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 66347c68f0..0000000000
--- a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Oct 20 11:53:34 CEST 2006
-eclipse.preferences.version=1
-pluginProject.extensions=false
diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index baf51c0fe0..0000000000
--- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.tests
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.tests.bundle.Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j.tcp;visibility:=reexport,
- org.eclipse.net4j.jvm;visibility:=reexport,
- org.junit;visibility:=reexport
-Export-Package: org.eclipse.net4j.tests,
- org.eclipse.net4j.tests.signal,
- org.eclipse.net4j.util.tests,
- org.eclipse.net4j.util.tests.cache
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.tests/Net4j AllTests.launch b/plugins/org.eclipse.net4j.tests/Net4j AllTests.launch
deleted file mode 100644
index 4a82821baf..0000000000
--- a/plugins/org.eclipse.net4j.tests/Net4j AllTests.launch
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<stringAttribute key="bad_container_name" value="\org.eclipse.net4.tests"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;org.eclipse.emf.cdo&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Ddebug=true"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.tests/Net4j OSGi.launch b/plugins/org.eclipse.net4j.tests/Net4j OSGi.launch
deleted file mode 100644
index 8fed774488..0000000000
--- a/plugins/org.eclipse.net4j.tests/Net4j OSGi.launch
+++ /dev/null
@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.net4j"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.emf.cdo.dbgen.editor,org.eclipse.emf.cdo.utilities.migrator,template,org.eclipse.emf.cdo.examples.server,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.examples.client,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.examples.ui,org.eclipse.emf.cdo.client,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.client.ocl,org.eclipse.emf.cdo.dbgen.edit,org.eclipse.emf.cdo.examples.library,org.eclipse.emf.cdo.examples.library.ui,org.eclipse.emf.cdo.client.edit,org.eclipse.emf.cdo.jdbc.derby,org.eclipse.emf.cdo.dbgen.derby,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.net4j.tests.SignalTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-Ddebug&#13;&#10;-Dconsole&#13;&#10;-DconsoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.net4j.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.net4j"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.emf.common,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jdt.junit.runtime,org.eclipse.jface,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde.junit.runtime,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.workbench,org.junit"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.tests,org.eclipse.net4j"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="true"/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.team.ftp/requests" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug" value="true"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/execute" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/services/config" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/resources" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/events/tracing" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/plugin/ondemand/loading" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.net4j/perf" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/activate" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j/debug" value="true"/>
-<mapEntry key="org.eclipse.team.ftp/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/execute" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/model/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/services/config" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/events" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/run" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/events/tracing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.net4j/debug.lifecycle.dump" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="com.soyatec.uml.core/trace/level" value="error"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="com.soyatec.uml.core/trace/module/UMLPlugin" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/redo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/persistencemgr" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug" value="true"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/dnd/tracing" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/run" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/catching" value="false"/>
-<mapEntry key="com.soyatec.uml.core/trace/module/viewEvent" value="false"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/canonical" value="false"/>
-<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.emf.query/debug" value="true"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/admin" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.net4j/debug.lifecycle" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/config" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/repeat" value="false"/>
-<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="com.soyatec.uml.std/trace/module/modelMapper" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug" value="true"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="com.soyatec.uml.std/trace/module/modelJavaEvent" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/undo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/admin" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.emf.ocl/debug" value="true"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/resource/tracing" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/exiting" value="false"/>
-</mapAttribute>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useNamedJRE" value="true"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.net4j.tests/about.html b/plugins/org.eclipse.net4j.tests/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.tests/about.html
+++ /dev/null
@@ -1,28 +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.tests/about.ini b/plugins/org.eclipse.net4j.tests/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.net4j.tests/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.tests/about.mappings b/plugins/org.eclipse.net4j.tests/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.net4j.tests/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.tests/about.properties b/plugins/org.eclipse.net4j.tests/about.properties
deleted file mode 100644
index 47cce04221..0000000000
--- a/plugins/org.eclipse.net4j.tests/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 Tests(Incubation)
-featureText = Net4j Tests\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/Net4j
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.tests/build.properties b/plugins/org.eclipse.net4j.tests/build.properties
deleted file mode 100644
index e842be8eed..0000000000
--- a/plugins/org.eclipse.net4j.tests/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               test.xml,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
diff --git a/plugins/org.eclipse.net4j.tests/copyright.txt b/plugins/org.eclipse.net4j.tests/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.tests/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.tests/epl-v10.html b/plugins/org.eclipse.net4j.tests/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.tests/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.tests/license.html b/plugins/org.eclipse.net4j.tests/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.tests/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.tests/modeling32.png b/plugins/org.eclipse.net4j.tests/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.net4j.tests/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.tests/plugin.properties b/plugins/org.eclipse.net4j.tests/plugin.properties
deleted file mode 100644
index 2b46fc1ebf..0000000000
--- a/plugins/org.eclipse.net4j.tests/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Tests (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
deleted file mode 100644
index 2850dbe7b7..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.acceptor.IAcceptor;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.util.container.ManagedContainer;
-import org.eclipse.net4j.jvm.JVMUtil;
-import org.eclipse.net4j.tcp.TCPUtil;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.tests.AbstractOMTest;
-
-import org.eclipse.internal.net4j.acceptor.Acceptor;
-import org.eclipse.internal.net4j.connector.Connector;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractTransportTest extends AbstractOMTest
-{
-  protected static final String HOST = "localhost";
-
-  protected IManagedContainer container;
-
-  private IAcceptor acceptor;
-
-  private IConnector connector;
-
-  @Override
-  protected void doSetUp() throws Exception
-  {
-    super.doSetUp();
-    container = createContainer();
-    LifecycleUtil.activate(container);
-  }
-
-  @Override
-  protected void doTearDown() throws Exception
-  {
-    try
-    {
-      sleep(20);
-      LifecycleUtil.deactivate(container);
-    }
-    finally
-    {
-      connector = null;
-      acceptor = null;
-      container = null;
-      super.doTearDown();
-    }
-  }
-
-  protected boolean useJVMTransport()
-  {
-    return false;
-  }
-
-  protected IManagedContainer createContainer()
-  {
-    IManagedContainer container = new ManagedContainer();
-    Net4jUtil.prepareContainer(container);
-    if (useJVMTransport())
-    {
-      JVMUtil.prepareContainer(container);
-    }
-    else
-    {
-      TCPUtil.prepareContainer(container);
-    }
-
-    return container;
-  }
-
-  protected IAcceptor getAcceptor()
-  {
-    if (acceptor == null)
-    {
-      if (useJVMTransport())
-      {
-        acceptor = (Acceptor)JVMUtil.getAcceptor(container, "default");
-      }
-      else
-      {
-        acceptor = (Acceptor)TCPUtil.getAcceptor(container, null);
-      }
-    }
-
-    return acceptor;
-  }
-
-  protected IConnector getConnector()
-  {
-    if (connector == null)
-    {
-      if (useJVMTransport())
-      {
-        connector = (Connector)JVMUtil.getConnector(container, "default");
-      }
-      else
-      {
-        connector = (Connector)TCPUtil.getConnector(container, HOST);
-      }
-    }
-
-    return connector;
-  }
-
-  protected void startTransport() throws Exception
-  {
-    if (container != null)
-    {
-      IAcceptor acceptor = getAcceptor();
-      LifecycleUtil.activate(acceptor);
-
-      IConnector connector = getConnector();
-      LifecycleUtil.activate(connector);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllTests.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllTests.java
deleted file mode 100644
index 35fd5d04bc..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllTests.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.util.tests.ExtendedIOTest;
-import org.eclipse.net4j.util.tests.MonitorTest;
-import org.eclipse.net4j.util.tests.MultiMapTest;
-import org.eclipse.net4j.util.tests.ReferenceValueMapTest;
-import org.eclipse.net4j.util.tests.SortedFileMapTest;
-import org.eclipse.net4j.util.tests.SynchronizingCorrelatorTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Eike Stepper
- */
-public class AllTests
-{
-  public static Test suite()
-  {
-    TestSuite suite = new TestSuite("Tests for Net4j");
-
-    // $JUnit-BEGIN$
-    suite.addTestSuite(MonitorTest.class);
-    suite.addTestSuite(MultiMapTest.class);
-    suite.addTestSuite(SortedFileMapTest.class);
-    suite.addTestSuite(SynchronizingCorrelatorTest.class);
-    suite.addTestSuite(ReferenceValueMapTest.class);
-    suite.addTestSuite(BufferPoolTest.class);
-    suite.addTestSuite(ExtendedIOTest.class);
-    // suite.addTestSuite(SecurityTest.class);
-    // TODO suite.addTestSuite(ConnectorTest.class);
-    // $JUnit-END$
-
-    return suite;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java
deleted file mode 100644
index 2bc848e01e..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferPool;
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.tests.AbstractOMTest;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * @author Eike Stepper
- */
-public class BufferPoolTest extends AbstractOMTest
-{
-  private static IBufferPool bufferPool = Net4jUtil.createBufferPool();
-
-  private static Collection<byte[]> memory = new ArrayList<byte[]>();
-
-  @Override
-  protected void doTearDown() throws Exception
-  {
-    memory.clear();
-    super.doTearDown();
-  }
-
-  public void testBufferPool() throws Exception
-  {
-    LifecycleUtil.activate(bufferPool);
-
-    IBuffer[] buffers = new IBuffer[10];
-    for (int i = 0; i < buffers.length; i++)
-    {
-      buffers[i] = bufferPool.provideBuffer();
-    }
-
-    for (int i = 0; i < buffers.length; i++)
-    {
-      bufferPool.retainBuffer(buffers[i]);
-      buffers[i] = null;
-    }
-
-    while (Net4jUtil.getPooledBuffers(bufferPool) > 0 && allocate())
-    {
-      sleep(200);
-      ReflectUtil.dump(bufferPool);
-    }
-
-    LifecycleUtil.deactivate(bufferPool);
-  }
-
-  private static void msg()
-  {
-    msg("pooledBuffers = " + Net4jUtil.getPooledBuffers(bufferPool));
-  }
-
-  private static boolean allocate()
-  {
-    try
-    {
-      IOUtil.OUT().println("allocating from " + Runtime.getRuntime().freeMemory());
-      for (int i = 0; i < 10; i++)
-      {
-        memory.add(new byte[1000000]);
-      }
-
-      msg();
-      return true;
-    }
-    catch (Throwable t)
-    {
-      return false;
-    }
-  }
-
-  @SuppressWarnings("unused")
-  private static void gc()
-  {
-    msg();
-    IOUtil.OUT().println("collecting garbage");
-    System.gc();
-    msg();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java
deleted file mode 100644
index ed8c9f2242..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-import org.eclipse.internal.net4j.protocol.ClientProtocolFactory;
-
-/**
- * @author Eike Stepper
- */
-public class ClientTestProtocolFactory extends ClientProtocolFactory
-{
-  public static final String TYPE = ServerTestProtocolFactory.TYPE;
-
-  public ClientTestProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public TestProtocol create(String description) throws ProductCreationException
-  {
-    return new TestProtocol(null);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java
deleted file mode 100644
index b012edcc68..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.buffer.IBufferPool;
-import org.eclipse.net4j.internal.tcp.TCPAcceptor;
-import org.eclipse.net4j.internal.tcp.TCPClientConnector;
-import org.eclipse.net4j.internal.tcp.TCPSelector;
-import org.eclipse.net4j.internal.util.security.ChallengeNegotiator;
-import org.eclipse.net4j.internal.util.security.PasswordCredentials;
-import org.eclipse.net4j.internal.util.security.PasswordCredentialsProvider;
-import org.eclipse.net4j.internal.util.security.Randomizer;
-import org.eclipse.net4j.internal.util.security.ResponseNegotiator;
-import org.eclipse.net4j.internal.util.security.UserManager;
-import org.eclipse.net4j.tcp.ITCPSelector;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.tests.AbstractOMTest;
-
-import java.nio.channels.ServerSocketChannel;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * @author Eike Stepper
- */
-public class ConnectorTest extends AbstractOMTest
-{
-  private static final int TIMEOUT = 10000;
-
-  private static final String USER_ID = "stepper";
-
-  private static final char[] PASSWORD1 = "eike2007".toCharArray();
-
-  private static final char[] PASSWORD2 = "invalid".toCharArray();
-
-  private static final PasswordCredentials CREDENTIALS = new PasswordCredentials(USER_ID, PASSWORD1);
-
-  private ExecutorService threadPool;
-
-  private IBufferPool bufferPool;
-
-  private TCPSelector selector;
-
-  private TCPAcceptor acceptor;
-
-  private TCPClientConnector connector;
-
-  private Randomizer randomizer;
-
-  private UserManager userManager;
-
-  private ChallengeNegotiator challengeNegotiator;
-
-  private PasswordCredentialsProvider credentialsProvider;
-
-  private ResponseNegotiator responseNegotiator;
-
-  @Override
-  protected void doTearDown() throws Exception
-  {
-    cleanup();
-    super.doTearDown();
-  }
-
-  private void cleanup() throws Exception
-  {
-    sleep(100);
-    LifecycleUtil.deactivate(connector);
-    LifecycleUtil.deactivate(responseNegotiator);
-    LifecycleUtil.deactivate(credentialsProvider);
-    connector = null;
-    responseNegotiator = null;
-    credentialsProvider = null;
-
-    LifecycleUtil.deactivate(acceptor);
-    LifecycleUtil.deactivate(challengeNegotiator);
-    LifecycleUtil.deactivate(userManager);
-    LifecycleUtil.deactivate(randomizer);
-    acceptor = null;
-    challengeNegotiator = null;
-    userManager = null;
-    randomizer = null;
-
-    LifecycleUtil.deactivate(selector);
-    LifecycleUtil.deactivate(bufferPool);
-    LifecycleUtil.deactivate(threadPool);
-    selector = null;
-    bufferPool = null;
-    threadPool = null;
-  }
-
-  public void testDeferredActivation() throws Exception
-  {
-    final long DELAY = 500L;
-    threadPool = Executors.newCachedThreadPool();
-    LifecycleUtil.activate(threadPool);
-
-    bufferPool = Net4jUtil.createBufferPool();
-    LifecycleUtil.activate(bufferPool);
-
-    selector = new TCPSelector();
-    selector.activate();
-
-    acceptor = new TCPAcceptor()
-    {
-      @Override
-      public void handleAccept(ITCPSelector selector, ServerSocketChannel serverSocketChannel)
-      {
-        ConcurrencyUtil.sleep(DELAY);
-        super.handleAccept(selector, serverSocketChannel);
-      }
-    };
-
-    acceptor.setStartSynchronously(true);
-    acceptor.setSynchronousStartTimeout(TIMEOUT);
-    acceptor.setBufferProvider(bufferPool);
-    acceptor.setReceiveExecutor(threadPool);
-    acceptor.setSelector(selector);
-    acceptor.setAddress("0.0.0.0");
-    acceptor.setPort(2036);
-    acceptor.activate();
-
-    connector = new TCPClientConnector();
-    connector.setBufferProvider(bufferPool);
-    connector.setReceiveExecutor(threadPool);
-    connector.setSelector(selector);
-    connector.setHost("localhost");
-    connector.setPort(2036);
-    connector.activate();
-    assertEquals(false, connector.isActive());
-
-    boolean connected = connector.waitForConnection(DELAY + TIMEOUT);
-    assertEquals(true, connected);
-    assertEquals(true, connector.isActive());
-  }
-
-  public void testDeferredActivation100() throws Exception
-  {
-    for (int i = 0; i < 100; i++)
-    {
-      IOUtil.OUT().println();
-      IOUtil.OUT().println();
-      IOUtil.OUT().println();
-      IOUtil.OUT().println("#####################################################");
-      IOUtil.OUT().println(" RUN = " + i);
-      IOUtil.OUT().println("#####################################################");
-      IOUtil.OUT().println();
-      IOUtil.OUT().println();
-      IOUtil.OUT().println();
-      testDeferredActivation();
-      cleanup();
-    }
-  }
-
-  public void testNegotiationSuccess() throws Exception
-  {
-    threadPool = Executors.newCachedThreadPool();
-    LifecycleUtil.activate(threadPool);
-
-    bufferPool = Net4jUtil.createBufferPool();
-    LifecycleUtil.activate(bufferPool);
-
-    randomizer = new Randomizer();
-    randomizer.activate();
-
-    userManager = new UserManager();
-    userManager.activate();
-    userManager.addUser(USER_ID, PASSWORD1);
-
-    challengeNegotiator = new ChallengeNegotiator();
-    challengeNegotiator.setRandomizer(randomizer);
-    challengeNegotiator.setUserManager(userManager);
-    challengeNegotiator.activate();
-
-    selector = new TCPSelector();
-    selector.activate();
-
-    acceptor = new TCPAcceptor();
-    acceptor.setStartSynchronously(true);
-    acceptor.setSynchronousStartTimeout(TIMEOUT);
-    acceptor.setBufferProvider(bufferPool);
-    acceptor.setReceiveExecutor(threadPool);
-    // acceptor.setNegotiator(challengeNegotiator);
-    acceptor.setSelector(selector);
-    acceptor.setAddress("0.0.0.0");
-    acceptor.setPort(2036);
-    acceptor.activate();
-
-    credentialsProvider = new PasswordCredentialsProvider(CREDENTIALS);
-    LifecycleUtil.activate(credentialsProvider);
-
-    responseNegotiator = new ResponseNegotiator();
-    responseNegotiator.setCredentialsProvider(credentialsProvider);
-    responseNegotiator.activate();
-
-    connector = new TCPClientConnector();
-    connector.setBufferProvider(bufferPool);
-    connector.setReceiveExecutor(threadPool);
-    // connector.setNegotiator(responseNegotiator);
-    connector.setSelector(selector);
-    connector.setHost("localhost");
-    connector.setPort(2036);
-    connector.activate();
-
-    boolean connected = connector.waitForConnection(TIMEOUT);
-    assertEquals(true, connected);
-  }
-
-  public void testNegotiationSuccess100() throws Exception
-  {
-    for (int i = 0; i < 100; i++)
-    {
-      IOUtil.OUT().println();
-      IOUtil.OUT().println();
-      IOUtil.OUT().println();
-      IOUtil.OUT().println("#####################################################");
-      IOUtil.OUT().println("                          RUN = " + i);
-      IOUtil.OUT().println("#####################################################");
-      IOUtil.OUT().println();
-      IOUtil.OUT().println();
-      IOUtil.OUT().println();
-      testNegotiationSuccess();
-      cleanup();
-    }
-  }
-
-  public void testNegotiationFailure() throws Exception
-  {
-    ExecutorService threadPool = Executors.newCachedThreadPool();
-    LifecycleUtil.activate(threadPool);
-
-    IBufferPool bufferPool = Net4jUtil.createBufferPool();
-    LifecycleUtil.activate(bufferPool);
-
-    Randomizer randomizer = new Randomizer();
-    randomizer.activate();
-
-    UserManager userManager = new UserManager();
-    userManager.activate();
-    userManager.addUser(USER_ID, PASSWORD2);
-
-    ChallengeNegotiator challengeNegotiator = new ChallengeNegotiator();
-    challengeNegotiator.setRandomizer(randomizer);
-    challengeNegotiator.setUserManager(userManager);
-    challengeNegotiator.activate();
-
-    TCPSelector selector = new TCPSelector();
-    selector.activate();
-
-    acceptor = new TCPAcceptor();
-    acceptor.setStartSynchronously(true);
-    acceptor.setSynchronousStartTimeout(TIMEOUT);
-    acceptor.setBufferProvider(bufferPool);
-    acceptor.setReceiveExecutor(threadPool);
-    acceptor.setNegotiator(challengeNegotiator);
-    acceptor.setSelector(selector);
-    acceptor.setAddress("0.0.0.0");
-    acceptor.setPort(2036);
-    acceptor.activate();
-
-    PasswordCredentialsProvider credentialsProvider = new PasswordCredentialsProvider(CREDENTIALS);
-    LifecycleUtil.activate(credentialsProvider);
-
-    ResponseNegotiator responseNegotiator = new ResponseNegotiator();
-    responseNegotiator.setCredentialsProvider(credentialsProvider);
-    responseNegotiator.activate();
-
-    TCPClientConnector connector = new TCPClientConnector();
-    connector.setBufferProvider(bufferPool);
-    connector.setReceiveExecutor(threadPool);
-    connector.setNegotiator(responseNegotiator);
-    connector.setSelector(selector);
-    connector.setHost("localhost");
-    connector.setPort(2036);
-    connector.activate();
-
-    boolean connected = connector.waitForConnection(TIMEOUT);
-    assertEquals(false, connected);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java
deleted file mode 100644
index 5d3f9d8497..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.failover.IFailOverStrategy;
-import org.eclipse.net4j.signal.failover.RetryFailOverStrategy;
-import org.eclipse.net4j.tests.signal.IntFailRequest;
-import org.eclipse.net4j.tests.signal.IntRequest;
-import org.eclipse.net4j.tests.signal.TestSignalClientProtocolFactory;
-import org.eclipse.net4j.tests.signal.TestSignalServerProtocolFactory;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-/**
- * @author Eike Stepper
- */
-public class FailOverTest extends AbstractTransportTest
-{
-  @Override
-  protected IManagedContainer createContainer()
-  {
-    IManagedContainer container = super.createContainer();
-    container.registerFactory(new TestSignalServerProtocolFactory());
-    container.registerFactory(new TestSignalClientProtocolFactory());
-    return container;
-  }
-
-  public void testFailingBefore() throws Exception
-  {
-    startTransport();
-    IChannel channel = getConnector().openChannel(TestSignalClientProtocolFactory.TYPE, null);
-
-    // Simulate a disconnect from the server.
-    LifecycleUtil.deactivate(getAcceptor());
-
-    int data = 0x0a;
-    IFailOverStrategy failOverStrategy = new RetryFailOverStrategy(getConnector());
-
-    // Exception HERE
-    IntRequest request = new IntRequest(channel, data);
-
-    int result = failOverStrategy.send(request);
-    assertEquals(data, result);
-  }
-
-  public void testFailingDuring() throws Exception
-  {
-    startTransport();
-    IChannel channel = getConnector().openChannel(TestSignalClientProtocolFactory.TYPE, null);
-
-    int data = 0x0a;
-    IFailOverStrategy failOverStrategy = new RetryFailOverStrategy(getConnector());
-
-    // Exception HERE
-    IntRequest request = new IntRequest(channel, data);
-
-    // Simulate a disconnect from the server.
-    LifecycleUtil.deactivate(getAcceptor());
-
-    int result = failOverStrategy.send(request);
-    assertEquals(data, result);
-  }
-
-  public void testFailingDuring2() throws Exception
-  {
-    startTransport();
-    IChannel channel = getConnector().openChannel(TestSignalClientProtocolFactory.TYPE, null);
-
-    int data = 0x0a;
-    IFailOverStrategy failOverStrategy = new RetryFailOverStrategy(getConnector());
-
-    // Exception HERE
-    IntFailRequest request = new IntFailRequest(channel, data);
-
-    int result = failOverStrategy.send(request, 1000);
-    assertEquals(data, result);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/HugeData.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/HugeData.java
deleted file mode 100644
index 0908455e7b..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/HugeData.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import java.util.StringTokenizer;
-
-/**
- * @author Eike Stepper
- */
-public final class HugeData
-{
-  public static final String NL = System.getProperty("line.separator");
-
-  public static StringTokenizer getTokenizer()
-  {
-    return new StringTokenizer(getText(), NL);
-  }
-
-  public static String[] getArray()
-  {
-    return getText().split(NL);
-  }
-
-  public static byte[] getBytes()
-  {
-    return getText().getBytes();
-  }
-
-  public static String getText()
-  {
-    return "/***************************************************************************" + NL
-        + " * COPYRIGHT (C) 2004 - 2008 EIKE STEPPER, GERMANY." + NL
-        + " * ALL RIGHTS RESERVED. THIS PROGRAM AND THE ACCOMPANYING MATERIALS" + NL
-        + " * ARE MADE AVAILABLE UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE V1.0" + NL
-        + " * WHICH ACCOMPANIES THIS DISTRIBUTION, AND IS AVAILABLE AT" + NL
-        + " * HTTP://WWW.ECLIPSE.ORG/LEGAL/EPL-V10.HTML" + NL + " * " + NL + " * CONTRIBUTORS:" + NL
-        + " *    EIKE STEPPER - INITIAL API AND IMPLEMENTATION" + NL
-        + " **************************************************************************/" + NL
-        + "PACKAGE ORG.ECLIPSE.INTERNAL.NET4J.TRANSPORT.CONNECTOR;" + NL + "" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.BUFFER.BUFFERPROVIDER;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CHANNEL.CHANNEL;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CHANNEL.MULTIPLEXER;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.CONNECTOR;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.CONNECTOREXCEPTION;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.CREDENTIALS;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.PROTOCOL;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.PROTOCOLFACTORY;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.UTIL.LIFECYCLE.LIFECYCLELISTENER;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.UTIL.LIFECYCLE.LIFECYCLENOTIFIER;" + NL
-        + "IMPORT ORG.ECLIPSE.NET4J.UTIL.REGISTRY.IREGISTRY;" + NL + "" + NL
-        + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.TRANSPORT.CHANNEL.CHANNELIMPL;" + NL
-        + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.UTIL.STREAM.BUFFERQUEUE;" + NL
-        + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.UTIL.LIFECYCLE.ABSTRACTCOMPONENT;" + NL
-        + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.UTIL.LIFECYCLE.LIFECYCLEUTIL;" + NL + "" + NL
-        + "IMPORT JAVA.UTIL.ARRAYLIST;" + NL + "IMPORT JAVA.UTIL.LIST;" + NL + "IMPORT JAVA.UTIL.QUEUE;" + NL
-        + "IMPORT JAVA.UTIL.CONCURRENT.CONCURRENTLINKEDQUEUE;" + NL + "IMPORT JAVA.UTIL.CONCURRENT.COUNTDOWNLATCH;"
-        + NL + "IMPORT JAVA.UTIL.CONCURRENT.EXECUTORSERVICE;" + NL + "IMPORT JAVA.UTIL.CONCURRENT.TIMEUNIT;" + NL + ""
-        + NL + "/**" + NL + " * @AUTHOR EIKE STEPPER" + NL + " */" + NL
-        + "PUBLIC ABSTRACT CLASS ABSTRACTCONNECTOR EXTENDS ABSTRACTLIFECYCLE IMPLEMENTS CONNECTOR, CHANNELMULTIPLEXER"
-        + NL + "{" + NL + "  PRIVATE STATIC FINAL CHANNELIMPL NULL_CHANNEL = NEW CHANNELIMPL(NULL);" + NL + "" + NL
-        + "  PRIVATE CONNECTORCREDENTIALS CREDENTIALS;" + NL + "" + NL
-        + "  PRIVATE IREGISTRY<STRING, PROTOCOLFACTORY> PROTOCOLFACTORYREGISTRY;" + NL + "" + NL
-        + "  PRIVATE BUFFERPROVIDER BUFFERPROVIDER;" + NL + "" + NL + "  /**" + NL
-        + "   * AN OPTIONAL EXECUTOR TO BE USED BY THE {@LINK CHANNEL}S TO PROCESS THEIR" + NL
-        + "   * {@LINK CHANNELIMPL#RECEIVEQUEUE} INSTEAD OF THE CURRENT THREAD. IF NOT" + NL
-        + "   * <CODE>NULL</CODE> THE SENDER AND THE RECEIVER PEERS BECOME DECOUPLED." + NL + "   * <P>" + NL + "   */"
-        + NL + "  PRIVATE EXECUTORSERVICE RECEIVEEXECUTOR;" + NL + "" + NL + "  /**" + NL
-        + "   * TODO SYNCHRONIZE ON CHANNELS?" + NL + "   */" + NL
-        + "  PRIVATE LIST<CHANNELIMPL> CHANNELS = NEW ARRAYLIST();" + NL + "" + NL
-        + "  PRIVATE STATE STATE = STATE.DISCONNECTED;" + NL + "" + NL + "  /**" + NL
-        + "   * DON\'T INITIALIZE LAZILY TO CIRCUMVENT SYNCHRONIZATION!" + NL + "   */" + NL
-        + "  PRIVATE QUEUE<STATELISTENER> STATELISTENERS = NEW CONCURRENTLINKEDQUEUE();" + NL + "" + NL + "  /**" + NL
-        + "   * DON\'T INITIALIZE LAZILY TO CIRCUMVENT SYNCHRONIZATION!" + NL + "   */" + NL
-        + "  PRIVATE QUEUE<CHANNELLISTENER> CHANNELLISTENERS = NEW CONCURRENTLINKEDQUEUE();" + NL + "" + NL + "  /**"
-        + NL + "   * IS REGISTERED WITH EACH {@LINK CHANNEL} OF THIS {@LINK CONNECTOR}." + NL + "   * <P>" + NL
-        + "   */" + NL + "  PRIVATE LIFECYCLELISTENER CHANNELLIFECYCLELISTENER = NEW CHANNELLIFECYCLELISTENER();" + NL
-        + "" + NL + "  PRIVATE COUNTDOWNLATCH FINISHEDCONNECTING;" + NL + "" + NL
-        + "  PRIVATE COUNTDOWNLATCH FINISHEDNEGOTIATING;" + NL + "" + NL + "  PUBLIC ABSTRACTCONNECTOR()" + NL + "  {"
-        + NL + "  }" + NL + "" + NL + "  PUBLIC EXECUTORSERVICE GETRECEIVEEXECUTOR()" + NL + "  {" + NL
-        + "    RETURN RECEIVEEXECUTOR;" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC VOID SETRECEIVEEXECUTOR(EXECUTORSERVICE RECEIVEEXECUTOR)" + NL + "  {" + NL
-        + "    THIS.RECEIVEEXECUTOR = RECEIVEEXECUTOR;" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC IREGISTRY<STRING, PROTOCOLFACTORY> GETPROTOCOLFACTORYREGISTRY()" + NL + "  {" + NL
-        + "    RETURN PROTOCOLFACTORYREGISTRY;" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC VOID SETPROTOCOLFACTORYREGISTRY(IREGISTRY<STRING, PROTOCOLFACTORY> PROTOCOLFACTORYREGISTRY)" + NL
-        + "  {" + NL + "    THIS.PROTOCOLFACTORYREGISTRY = PROTOCOLFACTORYREGISTRY;" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC VOID ADDSTATELISTENER(STATELISTENER LISTENER)" + NL + "  {" + NL
-        + "    STATELISTENERS.ADD(LISTENER);" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC VOID REMOVESTATELISTENER(STATELISTENER LISTENER)" + NL + "  {" + NL
-        + "    STATELISTENERS.REMOVE(LISTENER);" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC VOID ADDCHANNELLISTENER(CHANNELLISTENER LISTENER)" + NL + "  {" + NL
-        + "    CHANNELLISTENERS.ADD(LISTENER);" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC VOID REMOVECHANNELLISTENER(CHANNELLISTENER LISTENER)" + NL + "  {" + NL
-        + "    CHANNELLISTENERS.REMOVE(LISTENER);" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC BUFFERPROVIDER GETBUFFERPROVIDER()" + NL + "  {" + NL + "    RETURN BUFFERPROVIDER;" + NL + "  }"
-        + NL + "" + NL + "  PUBLIC VOID SETBUFFERPROVIDER(BUFFERPROVIDER BUFFERPROVIDER)" + NL + "  {" + NL
-        + "    THIS.BUFFERPROVIDER = BUFFERPROVIDER;" + NL + "  }" + NL + "" + NL + "  PUBLIC BOOLEAN ISCLIENT()" + NL
-        + "  {" + NL + "    RETURN GETTYPE() == TYPE.CLIENT;" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC BOOLEAN ISSERVER()" + NL + "  {" + NL + "    RETURN GETTYPE() == TYPE.SERVER;" + NL + "  }" + NL
-        + "" + NL + "  PUBLIC CONNECTORCREDENTIALS GETCREDENTIALS()" + NL + "  {" + NL + "    RETURN CREDENTIALS;" + NL
-        + "  }" + NL + "" + NL + "  PUBLIC VOID SETCREDENTIALS(CONNECTORCREDENTIALS CREDENTIALS)" + NL + "  {" + NL
-        + "    THIS.CREDENTIALS = CREDENTIALS;" + NL + "  }" + NL + "" + NL + "  PUBLIC STATE GETSTATE()" + NL + "  {"
-        + NL + "    RETURN STATE;" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC VOID SETSTATE(STATE NEWSTATE) THROWS CONNECTOREXCEPTION" + NL + "  {" + NL
-        + "    STATE OLDSTATE = GETSTATE();" + NL + "    IF (NEWSTATE != OLDSTATE)" + NL + "    {" + NL
-        + "      IOUTIL.OUT().PRINTLN(TOSTRING() + \": SETTING STATE \" + NEWSTATE + \" (WAS \"" + NL
-        + "          + OLDSTATE.TOSTRING().TOLOWERCASE() + \")\");" + NL + "      STATE = NEWSTATE;" + NL
-        + "      FIRESTATECHANGED(NEWSTATE, OLDSTATE);" + NL + "" + NL + "      SWITCH (NEWSTATE)" + NL + "      {"
-        + NL + "      CASE DISCONNECTED:" + NL + "        IF (FINISHEDCONNECTING != NULL)" + NL + "        {" + NL
-        + "          FINISHEDCONNECTING.COUNTDOWN();" + NL + "          FINISHEDCONNECTING = NULL;" + NL + "        }"
-        + NL + "" + NL + "        IF (FINISHEDNEGOTIATING != NULL)" + NL + "        {" + NL
-        + "          FINISHEDNEGOTIATING.COUNTDOWN();" + NL + "          FINISHEDNEGOTIATING = NULL;" + NL
-        + "        }" + NL + "        BREAK;" + NL + "" + NL + "      CASE CONNECTING:" + NL
-        + "        FINISHEDCONNECTING = NEW COUNTDOWNLATCH(1);" + NL
-        + "        FINISHEDNEGOTIATING = NEW COUNTDOWNLATCH(1);" + NL + "        IF (GETTYPE() == TYPE.SERVER)" + NL
-        + "        {" + NL + "          SETSTATE(STATE.NEGOTIATING);" + NL + "        }" + NL + "        BREAK;" + NL
-        + "" + NL + "      CASE NEGOTIATING:" + NL + "        FINISHEDCONNECTING.COUNTDOWN();" + NL
-        + "        SETSTATE(STATE.CONNECTED); // TODO IMPLEMENT NEGOTIATION" + NL + "        BREAK;" + NL + "" + NL
-        + "      CASE CONNECTED:" + NL + "        FINISHEDCONNECTING.COUNTDOWN(); // JUST IN CASE OF SUSPICION" + NL
-        + "        FINISHEDNEGOTIATING.COUNTDOWN();" + NL + "        BREAK;" + NL + "" + NL + "      }" + NL + "    }"
-        + NL + "  }" + NL + "" + NL + "  PUBLIC BOOLEAN ISCONNECTED()" + NL + "  {" + NL
-        + "    RETURN GETSTATE() == STATE.CONNECTED;" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC VOID CONNECTASYNC() THROWS CONNECTOREXCEPTION" + NL + "  {" + NL + "    TRY" + NL + "    {" + NL
-        + "      ACTIVATE();" + NL + "    }" + NL + "    CATCH (CONNECTOREXCEPTION EX)" + NL + "    {" + NL
-        + "      THROW EX;" + NL + "    }" + NL + "    CATCH (EXCEPTION EX)" + NL + "    {" + NL
-        + "      THROW NEW CONNECTOREXCEPTION(EX);" + NL + "    }" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC BOOLEAN WAITFORCONNECTION(LONG TIMEOUT) THROWS CONNECTOREXCEPTION" + NL + "  {" + NL
-        + "    STATE STATE = GETSTATE();" + NL + "    IF (STATE == STATE.DISCONNECTED)" + NL + "    {" + NL
-        + "      RETURN FALSE;" + NL + "    }" + NL + "" + NL + "    TRY" + NL + "    {" + NL
-        + "      IOUTIL.OUT().PRINTLN(TOSTRING() + \": WAITING FOR CONNECTION...\");" + NL
-        + "      RETURN FINISHEDNEGOTIATING.AWAIT(TIMEOUT, TIMEUNIT.MILLISECONDS);" + NL + "    }" + NL
-        + "    CATCH (INTERRUPTEDEXCEPTION EX)" + NL + "    {" + NL + "      RETURN FALSE;" + NL + "    }" + NL + "  }"
-        + NL + "" + NL + "  PUBLIC BOOLEAN CONNECT(LONG TIMEOUT) THROWS CONNECTOREXCEPTION" + NL + "  {" + NL
-        + "    CONNECTASYNC();" + NL + "    RETURN WAITFORCONNECTION(TIMEOUT);" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC CONNECTOREXCEPTION DISCONNECT()" + NL + "  {" + NL + "    EXCEPTION EX = DEACTIVATE();" + NL
-        + "    IF (EX == NULL)" + NL + "    {" + NL + "      RETURN NULL;" + NL + "    }" + NL + "" + NL
-        + "    IF (EX INSTANCEOF CONNECTOREXCEPTION)" + NL + "    {" + NL + "      RETURN (CONNECTOREXCEPTION)EX;" + NL
-        + "    }" + NL + "" + NL + "    RETURN NEW CONNECTOREXCEPTION(EX);" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC CHANNEL[] GETCHANNELS()" + NL + "  {" + NL
-        + "    FINAL LIST<CHANNEL> RESULT = NEW ARRAYLIST<CHANNEL>();" + NL + "    SYNCHRONIZED (CHANNELS)" + NL
-        + "    {" + NL + "      FOR (FINAL CHANNELIMPL CHANNEL : CHANNELS)" + NL + "      {" + NL
-        + "        IF (CHANNEL != NULL_CHANNEL)" + NL + "        {" + NL + "          RESULT.ADD(CHANNEL);" + NL
-        + "        }" + NL + "      }" + NL + "    }" + NL + "" + NL
-        + "    RETURN RESULT.TOARRAY(NEW CHANNEL[RESULT.SIZE()]);" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC CHANNEL OPENCHANNEL() THROWS CONNECTOREXCEPTION" + NL + "  {" + NL
-        + "    RETURN OPENCHANNEL(NULL);" + NL + "  }" + NL + "" + NL
-        + "  PUBLIC CHANNEL OPENCHANNEL(STRING PROTOCOLID) THROWS CONNECTOREXCEPTION" + NL + "  {" + NL
-        + "    SHORT CHANNELINDEX = FINDFREECHANNELINDEX();" + NL
-        + "    CHANNELIMPL CHANNEL = CREATECHANNEL(CHANNELINDEX, PROTOCOLID);" + NL
-        + "    REGISTERCHANNELWITHPEER(CHANNELINDEX, PROTOCOLID);" + NL + "" + NL + "    TRY" + NL + "    {" + NL
-        + "      CHANNEL.ACTIVATE();" + NL + "    }" + NL + "    CATCH (CONNECTOREXCEPTION EX)" + NL + "    {" + NL
-        + "      THROW EX;" + NL + "    }" + NL + "    CATCH (EXCEPTION EX)" + NL + "    {" + NL
-        + "      THROW NEW CONNECTOREXCEPTION(EX);" + NL + "    }" + NL + "" + NL + "    RETURN CHANNEL;" + NL + "  }"
-        + NL + "" + NL + "  PUBLIC CHANNELIMPL CREATECHANNEL(SHORT CHANNELINDEX, STRING PROTOCOLID)" + NL + "  {" + NL
-        + "    PROTOCOL PROTOCOL = CREATEPROTOCOL(PROTOCOLID);" + NL + "    IF (PROTOCOL == NULL)" + NL + "    {" + NL
-        + "      IOUTIL.OUT().PRINTLN(TOSTRING() + \": OPENING CHANNEL WITHOUT PROTOCOL\");" + NL + "    }" + NL
-        + "    ELSE" + NL + "    {" + NL
-        + "      IOUTIL.OUT().PRINTLN(TOSTRING() + \": OPENING CHANNEL WITH PROTOCOL \" + PROTOCOLID);" + NL + "    }"
-        + NL + "" + NL + "    CHANNELIMPL CHANNEL = NEW CHANNELIMPL(RECEIVEEXECUTOR);" + NL
-        + "    CHANNEL.SETCHANNELINDEX(CHANNELINDEX);" + NL + "    CHANNEL.SETMULTIPLEXER(THIS);" + NL
-        + "    CHANNEL.SETRECEIVEHANDLER(PROTOCOL);" + NL
-        + "    CHANNEL.ADDLIFECYCLELISTENER(CHANNELLIFECYCLELISTENER);" + NL + "    ADDCHANNEL(CHANNEL);" + NL
-        + "    RETURN CHANNEL;" + NL + "  }" + NL + "" + NL + "  PUBLIC CHANNELIMPL GETCHANNEL(SHORT CHANNELINDEX)"
-        + NL + "  {" + NL + "    TRY" + NL + "    {" + NL + "      CHANNELIMPL CHANNEL = CHANNELS.GET(CHANNELINDEX);"
-        + NL + "      IF (CHANNEL == NULL || CHANNEL == NULL_CHANNEL)" + NL + "      {" + NL
-        + "        THROW NEW NULLPOINTEREXCEPTION();" + NL + "      }" + NL + "" + NL + "      RETURN CHANNEL;" + NL
-        + "    }" + NL + "    CATCH (INDEXOUTOFBOUNDSEXCEPTION EX)" + NL + "    {" + NL
-        + "      IOUTIL.OUT().PRINTLN(TOSTRING() + \": INVALID CHANNELINDEX \" + CHANNELINDEX);" + NL
-        + "      RETURN NULL;" + NL + "    }" + NL + "  }" + NL + "" + NL
-        + "  PROTECTED LIST<BUFFERQUEUE> GETCHANNELBUFFERQUEUES()" + NL + "  {" + NL
-        + "    FINAL LIST<BUFFERQUEUE> RESULT = NEW ARRAYLIST<BUFFERQUEUE>();" + NL + "    SYNCHRONIZED (CHANNELS)"
-        + NL + "    {" + NL + "      FOR (FINAL CHANNELIMPL CHANNEL : CHANNELS)" + NL + "      {" + NL
-        + "        IF (CHANNEL != NULL_CHANNEL)" + NL + "        {" + NL
-        + "          BUFFERQUEUE BUFFERQUEUE = CHANNEL.GETSENDQUEUE();" + NL + "          RESULT.ADD(BUFFERQUEUE);"
-        + NL + "        }" + NL + "      }" + NL + "    }" + NL + "" + NL + "    RETURN RESULT;" + NL + "  }" + NL + ""
-        + NL + "  PROTECTED SHORT FINDFREECHANNELINDEX()" + NL + "  {" + NL + "    SYNCHRONIZED (CHANNELS)" + NL
-        + "    {" + NL + "      INT SIZE = CHANNELS.SIZE();" + NL + "      FOR (SHORT I = 0; I < SIZE; I++)" + NL
-        + "      {" + NL + "        IF (CHANNELS.GET(I) == NULL_CHANNEL)" + NL + "        {" + NL
-        + "          RETURN I;" + NL + "        }" + NL + "      }" + NL + "" + NL
-        + "      CHANNELS.ADD(NULL_CHANNEL);" + NL + "      RETURN (SHORT)SIZE;" + NL + "    }" + NL + "  }" + NL + ""
-        + NL + "  PROTECTED VOID ADDCHANNEL(CHANNELIMPL CHANNEL)" + NL + "  {" + NL
-        + "    SHORT CHANNELINDEX = CHANNEL.GETCHANNELINDEX();" + NL + "    WHILE (CHANNELINDEX >= CHANNELS.SIZE())"
-        + NL + "    {" + NL + "      CHANNELS.ADD(NULL_CHANNEL);" + NL + "    }" + NL + "" + NL
-        + "    CHANNELS.SET(CHANNELINDEX, CHANNEL);" + NL + "  }" + NL + "" + NL
-        + "  PROTECTED VOID REMOVECHANNEL(CHANNELIMPL CHANNEL)" + NL + "  {" + NL
-        + "    CHANNEL.REMOVELIFECYCLELISTENER(CHANNELLIFECYCLELISTENER);" + NL
-        + "    INT CHANNELINDEX = CHANNEL.GETCHANNELINDEX();" + NL + "" + NL
-        + "    IOUTIL.OUT().PRINTLN(TOSTRING() + \": REMOVING CHANNEL \" + CHANNELINDEX);" + NL
-        + "    CHANNELS.SET(CHANNELINDEX, NULL_CHANNEL);" + NL + "  }" + NL + "" + NL
-        + "  PROTECTED PROTOCOL CREATEPROTOCOL(STRING PROTOCOLID)" + NL + "  {" + NL
-        + "    IF (PROTOCOLID == NULL || PROTOCOLID.LENGTH() == 0)" + NL + "    {" + NL + "      RETURN NULL;" + NL
-        + "    }" + NL + "" + NL + "    IREGISTRY<STRING, PROTOCOLFACTORY> REGISTRY = GETPROTOCOLFACTORYREGISTRY();"
-        + NL + "    IF (REGISTRY == NULL)" + NL + "    {" + NL + "      RETURN NULL;" + NL + "    }" + NL + "" + NL
-        + "    PROTOCOLFACTORY FACTORY = REGISTRY.LOOKUP(PROTOCOLID);" + NL + "    IF (FACTORY == NULL)" + NL + "    {"
-        + NL + "      RETURN NULL;" + NL + "    }" + NL + "" + NL
-        + "    IOUTIL.OUT().PRINTLN(TOSTRING() + \": CREATING PROTOCOL \" + PROTOCOLID);" + NL
-        + "    RETURN FACTORY.CREATEPROTOCOL();" + NL + "  }" + NL + "" + NL
-        + "  PROTECTED VOID FIRECHANNELOPENED(CHANNEL CHANNEL)" + NL + "  {" + NL
-        + "    FOR (CHANNELLISTENER LISTENER : CHANNELLISTENERS)" + NL + "    {" + NL + "      TRY" + NL + "      {"
-        + NL + "        LISTENER.NOTIFYCHANNELOPENED(CHANNEL);" + NL + "      }" + NL + "      CATCH (EXCEPTION EX)"
-        + NL + "      {" + NL + "        EX.PRINTSTACKTRACE();" + NL + "      }" + NL + "    }" + NL + "  }" + NL + ""
-        + NL + "  PROTECTED VOID FIRECHANNELCLOSING(CHANNEL CHANNEL)" + NL + "  {" + NL
-        + "    FOR (CHANNELLISTENER LISTENER : CHANNELLISTENERS)" + NL + "    {" + NL + "      TRY" + NL + "      {"
-        + NL + "        LISTENER.NOTIFYCHANNELCLOSING(CHANNEL);" + NL + "      }" + NL + "      CATCH (EXCEPTION EX)"
-        + NL + "      {" + NL + "        EX.PRINTSTACKTRACE();" + NL + "      }" + NL + "    }" + NL + "  }" + NL + ""
-        + NL + "  PROTECTED VOID FIRESTATECHANGED(STATE NEWSTATE, STATE OLDSTATE)" + NL + "  {" + NL
-        + "    FOR (STATELISTENER LISTENER : STATELISTENERS)" + NL + "    {" + NL + "      TRY" + NL + "      {" + NL
-        + "        LISTENER.NOTIFYSTATECHANGED(THIS, NEWSTATE, OLDSTATE);" + NL + "      }" + NL
-        + "      CATCH (EXCEPTION EX)" + NL + "      {" + NL + "        EX.PRINTSTACKTRACE();" + NL + "      }" + NL
-        + "    }" + NL + "  }" + NL + "" + NL + "  @OVERRIDE" + NL
-        + "  PROTECTED VOID ONACCESSBEFOREACTIVATE() THROWS EXCEPTION" + NL + "  {" + NL
-        + "    SUPER.ONACCESSBEFOREACTIVATE();" + NL + "    IF (BUFFERPROVIDER == NULL)" + NL + "    {" + NL
-        + "      THROW NEW ILLEGALSTATEEXCEPTION(\"BUFFERPROVIDER == NULL\");" + NL + "    }" + NL + "" + NL
-        + "    IF (PROTOCOLFACTORYREGISTRY == NULL)" + NL + "    {" + NL
-        + "      IOUTIL.OUT().PRINTLN(TOSTRING() + \": (INFO) PROTOCOLFACTORYREGISTRY == NULL\");" + NL + "    }" + NL
-        + "" + NL + "    IF (RECEIVEEXECUTOR == NULL)" + NL + "    {" + NL
-        + "      IOUTIL.OUT().PRINTLN(TOSTRING() + \": (INFO) RECEIVEEXECUTOR == NULL\");" + NL + "    }" + NL + "  }"
-        + NL + "" + NL + "  @OVERRIDE" + NL + "  PROTECTED VOID ONACTIVATE() THROWS EXCEPTION" + NL + "  {" + NL
-        + "    SUPER.ONACTIVATE();" + NL + "    SETSTATE(STATE.CONNECTING);" + NL + "  }" + NL + "" + NL
-        + "  @OVERRIDE" + NL + "  PROTECTED VOID ONDEACTIVATE() THROWS EXCEPTION" + NL + "  {" + NL
-        + "    SETSTATE(STATE.DISCONNECTED);" + NL + "    FOR (SHORT I = 0; I < CHANNELS.SIZE(); I++)" + NL + "    {"
-        + NL + "      CHANNELIMPL CHANNEL = CHANNELS.GET(I);" + NL + "      IF (CHANNEL != NULL)" + NL + "      {" + NL
-        + "        LIFECYCLEUTIL.DEACTIVATE(CHANNEL);" + NL + "      }" + NL + "    }" + NL + "" + NL
-        + "    CHANNELS.CLEAR();" + NL + "    SUPER.ONDEACTIVATE();" + NL + "  }" + NL + "" + NL
-        + "  PROTECTED ABSTRACT VOID REGISTERCHANNELWITHPEER(SHORT CHANNELINDEX, STRING PROTOCOLID)" + NL
-        + "      THROWS CONNECTOREXCEPTION;" + NL + "" + NL + "  /**" + NL
-        + "   * IS REGISTERED WITH EACH {@LINK CHANNEL} OF THIS {@LINK CONNECTOR}." + NL + "   * <P>" + NL + "   * "
-        + NL + "   * @AUTHOR EIKE STEPPER" + NL + "   */" + NL
-        + "  PRIVATE FINAL CLASS CHANNELLIFECYCLELISTENER IMPLEMENTS LIFECYCLELISTENER" + NL + "  {" + NL
-        + "    PUBLIC VOID NOTIFYLIFECYCLEACTIVATED(LIFECYCLENOTIFIER NOTIFIER)" + NL + "    {" + NL
-        + "      CHANNELIMPL CHANNEL = (CHANNELIMPL)NOTIFIER;" + NL + "      FIRECHANNELOPENED(CHANNEL);" + NL
-        + "    }" + NL + "" + NL + "    PUBLIC VOID NOTIFYLIFECYCLEDEACTIVATING(LIFECYCLENOTIFIER NOTIFIER)" + NL
-        + "    {" + NL + "      CHANNELIMPL CHANNEL = (CHANNELIMPL)NOTIFIER;" + NL
-        + "      FIRECHANNELCLOSING(CHANNEL);" + NL + "      REMOVECHANNEL(CHANNEL);" + NL + "    }" + NL + "  }" + NL
-        + "}" + NL;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/Performance.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/Performance.java
deleted file mode 100644
index 6b3a4572b4..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/Performance.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.eclipse.net4j.tests;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.nio.channels.Selector;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.concurrent.CountDownLatch;
-
-/**
- * @author Eike Stepper
- */
-public class Performance
-{
-  public static void main(String[] args) throws Exception
-  {
-    testInetAddress();
-    testServerSocket();
-    // testRouter();
-    testSocket();
-    testSelector();
-  }
-
-  public static void testInetAddress() throws Exception
-  {
-    System.out.println(InetAddress.class.getName());
-    for (int i = 0; i < 2; i++)
-    {
-      long start = System.currentTimeMillis();
-      InetAddress inet = InetAddress.getByName("localhost");
-      inet.getHostAddress();
-      long duration = System.currentTimeMillis() - start;
-
-      System.out.println(duration);
-    }
-  }
-
-  public static void testServerSocket() throws IOException
-  {
-    System.out.println(ServerSocket.class.getName());
-    for (int i = 0; i < 2; i++)
-    {
-      long start = System.currentTimeMillis();
-      ServerSocket serverSocket = new ServerSocket(2036);
-      long duration = System.currentTimeMillis() - start;
-
-      System.out.println(duration);
-      serverSocket.close();
-    }
-  }
-
-  public static void testRouter() throws Exception
-  {
-    System.out.println(Socket.class.getName() + " (ROUTER)");
-    for (int i = 0; i < 2; i++)
-    {
-      final SocketAddress endpoint = new InetSocketAddress(InetAddress.getByName("192.168.1.1"), 80);
-      Socket socket = new Socket(Proxy.NO_PROXY);
-
-      long start = System.currentTimeMillis();
-      socket.connect(endpoint);
-      long duration = System.currentTimeMillis() - start;
-
-      System.out.println(duration);
-      socket.close();
-      Thread.sleep(500);
-    }
-  }
-
-  public static void testSocket() throws Exception
-  {
-    System.out.println(Socket.class.getName() + " (LOOPBACK)");
-    for (int i = 0; i < 2; i++)
-    {
-      final SocketAddress endpoint = new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 2036);
-      final CountDownLatch latch = new CountDownLatch(1);
-      new Thread()
-      {
-        @Override
-        public void run()
-        {
-          try
-          {
-            ServerSocket serverSocket = new ServerSocket();
-            serverSocket.bind(endpoint);
-            latch.countDown();
-
-            Socket socket = serverSocket.accept();
-            socket.close();
-            serverSocket.close();
-          }
-          catch (IOException ex)
-          {
-            ex.printStackTrace();
-            latch.countDown();
-          }
-        }
-      }.start();
-
-      latch.await();
-      Thread.sleep(500);
-      Socket socket = new Socket(Proxy.NO_PROXY);
-
-      long start = System.currentTimeMillis();
-      socket.connect(endpoint);
-      long duration = System.currentTimeMillis() - start;
-
-      System.out.println(duration);
-      socket.close();
-      Thread.sleep(500);
-    }
-  }
-
-  public static void testSelector() throws IOException
-  {
-    SelectorProvider provider = SelectorProvider.provider();
-    System.out.println(provider.getClass().getName());
-    for (int i = 0; i < 2; i++)
-    {
-      long start = System.currentTimeMillis();
-      Selector selector = provider.openSelector();
-      long duration = System.currentTimeMillis() - start;
-
-      System.out.println(duration);
-      selector.close();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SelectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SelectorTest.java
deleted file mode 100644
index 21b6622c30..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SelectorTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import java.nio.channels.Selector;
-import java.nio.channels.spi.SelectorProvider;
-
-import junit.framework.TestCase;
-
-/**
- * @author Eike Stepper
- */
-public class SelectorTest extends TestCase
-{
-  public void testOpen() throws Exception
-  {
-    SelectorProvider provider = SelectorProvider.provider();
-    System.out.println(provider.getClass().getName());
-    for (int i = 0; i < 5; i++)
-    {
-      long start = System.currentTimeMillis();
-      Selector selector = provider.openSelector();
-      long duration = System.currentTimeMillis() - start;
-
-      System.out.println(duration);
-      selector.close();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java
deleted file mode 100644
index 6a5495ee8a..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-import org.eclipse.internal.net4j.protocol.ServerProtocolFactory;
-
-import java.util.concurrent.CountDownLatch;
-
-/**
- * @author Eike Stepper
- */
-public class ServerTestProtocolFactory extends ServerProtocolFactory
-{
-  public static final String TYPE = "test.protocol";
-
-  private CountDownLatch counter;
-
-  public ServerTestProtocolFactory(CountDownLatch counter)
-  {
-    super(TYPE);
-    this.counter = counter;
-  }
-
-  public TestProtocol create(String description) throws ProductCreationException
-  {
-    return new TestProtocol(counter);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java
deleted file mode 100644
index f9fd894d35..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.tests.signal.ArrayRequest;
-import org.eclipse.net4j.tests.signal.AsyncRequest;
-import org.eclipse.net4j.tests.signal.IntRequest;
-import org.eclipse.net4j.tests.signal.StringRequest;
-import org.eclipse.net4j.tests.signal.TestSignalClientProtocolFactory;
-import org.eclipse.net4j.tests.signal.TestSignalProtocol;
-import org.eclipse.net4j.tests.signal.TestSignalServerProtocolFactory;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.om.OMPlatform;
-
-import java.util.Arrays;
-
-/**
- * @author Eike Stepper
- */
-public class SignalTest extends AbstractTransportTest
-{
-  @Override
-  protected IManagedContainer createContainer()
-  {
-    IManagedContainer container = super.createContainer();
-    container.registerFactory(new TestSignalClientProtocolFactory());
-    container.registerFactory(new TestSignalServerProtocolFactory());
-    return container;
-  }
-
-  public void testInteger() throws Exception
-  {
-    startTransport();
-    IChannel channel = getConnector().openChannel(TestSignalProtocol.PROTOCOL_NAME, null);
-    int data = 0x0a;
-    int result = new IntRequest(channel, data).send();
-    assertEquals(data, result);
-  }
-
-  public void testArray() throws Exception
-  {
-    startTransport();
-    IChannel channel = getConnector().openChannel(TestSignalProtocol.PROTOCOL_NAME, null);
-    byte[] data = TinyData.getBytes();
-    byte[] result = new ArrayRequest(channel, data).send();
-    assertTrue(Arrays.equals(data, result));
-  }
-
-  public void testAsync() throws Exception
-  {
-    startTransport();
-    OMPlatform.INSTANCE.setDebugging(false);
-    IChannel channel = getConnector().openChannel(TestSignalProtocol.PROTOCOL_NAME, null);
-    String data = TinyData.getText();
-    for (int i = 0; i < 10000; i++)
-    {
-      msg("Loop " + i);
-      new AsyncRequest(channel, data).send();
-      String result = new StringRequest(channel, data).send();
-      assertEquals(data, result);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
deleted file mode 100644
index e70682f898..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.channel.ChannelInputStream;
-import org.eclipse.net4j.channel.ChannelOutputStream;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.util.container.ManagedContainer;
-import org.eclipse.net4j.tests.signal.TestSignalServerProtocolFactory;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.nio.ByteBuffer;
-import java.util.StringTokenizer;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-@SuppressWarnings("unchecked")
-public class TCPTransportTest extends AbstractTransportTest
-{
-  @Override
-  protected IManagedContainer createContainer()
-  {
-    IManagedContainer container = new ManagedContainer();
-    container.registerFactory(new TestSignalServerProtocolFactory());
-    return container;
-  }
-
-  protected IBuffer provideBuffer()
-  {
-    IBufferProvider bufferProvider = Net4jUtil.getBufferProvider(container);
-    return bufferProvider.provideBuffer();
-  }
-
-  public void testConnect() throws Exception
-  {
-    startTransport();
-  }
-
-  public void testSendBuffer() throws Exception
-  {
-    startTransport();
-    IChannel channel = getConnector().openChannel();
-    for (int i = 0; i < 3; i++)
-    {
-      IBuffer buffer = provideBuffer();
-      ByteBuffer byteBuffer = buffer.startPutting(channel.getChannelIndex());
-      byteBuffer.putInt(1970);
-      channel.sendBuffer(buffer);
-    }
-  }
-
-  public void testHandleBuffer() throws Exception
-  {
-    final int COUNT = 3;
-    final CountDownLatch counter = new CountDownLatch(COUNT);
-    container.registerFactory(new ServerTestProtocolFactory(counter));
-    container.registerFactory(new ClientTestProtocolFactory());
-    startTransport();
-
-    IChannel channel = getConnector().openChannel(ClientTestProtocolFactory.TYPE, null);
-    for (int i = 0; i < COUNT; i++)
-    {
-      IBuffer buffer = provideBuffer();
-      ByteBuffer byteBuffer = buffer.startPutting(channel.getChannelIndex());
-      byteBuffer.putInt(1970);
-      channel.sendBuffer(buffer);
-      sleep(50);
-    }
-
-    assertTrue(counter.await(2, TimeUnit.SECONDS));
-  }
-
-  // public void testLocalRegistry() throws Exception
-  // {
-  // final int COUNT = 3;
-  // final CountDownLatch counter = new CountDownLatch(COUNT);
-  //
-  // IRegistry<String, ProtocolFactory> global = new HashMapRegistry();
-  // IRegistry<String, ProtocolFactory> local = new HashCacheRegistry(global);
-  // local.register(new TestProtocolFactory(counter));
-  // assertEquals(0, global.size());
-  // assertEquals(1, local.size());
-  //
-  // acceptor.setProtocolFactoryRegistry(local);
-  // acceptor.activate();
-  // assertTrue(acceptor.isActive());
-  // assertTrue(connector.connect(5000));
-  //
-  // Channel channel = connector.openChannel(TestProtocolFactory.PROTOCOL_ID);
-  // for (int i = 0; i < COUNT; i++)
-  // {
-  // Buffer buffer = provideBuffer();
-  // ByteBuffer byteBuffer = buffer.startPutting(channel.getChannelIndex());
-  // byteBuffer.putInt(1970);
-  // channel.handleBuffer(buffer);
-  // }
-  //
-  // assertTrue(counter.await(2, TimeUnit.SECONDS));
-  // }
-
-  // public void testGlobalRegistry() throws Exception
-  // {
-  // final int COUNT = 3;
-  // final CountDownLatch counter = new CountDownLatch(COUNT);
-  //
-  // IRegistry<String, ProtocolFactory> global = new HashMapRegistry();
-  // IRegistry<String, ProtocolFactory> local = new HashCacheRegistry(global);
-  // global.register(new TestProtocolFactory(counter));
-  // assertEquals(1, global.size());
-  // assertEquals(1, local.size());
-  //
-  // acceptor.setProtocolFactoryRegistry(local);
-  // acceptor.activate();
-  // assertTrue(acceptor.isActive());
-  // assertTrue(connector.connect(5000));
-  //
-  // Channel channel = connector.openChannel(TestProtocolFactory.PROTOCOL_ID);
-  // for (int i = 0; i < COUNT; i++)
-  // {
-  // Buffer buffer = provideBuffer();
-  // ByteBuffer byteBuffer = buffer.startPutting(channel.getChannelIndex());
-  // byteBuffer.putInt(1970);
-  // channel.handleBuffer(buffer);
-  // }
-  //
-  // assertTrue(counter.await(2, TimeUnit.SECONDS));
-  // }
-
-  public void testStreaming() throws Exception
-  {
-    final int COUNT = 1;
-    final CountDownLatch counter = new CountDownLatch(COUNT);
-    final ChannelInputStream[] inputStream = new ChannelInputStream[1];
-
-    getAcceptor().addListener(new IListener()
-    {
-      public void notifyEvent(IEvent event)
-      {
-        if (event instanceof IContainerEvent)
-        {
-          IContainerEvent<IConnector> e = (IContainerEvent)event;
-          e.getDeltaElement().addListener(new IListener()
-          {
-            public void notifyEvent(IEvent event)
-            {
-              if (event instanceof IContainerEvent)
-              {
-                IContainerEvent<IChannel> e = (IContainerEvent)event;
-                if (e.getDeltaKind() == IContainerDelta.Kind.ADDED)
-                {
-                  inputStream[0] = new ChannelInputStream(e.getDeltaElement(), 2000);
-                  counter.countDown();
-                }
-              }
-            }
-          });
-        }
-      }
-    });
-
-    IChannel channel = getConnector().openChannel();
-    assertTrue(counter.await(2, TimeUnit.SECONDS));
-    assertNotNull(inputStream[0]);
-
-    ChannelOutputStream outputStream = new ChannelOutputStream(channel);
-    outputStream.write(HugeData.getBytes());
-    outputStream.flushWithEOS();
-    outputStream.close();
-
-    try
-    {
-      InputStreamReader isr = new InputStreamReader(inputStream[0]);
-      BufferedReader reader = new BufferedReader(isr);
-      String line;
-      while ((line = reader.readLine()) != null)
-      {
-        msg(line);
-      }
-
-      isr.close();
-    }
-    catch (RuntimeException ex)
-    {
-      ex.printStackTrace();
-    }
-  }
-
-  /**
-   * TODO Fails occasionally ;-( Caused by: java.lang.IllegalStateException: selectionKey == null
-   */
-  public void testTextStreaming() throws Exception
-  {
-    final int COUNT = 1;
-    final CountDownLatch counter = new CountDownLatch(COUNT);
-    final ChannelInputStream[] inputStream = new ChannelInputStream[1];
-
-    getAcceptor().addListener(new IListener()
-    {
-      public void notifyEvent(IEvent event)
-      {
-        if (event instanceof IContainerEvent)
-        {
-          IContainerEvent<IConnector> e = (IContainerEvent)event;
-          e.getDeltaElement().addListener(new IListener()
-          {
-            public void notifyEvent(IEvent event)
-            {
-              if (event instanceof IContainerEvent)
-              {
-                IContainerEvent<IChannel> e = (IContainerEvent)event;
-                if (e.getDeltaKind() == IContainerDelta.Kind.ADDED)
-                {
-                  inputStream[0] = new ChannelInputStream(e.getDeltaElement(), 2000);
-                  counter.countDown();
-                }
-              }
-            }
-          });
-        }
-      }
-    });
-
-    IChannel channel = getConnector().openChannel();
-    assertTrue(counter.await(2, TimeUnit.SECONDS));
-    assertNotNull(inputStream[0]);
-
-    ChannelOutputStream outputStream = new ChannelOutputStream(channel);
-    PrintStream printer = new PrintStream(outputStream);
-    StringTokenizer tokenizer = HugeData.getTokenizer();
-    while (tokenizer.hasMoreTokens())
-    {
-      String token = tokenizer.nextToken();
-      printer.println(token);
-    }
-
-    outputStream.flushWithEOS();
-    outputStream.close();
-
-    try
-    {
-      InputStreamReader isr = new InputStreamReader(inputStream[0]);
-      BufferedReader reader = new BufferedReader(isr);
-      String line;
-      while ((line = reader.readLine()) != null)
-      {
-        msg(line);
-      }
-
-      isr.close();
-    }
-    catch (RuntimeException ex)
-    {
-      ex.printStackTrace();
-    }
-  }
-
-  public void testTextStreamingDecoupled() throws Exception
-  {
-    final int COUNT = 1;
-    final CountDownLatch counter = new CountDownLatch(COUNT);
-    final ChannelInputStream[] inputStream = new ChannelInputStream[1];
-
-    getAcceptor().addListener(new IListener()
-    {
-      public void notifyEvent(IEvent event)
-      {
-        if (event instanceof IContainerEvent)
-        {
-          IContainerEvent<IConnector> e = (IContainerEvent)event;
-          e.getDeltaElement().addListener(new IListener()
-          {
-            public void notifyEvent(IEvent event)
-            {
-              if (event instanceof IContainerEvent)
-              {
-                IContainerEvent<IChannel> e = (IContainerEvent)event;
-                if (e.getDeltaKind() == IContainerDelta.Kind.ADDED)
-                {
-                  inputStream[0] = new ChannelInputStream(e.getDeltaElement(), 2000);
-                  counter.countDown();
-                }
-              }
-            }
-          });
-        }
-      }
-    });
-
-    final IChannel channel = getConnector().openChannel();
-    assertTrue(counter.await(2, TimeUnit.SECONDS));
-    assertNotNull(inputStream[0]);
-
-    new Thread()
-    {
-      @Override
-      public void run()
-      {
-        try
-        {
-          IBufferProvider bufferProvider = Net4jUtil.getBufferProvider(container);
-          ChannelOutputStream outputStream = new ChannelOutputStream(channel, bufferProvider);
-          PrintStream printer = new PrintStream(outputStream);
-          StringTokenizer tokenizer = HugeData.getTokenizer();
-          while (tokenizer.hasMoreTokens())
-          {
-            String token = tokenizer.nextToken();
-            printer.println(token);
-          }
-
-          outputStream.flushWithEOS();
-          outputStream.close();
-        }
-        catch (IOException ex)
-        {
-          ex.printStackTrace();
-          fail(ex.getLocalizedMessage());
-        }
-      }
-    }.start();
-
-    try
-    {
-      InputStreamReader isr = new InputStreamReader(inputStream[0]);
-      BufferedReader reader = new BufferedReader(isr);
-      String line;
-      while ((line = reader.readLine()) != null)
-      {
-        msg(line);
-      }
-
-      isr.close();
-    }
-    catch (RuntimeException ex)
-    {
-      ex.printStackTrace();
-    }
-  }
-
-  public void testDataStreaming() throws Exception
-  {
-    final int COUNT = 1;
-    final CountDownLatch counter = new CountDownLatch(COUNT);
-    final ChannelInputStream[] inputStream = new ChannelInputStream[1];
-
-    getAcceptor().addListener(new IListener()
-    {
-      public void notifyEvent(IEvent event)
-      {
-        if (event instanceof IContainerEvent)
-        {
-          IContainerEvent<IConnector> e = (IContainerEvent)event;
-          e.getDeltaElement().addListener(new IListener()
-          {
-            public void notifyEvent(IEvent event)
-            {
-              if (event instanceof IContainerEvent)
-              {
-                IContainerEvent<IChannel> e = (IContainerEvent)event;
-                if (e.getDeltaKind() == IContainerDelta.Kind.ADDED)
-                {
-                  inputStream[0] = new ChannelInputStream(e.getDeltaElement(), 2000);
-                  counter.countDown();
-                }
-              }
-            }
-          });
-        }
-      }
-    });
-
-    IChannel channel = getConnector().openChannel();
-    assertTrue(counter.await(2, TimeUnit.SECONDS));
-
-    ChannelOutputStream outputStream = new ChannelOutputStream(channel);
-    DataOutputStream dataOutput = new DataOutputStream(outputStream);
-    byte[] data = HugeData.getBytes();
-    dataOutput.writeInt(data.length);
-    dataOutput.write(data);
-    dataOutput.flush();
-    dataOutput.close();
-    outputStream.flush();
-
-    DataInputStream dataInput = new DataInputStream(inputStream[0]);
-    int size = dataInput.readInt();
-    byte[] b = new byte[size];
-    dataInput.read(b);
-    dataInput.close();
-
-    msg(new String(b));
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPUnitTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPUnitTest.java
deleted file mode 100644
index 6d4280a6e0..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPUnitTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.util.tests.AbstractOMTest;
-
-/**
- * @author Eike Stepper
- */
-public class TCPUnitTest extends AbstractOMTest
-{
-  public TCPUnitTest()
-  {
-  }
-
-  public void test()
-  {
-
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java
deleted file mode 100644
index b165acc27b..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import org.eclipse.internal.net4j.protocol.Protocol;
-
-import java.util.concurrent.CountDownLatch;
-
-/**
- * @author Eike Stepper
- */
-public final class TestProtocol extends Protocol
-{
-  public TestProtocol(CountDownLatch counter)
-  {
-    setInfraStructure(counter);
-  }
-
-  public String getType()
-  {
-    return ServerTestProtocolFactory.TYPE;
-  }
-
-  public void handleBuffer(IBuffer buffer)
-  {
-    IOUtil.OUT().println("BUFFER ARRIVED");
-    buffer.release();
-    if (getInfraStructure() instanceof CountDownLatch)
-    {
-      ((CountDownLatch)getInfraStructure()).countDown();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TinyData.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TinyData.java
deleted file mode 100644
index 83fce51a33..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TinyData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests;
-
-import java.util.StringTokenizer;
-
-/**
- * @author Eike Stepper
- */
-public final class TinyData
-{
-  public static final String NL = System.getProperty("line.separator");
-
-  public static StringTokenizer getTokenizer()
-  {
-    return new StringTokenizer(getText(), NL);
-  }
-
-  public static String[] getArray()
-  {
-    return getText().split(NL);
-  }
-
-  public static byte[] getBytes()
-  {
-    return getText().getBytes();
-  }
-
-  public static String getText()
-  {
-    return "COPYRIGHT (C) 2004 - 2008 EIKE STEPPER, GERMANY. ALL RIGHTS RESERVED.";
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/Activator.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/Activator.java
deleted file mode 100644
index 0b79912c40..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/Activator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.bundle;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Eike Stepper
- */
-public class Activator implements BundleActivator
-{
-  public void start(BundleContext context) throws Exception
-  {
-  }
-
-  public void stop(BundleContext context) throws Exception
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java
deleted file mode 100644
index 4b0c65d68f..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class ArrayIndication extends IndicationWithResponse
-{
-  private byte[] data;
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_ARRAY;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    data = in.readByteArray();
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeByteArray(data);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java
deleted file mode 100644
index 826e5df5ca..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class ArrayRequest extends RequestWithConfirmation<byte[]>
-{
-  private byte[] data;
-
-  public ArrayRequest(IChannel channel, byte[] data)
-  {
-    super(channel);
-    this.data = data;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_ARRAY;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeByteArray(data);
-  }
-
-  @Override
-  protected byte[] confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readByteArray();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java
deleted file mode 100644
index 3fc12d10e7..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class AsyncIndication extends Indication
-{
-  private String data;
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_ASYNC;
-  }
-
-  public String getData()
-  {
-    return data;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    data = in.readString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java
deleted file mode 100644
index 5b9bada13a..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class AsyncRequest extends Request
-{
-  private String data;
-
-  public AsyncRequest(IChannel channel, String data)
-  {
-    super(channel);
-    this.data = data;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_ASYNC;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(data);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java
deleted file mode 100644
index 0911916593..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class IntFailIndication extends IndicationWithResponse
-{
-  private int data;
-
-  public IntFailIndication()
-  {
-  }
-
-  public int getData()
-  {
-    return data;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_INT_FAIL;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    data = in.readInt();
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    getProtocol().deactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java
deleted file mode 100644
index f06def6211..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class IntFailRequest extends RequestWithConfirmation<Integer>
-{
-  private int data;
-
-  public IntFailRequest(IChannel channel, int data)
-  {
-    super(channel);
-    this.data = data;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_INT_FAIL;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(data);
-  }
-
-  @Override
-  protected Integer confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readInt();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java
deleted file mode 100644
index cbf0cb9bee..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class IntIndication extends IndicationWithResponse
-{
-  private int data;
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_INT;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    data = in.readInt();
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(data);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java
deleted file mode 100644
index c79435b544..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class IntRequest extends RequestWithConfirmation<Integer>
-{
-  private int data;
-
-  public IntRequest(IChannel channel, int data)
-  {
-    super(channel);
-    this.data = data;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_INT;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeInt(data);
-  }
-
-  @Override
-  protected Integer confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readInt();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java
deleted file mode 100644
index f750b2cef4..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class StringIndication extends IndicationWithResponse
-{
-  private String data;
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_STRING;
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws IOException
-  {
-    data = in.readString();
-  }
-
-  @Override
-  protected void responding(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(data);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java
deleted file mode 100644
index 2b98f93818..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class StringRequest extends RequestWithConfirmation<String>
-{
-  private String data;
-
-  public StringRequest(IChannel channel, String data)
-  {
-    super(channel);
-    this.data = data;
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return TestSignalProtocol.SIGNAL_STRING;
-  }
-
-  @Override
-  protected void requesting(ExtendedDataOutputStream out) throws IOException
-  {
-    out.writeString(data);
-  }
-
-  @Override
-  protected String confirming(ExtendedDataInputStream in) throws IOException
-  {
-    return in.readString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalClientProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalClientProtocolFactory.java
deleted file mode 100644
index 0613e6a1cf..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalClientProtocolFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-import org.eclipse.internal.net4j.protocol.ClientProtocolFactory;
-
-/**
- * @author Eike Stepper
- */
-public class TestSignalClientProtocolFactory extends ClientProtocolFactory
-{
-  public static final String TYPE = TestSignalServerProtocolFactory.TYPE;
-
-  public TestSignalClientProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public TestSignalProtocol create(String description) throws ProductCreationException
-  {
-    return new TestSignalProtocol();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java
deleted file mode 100644
index 82ea5bd03f..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
-
-/**
- * @author Eike Stepper
- */
-public class TestSignalProtocol extends SignalProtocol
-{
-  public static final String PROTOCOL_NAME = "signal.protocol";
-
-  public static final short SIGNAL_INT = 1;
-
-  public static final short SIGNAL_INT_FAIL = 2;
-
-  public static final short SIGNAL_ARRAY = 3;
-
-  public static final short SIGNAL_STRING = 4;
-
-  public static final short SIGNAL_ASYNC = 5;
-
-  public TestSignalProtocol()
-  {
-  }
-
-  public String getType()
-  {
-    return PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor doCreateSignalReactor(short signalID)
-  {
-    switch (signalID)
-    {
-    case SIGNAL_INT:
-      return new IntIndication();
-    case SIGNAL_INT_FAIL:
-      return new IntFailIndication();
-    case SIGNAL_ARRAY:
-      return new ArrayIndication();
-    case SIGNAL_STRING:
-      return new StringIndication();
-    case SIGNAL_ASYNC:
-      return new AsyncIndication();
-    }
-    return null;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java
deleted file mode 100644
index c5a908c074..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.tests.signal;
-
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-import org.eclipse.internal.net4j.protocol.ServerProtocolFactory;
-
-/**
- * @author Eike Stepper
- */
-public class TestSignalServerProtocolFactory extends ServerProtocolFactory
-{
-  public static final String TYPE = TestSignalProtocol.PROTOCOL_NAME;
-
-  public TestSignalServerProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public TestSignalProtocol create(String description) throws ProductCreationException
-  {
-    return new TestSignalProtocol();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
deleted file mode 100644
index df09ffd77d..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.om.OMPlatform;
-
-import junit.framework.TestCase;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractOMTest extends TestCase
-{
-  private static boolean consoleEnabled;
-
-  protected AbstractOMTest()
-  {
-  }
-
-  @Override
-  public final void setUp() throws Exception
-  {
-    super.setUp();
-    IOUtil.OUT().println("************************************************");
-    IOUtil.OUT().println(getName());
-    IOUtil.OUT().println("************************************************");
-
-    OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
-    OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-    OMPlatform.INSTANCE.setDebugging(true);
-    enableConsole();
-
-    doSetUp();
-    IOUtil.OUT().println();
-    IOUtil.OUT().println("------------------------ START ------------------------");
-  }
-
-  @Override
-  public final void tearDown() throws Exception
-  {
-    sleep(200);
-    IOUtil.OUT().println("------------------------ END --------------------------");
-    IOUtil.OUT().println();
-
-    doTearDown();
-    super.tearDown();
-    IOUtil.OUT().println();
-    IOUtil.OUT().println();
-  }
-
-  @Override
-  protected void runTest() throws Throwable
-  {
-    try
-    {
-      super.runTest();
-    }
-    catch (Throwable t)
-    {
-      t.printStackTrace(IOUtil.OUT());
-      throw t;
-    }
-  }
-
-  protected void enableConsole()
-  {
-    if (!consoleEnabled)
-    {
-      PrintTraceHandler.CONSOLE.setShortContext(true);
-      OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-      OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
-      OMPlatform.INSTANCE.setDebugging(true);
-      consoleEnabled = true;
-    }
-  }
-
-  protected void disableConsole()
-  {
-    if (consoleEnabled)
-    {
-      consoleEnabled = false;
-      OMPlatform.INSTANCE.setDebugging(false);
-      OMPlatform.INSTANCE.removeTraceHandler(PrintTraceHandler.CONSOLE);
-      OMPlatform.INSTANCE.removeLogHandler(PrintLogHandler.CONSOLE);
-    }
-  }
-
-  protected void doSetUp() throws Exception
-  {
-    // Guaranteed to be empty
-  }
-
-  protected void doTearDown() throws Exception
-  {
-    // Guaranteed to be empty
-  }
-
-  protected static void msg(Object m)
-  {
-    if (consoleEnabled)
-    {
-      IOUtil.OUT().println("--> " + m);
-    }
-  }
-
-  protected static void sleep(long millis)
-  {
-    ConcurrencyUtil.sleep(millis);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
deleted file mode 100644
index f48fad416c..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-
-/**
- * @author Eike Stepper
- */
-public class ExtendedIOTest extends AbstractOMTest
-{
-  @SuppressWarnings("unchecked")
-  public void testObject() throws Exception
-  {
-    final HashMap<String, String> map = createMap();
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ExtendedDataOutputStream edos = new ExtendedDataOutputStream(baos);
-    edos.writeObject(map);
-    edos.close();
-
-    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    ExtendedDataInputStream edis = new ExtendedDataInputStream(bais);
-    HashMap<String, String> result = (HashMap<String, String>)edis.readObject();
-    assertEquals(map, result);
-  }
-
-  public void testObject1() throws Exception
-  {
-    final byte[] byteArray = createByteArray1();
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ExtendedDataOutputStream edos = new ExtendedDataOutputStream(baos);
-    edos.writeObject(byteArray);
-    edos.close();
-
-    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    ExtendedDataInputStream edis = new ExtendedDataInputStream(bais);
-    byte[] result = (byte[])edis.readObject();
-    assertTrue(Arrays.equals(byteArray, result));
-  }
-
-  public void testObject2() throws Exception
-  {
-    final byte[] byteArray = createByteArray2();
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ExtendedDataOutputStream edos = new ExtendedDataOutputStream(baos);
-    edos.writeObject(byteArray);
-    edos.close();
-
-    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    ExtendedDataInputStream edis = new ExtendedDataInputStream(bais);
-    byte[] result = (byte[])edis.readObject();
-    assertTrue(Arrays.equals(byteArray, result));
-  }
-
-  public void testByteArray1() throws Exception
-  {
-    final byte[] byteArray = createByteArray1();
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ExtendedDataOutputStream edos = new ExtendedDataOutputStream(baos);
-    edos.writeByteArray(byteArray);
-    edos.close();
-
-    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    ExtendedDataInputStream edis = new ExtendedDataInputStream(bais);
-    byte[] result = edis.readByteArray();
-    assertTrue(Arrays.equals(byteArray, result));
-  }
-
-  public void testByteArray2() throws Exception
-  {
-    final byte[] byteArray = createByteArray2();
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ExtendedDataOutputStream edos = new ExtendedDataOutputStream(baos);
-    edos.writeByteArray(byteArray);
-    edos.close();
-
-    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    ExtendedDataInputStream edis = new ExtendedDataInputStream(bais);
-    byte[] result = edis.readByteArray();
-    assertTrue(Arrays.equals(byteArray, result));
-  }
-
-  private byte[] createByteArray1() throws IOException
-  {
-    HashMap<String, String> map = createMap();
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ExtendedDataOutputStream edos = new ExtendedDataOutputStream(baos);
-    edos.writeObject(map);
-    edos.close();
-    return baos.toByteArray();
-  }
-
-  private byte[] createByteArray2()
-  {
-    byte[] byteArray = new byte[256];
-    byte v = Byte.MIN_VALUE;
-    for (int i = 0; i < byteArray.length; i++)
-    {
-      byteArray[i] = v++;
-    }
-
-    return byteArray;
-  }
-
-  private HashMap<String, String> createMap()
-  {
-    HashMap<String, String> map = new HashMap<String, String>();
-    putMap(map, "org.eclipse.net4j.util.io.CachedFileMap.java");
-    putMap(map, "org.eclipse.net4j.util.io.CloseableIterator.java");
-    putMap(map, "org.eclipse.net4j.util.io.DataInputExtender.java");
-    putMap(map, "org.eclipse.net4j.util.io.DataOutputExtender.java");
-    putMap(map, "org.eclipse.net4j.util.io.DelegatingInputStream.java");
-    putMap(map, "org.eclipse.net4j.util.io.DelegatingOutputStream.java");
-    putMap(map, "org.eclipse.net4j.util.io.DelegatingStreamWrapper.java");
-    putMap(map, "org.eclipse.net4j.util.io.ExtendedDataInput.java");
-    putMap(map, "org.eclipse.net4j.util.io.ExtendedDataInputStream.java");
-    putMap(map, "org.eclipse.net4j.util.io.ExtendedDataOutput.java");
-    putMap(map, "org.eclipse.net4j.util.io.ExtendedDataOutputStream.java");
-    putMap(map, "org.eclipse.net4j.util.io.ExtendedIOUtil.java");
-    putMap(map, "org.eclipse.net4j.util.io.GZIPStreamWrapper.java");
-    putMap(map, "org.eclipse.net4j.util.io.IOFilter.java");
-    putMap(map, "org.eclipse.net4j.util.io.IORunnable.java");
-    putMap(map, "org.eclipse.net4j.util.io.IORuntimeException.java");
-    putMap(map, "org.eclipse.net4j.util.io.IOUtil.java");
-    putMap(map, "org.eclipse.net4j.util.io.IOVisitor.java");
-    putMap(map, "org.eclipse.net4j.util.io.IStreamWrapper.java");
-    putMap(map, "org.eclipse.net4j.util.io.NIOUtil.java");
-    putMap(map, "org.eclipse.net4j.util.io.SortedFileMap.java");
-    putMap(map, "org.eclipse.net4j.util.io.StreamWrapperChain.java");
-    putMap(map, "org.eclipse.net4j.util.io.TMPUtil.java");
-    putMap(map, "org.eclipse.net4j.util.io.XORInputStream.java");
-    putMap(map, "org.eclipse.net4j.util.io.XOROutputStream.java");
-    putMap(map, "org.eclipse.net4j.util.io.XORStreamWrapper.java");
-    putMap(map, "org.eclipse.net4j.util.io.ZIPUtil.java");
-    return map;
-  }
-
-  private void putMap(HashMap<String, String> map, String string)
-  {
-    map.put(string, string);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
deleted file mode 100644
index 8bcab480bd..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import org.eclipse.net4j.util.om.monitor.IllegalMonitorNestingException;
-import org.eclipse.net4j.util.om.monitor.MonitorAlreadyBegunException;
-import org.eclipse.net4j.util.om.monitor.MonitorUtil;
-import org.eclipse.net4j.util.om.monitor.OMMonitor;
-import org.eclipse.net4j.util.om.monitor.OMSubMonitor;
-
-/**
- * @author Eike Stepper
- */
-public class MonitorTest extends AbstractOMTest
-{
-  private static final String[] CLASSES = { "Pair", "Triple" };
-
-  private static final String[][] FIELDS = { { "x", "y" }, { "x", "y", "z" } };
-
-  public void testJoined() throws Exception
-  {
-    MonitorUtil.Legacy.startMonitoring();
-    try
-    {
-      readClasses(CLASSES, FIELDS, true, true);
-    }
-    finally
-    {
-      MonitorUtil.Legacy.stopMonitoring();
-    }
-  }
-
-  public void testJoinedNotStarted() throws Exception
-  {
-    readClasses(CLASSES, FIELDS, true, true);
-  }
-
-  public void testJoinedStopNotStarted() throws Exception
-  {
-    readClasses(CLASSES, FIELDS, true, true);
-    MonitorUtil.Legacy.stopMonitoring();
-  }
-
-  public void testUnjoined() throws Exception
-  {
-    MonitorUtil.Legacy.startMonitoring();
-    try
-    {
-      readClasses(CLASSES, FIELDS, true, false);
-      fail("IllegalMonitorNestingException expected");
-    }
-    catch (IllegalMonitorNestingException ex)
-    {
-    }
-    finally
-    {
-      MonitorUtil.Legacy.stopMonitoring();
-    }
-  }
-
-  public void testUnjoinedNotStarted() throws Exception
-  {
-    readClasses(CLASSES, FIELDS, true, false);
-  }
-
-  public void testNotForked() throws Exception
-  {
-    MonitorUtil.Legacy.startMonitoring();
-    try
-    {
-      readClasses(CLASSES, FIELDS, false, false);
-      fail("MonitorAlreadyBegunException expected");
-    }
-    catch (MonitorAlreadyBegunException ex)
-    {
-    }
-    finally
-    {
-      MonitorUtil.Legacy.stopMonitoring();
-    }
-  }
-
-  /**
-   * Supports {@link MonitorUtil progress monitoring}.
-   */
-  private static void readClasses(String[] classes, String[][] fields, boolean fork, boolean join)
-  {
-    int num = classes.length;
-    OMMonitor monitor = MonitorUtil.begin(2 * num, "Reading " + num + " classes");
-    for (int i = 0; i < num; i++)
-    {
-      // Create class buffer
-      monitor.worked(1, "Created class buffer for " + classes[i]);
-
-      // Read class
-      OMSubMonitor subMonitor = fork ? monitor.fork() : null;
-      try
-      {
-        readFields(fields[i], fork, join);
-      }
-      finally
-      {
-        if (join)
-        {
-          subMonitor.join("Read class " + classes[i]);
-        }
-      }
-    }
-  }
-
-  /**
-   * Supports {@link MonitorUtil progress monitoring}.
-   */
-  private static void readFields(String[] fields, boolean fork, boolean join)
-  {
-    int num = fields.length;
-    OMMonitor monitor = MonitorUtil.begin(2 * num, "Reading " + num + " fields");
-    for (int i = 0; i < num; i++)
-    {
-      // Read field
-      monitor.worked(1, "Read field " + fields[i]);
-
-      OMSubMonitor subMonitor = fork ? monitor.fork() : null;
-      try
-      {
-        readSetting();
-      }
-      finally
-      {
-        if (join)
-        {
-          subMonitor.join();
-        }
-      }
-    }
-  }
-
-  /**
-   * Supports {@link MonitorUtil progress monitoring}.
-   */
-  private static void readSetting()
-  {
-    OMMonitor monitor = MonitorUtil.begin(1, "Reading setting");
-    // Read setting
-    monitor.worked("Read setting");
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java
deleted file mode 100644
index 5c650ab6b6..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import org.eclipse.net4j.util.collection.MapEntry;
-import org.eclipse.net4j.util.collection.MultiMap.ListBased;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class MultiMapTest extends AbstractOMTest
-{
-  public void testListBased() throws Exception
-  {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertEquals(true, multiMap.isEmpty());
-    assertEquals(0, multiMap.size());
-    assertEquals(false, multiMap.containsKey(1));
-    assertEquals(false, multiMap.containsValue("value" + 1));
-    assertEquals(null, multiMap.get(1));
-
-    addDelegate(multiMap, 0, 0);
-    assertEquals(true, multiMap.isEmpty());
-    assertEquals(0, multiMap.size());
-    assertEquals(false, multiMap.containsKey(1));
-    assertEquals(false, multiMap.containsValue("value" + 1));
-    assertEquals(null, multiMap.get(1));
-
-    addDelegate(multiMap, 1, 10);
-    addDelegate(multiMap, 11, 10);
-    addDelegate(multiMap, 21, 10);
-    assertEquals(false, multiMap.isEmpty());
-    assertEquals(30, multiMap.size());
-    assertEquals(true, multiMap.containsKey(1));
-    assertEquals(true, multiMap.containsValue("value" + 1));
-    assertEquals("value" + 1, multiMap.get(1));
-    assertEquals("value" + 6, multiMap.get(6));
-
-    addDelegate(multiMap, 6, 10);
-    assertEquals(false, multiMap.isEmpty());
-    assertEquals(30, multiMap.size());
-    assertEquals(true, multiMap.containsKey(1));
-    assertEquals(true, multiMap.containsValue("value" + 1));
-    assertEquals("value" + 1, multiMap.get(1));
-    assertEquals("value" + 6, multiMap.get(6));
-    assertEquals(null, multiMap.get(35));
-
-    addDelegate(multiMap, 26, 10);
-    assertEquals(false, multiMap.isEmpty());
-    assertEquals(35, multiMap.size());
-    assertEquals(true, multiMap.containsKey(1));
-    assertEquals(true, multiMap.containsValue("value" + 1));
-    assertEquals("value" + 1, multiMap.get(1));
-    assertEquals("value" + 6, multiMap.get(6));
-    assertEquals("value" + 35, multiMap.get(35));
-  }
-
-  public void testEntrySet() throws Exception
-  {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertEquals(true, multiMap.entrySet().isEmpty());
-    assertEquals(0, multiMap.entrySet().size());
-    assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1")));
-
-    addDelegate(multiMap, 0, 0);
-    assertEquals(true, multiMap.entrySet().isEmpty());
-    assertEquals(0, multiMap.entrySet().size());
-    assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1")));
-
-    addDelegate(multiMap, 1, 10);
-    addDelegate(multiMap, 11, 10);
-    addDelegate(multiMap, 21, 10);
-    assertEquals(false, multiMap.entrySet().isEmpty());
-    assertEquals(30, multiMap.entrySet().size());
-    assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1")));
-
-    addDelegate(multiMap, 6, 10);
-    assertEquals(false, multiMap.entrySet().isEmpty());
-    assertEquals(30, multiMap.entrySet().size());
-    assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1")));
-    assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(35, "value35")));
-
-    addDelegate(multiMap, 26, 10);
-    assertEquals(false, multiMap.entrySet().isEmpty());
-    assertEquals(35, multiMap.entrySet().size());
-    assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1")));
-    assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(35, "value35")));
-  }
-
-  public void testKeySet() throws Exception
-  {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertEquals(true, multiMap.keySet().isEmpty());
-    assertEquals(0, multiMap.keySet().size());
-    assertEquals(false, multiMap.keySet().contains(1));
-
-    addDelegate(multiMap, 0, 0);
-    assertEquals(true, multiMap.keySet().isEmpty());
-    assertEquals(0, multiMap.keySet().size());
-    assertEquals(false, multiMap.keySet().contains(1));
-
-    addDelegate(multiMap, 1, 10);
-    addDelegate(multiMap, 11, 10);
-    addDelegate(multiMap, 21, 10);
-    assertEquals(false, multiMap.keySet().isEmpty());
-    assertEquals(30, multiMap.keySet().size());
-    assertEquals(true, multiMap.keySet().contains(1));
-
-    addDelegate(multiMap, 6, 10);
-    assertEquals(false, multiMap.keySet().isEmpty());
-    assertEquals(30, multiMap.keySet().size());
-    assertEquals(true, multiMap.keySet().contains(1));
-    assertEquals(false, multiMap.keySet().contains(35));
-
-    addDelegate(multiMap, 26, 10);
-    assertEquals(false, multiMap.keySet().isEmpty());
-    assertEquals(35, multiMap.keySet().size());
-    assertEquals(true, multiMap.keySet().contains(1));
-    assertEquals(true, multiMap.keySet().contains(35));
-  }
-
-  public void testValues() throws Exception
-  {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertEquals(true, multiMap.values().isEmpty());
-    assertEquals(0, multiMap.values().size());
-    assertEquals(false, multiMap.values().contains("value1"));
-
-    addDelegate(multiMap, 0, 0);
-    assertEquals(true, multiMap.values().isEmpty());
-    assertEquals(0, multiMap.values().size());
-    assertEquals(false, multiMap.values().contains("value1"));
-
-    addDelegate(multiMap, 1, 10);
-    addDelegate(multiMap, 11, 10);
-    addDelegate(multiMap, 21, 10);
-    assertEquals(false, multiMap.values().isEmpty());
-    assertEquals(30, multiMap.values().size());
-    assertEquals(true, multiMap.values().contains("value1"));
-
-    addDelegate(multiMap, 6, 10);
-    assertEquals(false, multiMap.values().isEmpty());
-    assertEquals(30, multiMap.values().size());
-    assertEquals(true, multiMap.values().contains("value1"));
-    assertEquals(false, multiMap.values().contains("value35"));
-
-    addDelegate(multiMap, 26, 10);
-    assertEquals(false, multiMap.values().isEmpty());
-    assertEquals(35, multiMap.values().size());
-    assertEquals(true, multiMap.values().contains("value1"));
-    assertEquals(true, multiMap.values().contains("value35"));
-  }
-
-  public void testEntrySetIterator() throws Exception
-  {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertIterator(new HashSet<Object>(), multiMap.entrySet());
-
-    addDelegate(multiMap, 0, 0);
-    assertIterator(new HashSet<Object>(), multiMap.entrySet());
-
-    addDelegate(multiMap, 1, 10);
-    addDelegate(multiMap, 11, 10);
-    addDelegate(multiMap, 21, 10);
-    assertIterator(createMapEntries(1, 30), multiMap.entrySet());
-
-    addDelegate(multiMap, 6, 10);
-    assertIterator(createMapEntries(1, 30), multiMap.entrySet());
-
-    addDelegate(multiMap, 26, 10);
-    assertIterator(createMapEntries(1, 35), multiMap.entrySet());
-  }
-
-  public void testKeySetIterator() throws Exception
-  {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertIterator(new HashSet<Object>(), multiMap.keySet());
-
-    addDelegate(multiMap, 0, 0);
-    assertIterator(new HashSet<Object>(), multiMap.keySet());
-
-    addDelegate(multiMap, 1, 10);
-    addDelegate(multiMap, 11, 10);
-    addDelegate(multiMap, 21, 10);
-    assertIterator(createKeys(1, 30), multiMap.keySet());
-
-    addDelegate(multiMap, 6, 10);
-    assertIterator(createKeys(1, 30), multiMap.keySet());
-
-    addDelegate(multiMap, 26, 10);
-    assertIterator(createKeys(1, 35), multiMap.keySet());
-  }
-
-  public void testValuesIterator() throws Exception
-  {
-    ListBased<Integer, String> multiMap = new ListBased<Integer, String>();
-    assertIterator(new HashSet<Object>(), multiMap.values());
-
-    addDelegate(multiMap, 0, 0);
-    assertIterator(new HashSet<Object>(), multiMap.values());
-
-    addDelegate(multiMap, 1, 10);
-    addDelegate(multiMap, 11, 10);
-    addDelegate(multiMap, 21, 10);
-    assertIterator(createValues(1, 30), multiMap.values());
-
-    addDelegate(multiMap, 6, 10);
-    assertIterator(createValues(1, 30), multiMap.values());
-
-    addDelegate(multiMap, 26, 10);
-    assertIterator(createValues(1, 35), multiMap.values());
-  }
-
-  private void addDelegate(ListBased<Integer, String> multiMap, int start, int count)
-  {
-    Map<Integer, String> map = new HashMap<Integer, String>();
-    for (int i = 0; i < count; i++)
-    {
-      int key = start + i;
-      map.put(key, "value" + key);
-    }
-
-    multiMap.getDelegates().add(map);
-  }
-
-  private void assertIterator(Set<?> expectedObjects, Collection<?> actualObjects)
-  {
-    for (Object actualObject : actualObjects)
-    {
-      if (!expectedObjects.remove(actualObject))
-      {
-        fail("Unexpected object: " + actualObject);
-      }
-    }
-
-    if (!expectedObjects.isEmpty())
-    {
-      fail("Missing objects: " + expectedObjects);
-    }
-  }
-
-  private Set<Object> createMapEntries(int start, int count)
-  {
-    Set<Object> result = new HashSet<Object>();
-    for (int i = 0; i < count; i++)
-    {
-      int key = start + i;
-      result.add(new MapEntry<Integer, String>(key, "value" + key));
-    }
-
-    return result;
-  }
-
-  private Set<Object> createKeys(int start, int count)
-  {
-    Set<Object> result = new HashSet<Object>();
-    for (int i = 0; i < count; i++)
-    {
-      int key = start + i;
-      result.add(key);
-    }
-
-    return result;
-  }
-
-  private Set<Object> createValues(int start, int count)
-  {
-    Set<Object> result = new HashSet<Object>();
-    for (int i = 0; i < count; i++)
-    {
-      int key = start + i;
-      result.add("value" + key);
-    }
-
-    return result;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java
deleted file mode 100644
index 9dbb7419ad..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import org.eclipse.net4j.util.ref.ReferenceValueMap;
-
-/**
- * @author Eike Stepper
- */
-public class ReferenceValueMapTest extends AbstractOMTest
-{
-  public void testSameKey() throws Exception
-  {
-    ReferenceValueMap<String, Object> map = new ReferenceValueMap.Weak<String, Object>();
-    for (int i = 0; i < 10; i++)
-    {
-      map.put("SIMON", new Object());
-      System.gc();
-      map.put("SIMON", new Object());
-      assertTrue(map.size() >= 0);
-    }
-  }
-
-  public void testDifferentKey() throws Exception
-  {
-    ReferenceValueMap<String, Object> map = new ReferenceValueMap.Weak<String, Object>();
-    for (int i = 0; i < 10; i++)
-    {
-      map.put("SIMON", new Object());
-      System.gc();
-      map.put("SIMON2", new Object());
-      assertTrue(map.size() >= 1);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
deleted file mode 100644
index af9ded8930..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import org.eclipse.net4j.internal.util.security.ChallengeNegotiator;
-import org.eclipse.net4j.internal.util.security.NegotiationContext;
-import org.eclipse.net4j.internal.util.security.PasswordCredentials;
-import org.eclipse.net4j.internal.util.security.PasswordCredentialsProvider;
-import org.eclipse.net4j.internal.util.security.Randomizer;
-import org.eclipse.net4j.internal.util.security.ResponseNegotiator;
-import org.eclipse.net4j.internal.util.security.UserManager;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.security.IChallengeResponse;
-import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
-
-import java.nio.ByteBuffer;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-public class SecurityTest extends AbstractOMTest
-{
-  private static final int TIMEOUT = 1000;
-
-  private static final String USER_ID = "stepper";
-
-  private static final char[] PASSWORD1 = "eike2007".toCharArray();
-
-  private static final char[] PASSWORD2 = "invalid".toCharArray();
-
-  private static final PasswordCredentials CREDENTIALS = new PasswordCredentials(USER_ID, PASSWORD1);
-
-  private IPasswordCredentialsProvider credentialsProvider = new PasswordCredentialsProvider(CREDENTIALS);
-
-  public void testSuccess() throws Exception
-  {
-    // Prepare randomizer
-    Randomizer randomizer = new Randomizer();
-    randomizer.activate();
-
-    // Prepare user manager
-    UserManager userManager = new UserManager();
-    userManager.activate();
-    userManager.addUser(USER_ID, PASSWORD1);
-
-    // Create negotiation contexts
-    PeerNegotiationContext challengeContext = new PeerNegotiationContext();
-    PeerNegotiationContext responseContext = new PeerNegotiationContext();
-
-    // Prepare challenge context
-    challengeContext.setPeer(responseContext);
-    Thread challengeThread = new Thread(challengeContext, "challengeThread");
-    challengeThread.start();
-
-    // Prepare response context
-    responseContext.setPeer(challengeContext);
-    Thread responseThread = new Thread(responseContext, "responseThread");
-    responseThread.start();
-
-    // Prepare response negotiator
-    ResponseNegotiator responseNegotiator = new ResponseNegotiator();
-    responseNegotiator.setCredentialsProvider(credentialsProvider);
-    responseNegotiator.activate();
-    responseNegotiator.negotiate(responseContext);
-
-    // Prepare challenge negotiator
-    ChallengeNegotiator challengeNegotiator = new ChallengeNegotiator();
-    challengeNegotiator.setRandomizer(randomizer);
-    challengeNegotiator.setUserManager(userManager);
-    challengeNegotiator.activate();
-    challengeNegotiator.negotiate(challengeContext);
-
-    Enum<?> responseState = responseContext.waitUntilFinished(TIMEOUT);
-    assertEquals(IChallengeResponse.State.SUCCESS, responseState);
-
-    Enum<?> challengeState = challengeContext.waitUntilFinished(TIMEOUT);
-    assertEquals(IChallengeResponse.State.SUCCESS, challengeState);
-
-    challengeContext.deactivate();
-    responseContext.deactivate();
-    challengeNegotiator.deactivate();
-    responseNegotiator.deactivate();
-    userManager.deactivate();
-    randomizer.deactivate();
-  }
-
-  public void testFailure() throws Exception
-  {
-    // Prepare randomizer
-    Randomizer randomizer = new Randomizer();
-    randomizer.activate();
-
-    // Prepare user manager
-    UserManager userManager = new UserManager();
-    userManager.activate();
-    userManager.addUser(USER_ID, PASSWORD2);
-
-    // Create negotiation contexts
-    PeerNegotiationContext challengeContext = new PeerNegotiationContext();
-    PeerNegotiationContext responseContext = new PeerNegotiationContext();
-
-    // Prepare challenge context
-    challengeContext.setPeer(responseContext);
-    Thread challengeThread = new Thread(challengeContext, "challengeThread");
-    challengeThread.start();
-
-    // Prepare response context
-    responseContext.setPeer(challengeContext);
-    Thread responseThread = new Thread(responseContext, "responseThread");
-    responseThread.start();
-
-    // Prepare response negotiator
-    ResponseNegotiator responseNegotiator = new ResponseNegotiator();
-    responseNegotiator.setCredentialsProvider(credentialsProvider);
-    responseNegotiator.activate();
-    responseNegotiator.negotiate(responseContext);
-
-    // Prepare challenge negotiator
-    ChallengeNegotiator challengeNegotiator = new ChallengeNegotiator();
-    challengeNegotiator.setRandomizer(randomizer);
-    challengeNegotiator.setUserManager(userManager);
-    challengeNegotiator.activate();
-    challengeNegotiator.negotiate(challengeContext);
-
-    Enum<?> responseState = responseContext.waitUntilFinished(TIMEOUT);
-    assertEquals(IChallengeResponse.State.FAILURE, responseState);
-
-    Enum<?> challengeState = challengeContext.waitUntilFinished(TIMEOUT);
-    assertEquals(IChallengeResponse.State.FAILURE, challengeState);
-
-    challengeContext.deactivate();
-    responseContext.deactivate();
-    challengeNegotiator.deactivate();
-    responseNegotiator.deactivate();
-    userManager.deactivate();
-    randomizer.deactivate();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class PeerNegotiationContext extends NegotiationContext implements Runnable
-  {
-    private PeerNegotiationContext peer;
-
-    private String userID;
-
-    private BlockingQueue<ByteBuffer> queue = new LinkedBlockingQueue<ByteBuffer>();
-
-    private boolean running;
-
-    public PeerNegotiationContext()
-    {
-    }
-
-    public PeerNegotiationContext getPeer()
-    {
-      return peer;
-    }
-
-    public void setPeer(PeerNegotiationContext peer)
-    {
-      this.peer = peer;
-    }
-
-    public String getUserID()
-    {
-      return userID;
-    }
-
-    public void setUserID(String userID)
-    {
-      this.userID = userID;
-    }
-
-    public ByteBuffer getBuffer()
-    {
-      return ByteBuffer.allocateDirect(4096);
-    }
-
-    public void transmitBuffer(ByteBuffer buffer)
-    {
-      buffer.flip();
-      queue.add(buffer);
-    }
-
-    public void deactivate()
-    {
-      running = false;
-    }
-
-    public void run()
-    {
-      running = true;
-      while (running)
-      {
-        if (peer != null)
-        {
-          Receiver receiver = peer.getReceiver();
-          if (receiver != null)
-          {
-            ByteBuffer buffer = null;
-
-            try
-            {
-              buffer = queue.poll(20, TimeUnit.MILLISECONDS);
-            }
-            catch (InterruptedException ex)
-            {
-              throw WrappedException.wrap(ex);
-            }
-
-            if (buffer != null)
-            {
-              receiver.receiveBuffer(peer, buffer);
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SortedFileMapTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SortedFileMapTest.java
deleted file mode 100644
index 4601b4ed82..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SortedFileMapTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import org.eclipse.net4j.util.io.ExtendedDataInput;
-import org.eclipse.net4j.util.io.ExtendedDataOutput;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.io.SortedFileMap;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class SortedFileMapTest extends AbstractOMTest
-{
-  public void testMap() throws Exception
-  {
-    File file = new File("testMap.dat");
-    if (file.exists())
-    {
-      file.delete();
-    }
-
-    SortedFileMap<Integer, String> map = null;
-
-    try
-    {
-      map = new TestMap(file);
-      for (int i = 0; i < 500; i++)
-      {
-        map.put(i, "Value " + i);
-      }
-
-      for (int i = 0; i < 500; i++)
-      {
-        String value = map.get(i);
-        IOUtil.OUT().println(value);
-      }
-    }
-    finally
-    {
-      IOUtil.close(map);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class TestMap extends SortedFileMap<Integer, String>
-  {
-    public TestMap(File file)
-    {
-      super(file, "rw");
-    }
-
-    @Override
-    public int getKeySize()
-    {
-      return 4;
-    }
-
-    @Override
-    protected Integer readKey(ExtendedDataInput in) throws IOException
-    {
-      return in.readInt();
-    }
-
-    @Override
-    protected void writeKey(ExtendedDataOutput out, Integer key) throws IOException
-    {
-      out.writeInt(key);
-    }
-
-    @Override
-    public int getValueSize()
-    {
-      return 20;
-    }
-
-    @Override
-    protected String readValue(ExtendedDataInput in) throws IOException
-    {
-      return in.readString();
-    }
-
-    @Override
-    protected void writeValue(ExtendedDataOutput out, String value) throws IOException
-    {
-      byte[] bytes = value.getBytes();
-      if (bytes.length + 4 > getValueSize())
-      {
-        throw new IllegalArgumentException("Value size of " + getValueSize() + " exceeded: " + value);
-      }
-
-      out.writeByteArray(bytes);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
deleted file mode 100644
index 6215d43f8c..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import org.eclipse.net4j.internal.util.concurrent.SynchronizingCorrelator;
-import org.eclipse.net4j.util.concurrent.ISynchronizer;
-
-/**
- * @author Eike Stepper
- */
-public class SynchronizingCorrelatorTest extends AbstractOMTest
-{
-  public void testPutConsumerFirst() throws Exception
-  {
-    final Boolean[] result = { false };
-    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
-    final Thread consumer = new Thread()
-    {
-      @Override
-      public void run()
-      {
-        ISynchronizer<Boolean> eike = correlator.correlate("eike");
-        result[0] = eike.get(5000);
-        msg("RESULT: " + result[0]);
-      }
-    };
-
-    consumer.start();
-    sleep(50);
-
-    correlator.put("eike", true);
-    consumer.join(100);
-    assertEquals(Boolean.TRUE, result[0]);
-  }
-
-  public void testPutConsumerFirst100() throws Exception
-  {
-    for (int i = 0; i < 100; i++)
-    {
-      testPutConsumerFirst();
-    }
-  }
-
-  public void testBlockingPutConsumerFirst() throws Exception
-  {
-    final Boolean[] result = { false };
-    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
-    final Thread consumer = new Thread()
-    {
-      @Override
-      public void run()
-      {
-        ISynchronizer<Boolean> eike = correlator.correlate("eike");
-        result[0] = eike.get(5000);
-        msg("RESULT: " + result[0]);
-      }
-    };
-
-    consumer.start();
-    Thread.sleep(10);
-
-    boolean consumed = correlator.put("eike", true, 1000);
-    msg("Consumed: " + consumed);
-    assertTrue(consumed);
-
-    consumer.join(100);
-    assertEquals(Boolean.TRUE, result[0]);
-  }
-
-  public void testBlockingPutConsumerFirst100() throws Exception
-  {
-    for (int i = 0; i < 100; i++)
-    {
-      testBlockingPutConsumerFirst();
-    }
-  }
-
-  public void testPutProducerFirst() throws Exception
-  {
-    final Boolean[] result = { false };
-    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
-    correlator.put("eike", true);
-
-    final Thread consumer = new Thread()
-    {
-      @Override
-      public void run()
-      {
-        ISynchronizer<Boolean> eike = correlator.correlate("eike");
-        result[0] = eike.get(5000);
-        msg("RESULT: " + result[0]);
-      }
-    };
-
-    consumer.start();
-    Thread.sleep(10);
-
-    consumer.join(100);
-    assertEquals(Boolean.TRUE, result[0]);
-  }
-
-  public void testPutProducerFirst100() throws Exception
-  {
-    for (int i = 0; i < 100; i++)
-    {
-      testPutProducerFirst();
-    }
-  }
-
-  public void testBlockingPutProducerFirst() throws Exception
-  {
-    final Boolean[] result = { false };
-    final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
-    boolean consumed = correlator.put("eike", true, 50);
-    msg("Consumed: " + consumed);
-    assertFalse(consumed);
-
-    final Thread consumer = new Thread()
-    {
-      @Override
-      public void run()
-      {
-        ISynchronizer<Boolean> eike = correlator.correlate("eike");
-        result[0] = eike.get(5000);
-        msg("RESULT: " + result[0]);
-      }
-    };
-
-    consumer.start();
-    Thread.sleep(10);
-
-    consumer.join(50);
-    assertEquals(Boolean.TRUE, result[0]);
-  }
-
-  public void testBlockingPutProducerFirst50() throws Exception
-  {
-    for (int i = 0; i < 50; i++)
-    {
-      testBlockingPutProducerFirst();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java
deleted file mode 100644
index fd0375e551..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-
-/**
- * @author Eike Stepper
- */
-public class UTFTest extends AbstractOMTest
-{
-  private static final int UNSIGNED_SHORT_MAX = (1 << 16) - 1;
-
-  public void testUTF8_OneOctet() throws Exception
-  {
-    final int MAX = UNSIGNED_SHORT_MAX / 10 + 1;
-    String part = "0123456789";
-    assertEquals(10, part.length());
-
-    StringBuilder builder = new StringBuilder();
-    for (int i = 0; i < MAX; i++)
-    {
-      builder.append(part);
-    }
-
-    String str = builder.toString();
-    assertTrue(str.length() > UNSIGNED_SHORT_MAX);
-
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    DataOutputStream dos = new DataOutputStream(baos);
-    dos.writeUTF(str);
-
-    String received = baos.toString("UTF-8");
-    assertEquals(str, received);
-  }
-
-  public void testUTF8_ThreeOctets() throws Exception
-  {
-    final int MAX = UNSIGNED_SHORT_MAX >> 1;
-    StringBuilder builder = new StringBuilder();
-    for (int i = 0; i < MAX; i++)
-    {
-      builder.append("\u6771");
-    }
-
-    String str = builder.toString();
-    assertEquals(MAX, str.length());
-
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    DataOutputStream dos = new DataOutputStream(baos);
-    dos.writeUTF(str);
-
-    String received = baos.toString("UTF-8");
-    assertEquals(str, received);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java
deleted file mode 100644
index 5efe0c5264..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests;
-
-import org.eclipse.net4j.util.io.ZIPUtil;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class ZipTest extends AbstractOMTest
-{
-  public void testZip() throws Exception
-  {
-    File zipFile = newFile("src.zip");
-    File sourceFolder = newFile("src");
-    ZIPUtil.zip(sourceFolder, false, zipFile);
-  }
-
-  private static File newFile(String path) throws IOException
-  {
-    return new File(path).getCanonicalFile();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/CacheTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/CacheTest.java
deleted file mode 100644
index 17cf10ef43..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/CacheTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests.cache;
-
-import org.eclipse.net4j.internal.util.cache.CacheMonitor;
-import org.eclipse.net4j.internal.util.cache.ThresholdConditionPolicy;
-import org.eclipse.net4j.util.cache.ICacheMonitor.ConditionPolicy;
-import org.eclipse.net4j.util.tests.AbstractOMTest;
-
-/**
- * @author Eike Stepper
- */
-public class CacheTest extends AbstractOMTest
-{
-  public void testLifecycle() throws Exception
-  {
-    ConditionPolicy conditionPolicy = new ThresholdConditionPolicy(1000000L, 10000000L);
-
-    CacheMonitor cacheMonitor = new CacheMonitor();
-    cacheMonitor.setConditionPolicy(conditionPolicy);
-    cacheMonitor.setPauseRED(100L);
-    cacheMonitor.setPauseYELLOW(100L);
-    cacheMonitor.setPauseGREEN(100L);
-    cacheMonitor.setDaemon(true);
-    cacheMonitor.activate();
-
-    RevisionManager revisionManager = new RevisionManager();
-    revisionManager.setCacheMonitor(cacheMonitor);
-    revisionManager.activate();
-
-    for (int version = 1; version <= 10; version++)
-    {
-      for (int id = 1; id <= 100; id++)
-      {
-        revisionManager.getRevision(id, version);
-        sleep(200);
-      }
-
-      System.gc();
-      sleep(1000);
-    }
-
-    revisionManager.deactivate();
-    cacheMonitor.deactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java
deleted file mode 100644
index 2f3d325ca5..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests.cache;
-
-/**
- * @author Eike Stepper
- */
-public class Revision
-{
-  private RevisionManager revisionManager;
-
-  private int id;
-
-  private int version;
-
-  private byte[] data = new byte[100000];
-
-  public Revision(RevisionManager revisionManager, int id, int version)
-  {
-    this.revisionManager = revisionManager;
-    this.id = id;
-    this.version = version;
-  }
-
-  public RevisionManager getRevisionManager()
-  {
-    return revisionManager;
-  }
-
-  public int getID()
-  {
-    return id;
-  }
-
-  public int getVersion()
-  {
-    return version;
-  }
-
-  public byte[] getData()
-  {
-    return data;
-  }
-
-  @Override
-  public String toString()
-  {
-    return "R" + id + "v" + version;
-  }
-
-  // @SuppressWarnings("unchecked")
-  // private static Set finalized = new HashSet();
-  //
-  // @SuppressWarnings("unchecked")
-  // private static List refs = new ArrayList();
-  //
-  // @SuppressWarnings("unchecked")
-  // private static ReferenceQueue queue = new ReferenceQueue();
-  //
-  @Override
-  protected void finalize() throws Throwable
-  {
-    System.err.println("FINALIZE " + this);
-    revisionManager.finalizeRevision(this);
-    // long token = id;
-    // token <<= 32;
-    // token |= version;
-    // if (!finalized.add(token))
-    // {
-    // System.err.println("************************************************************************");
-    // }
-    //  
-    // refs.add(new PhantomReference<Revision>(this, queue));
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java
deleted file mode 100644
index 80365dc399..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests.cache;
-
-import org.eclipse.net4j.internal.util.cache.Cache;
-
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class RevisionManager extends Cache<Revision>
-{
-  private Map<Integer, TimeLine> timeLines = new HashMap<Integer, TimeLine>();
-
-  public RevisionManager()
-  {
-  }
-
-  public Revision getRevision(int id, int version)
-  {
-    TimeLine timeLine = getTimeLine(id);
-    return timeLine.getRevision(version);
-  }
-
-  public void evictElements(int elementCount)
-  {
-  }
-
-  protected TimeLine getTimeLine(int id)
-  {
-    TimeLine timeLine = timeLines.get(id);
-    if (timeLine == null)
-    {
-      timeLine = new TimeLine(id);
-      timeLines.put(id, timeLine);
-    }
-
-    return timeLine;
-  }
-
-  protected Revision loadRevision(int id, int version)
-  {
-    Revision revision = new Revision(this, id, version);
-    return revision;
-  }
-
-  protected void finalizeRevision(Revision revision)
-  {
-    // TimeLine timeLine = getTimeLine(revision.getID());
-    // timeLine.addRevision(revision);
-  }
-
-  @Override
-  protected void unreachableElement(Reference<? extends Revision> reference)
-  {
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private class TimeLine
-  {
-    private int id;
-
-    private List<Reference<Revision>> revisions = new ArrayList<Reference<Revision>>();
-
-    public TimeLine(int id)
-    {
-      this.id = id;
-    }
-
-    public int getID()
-    {
-      return id;
-    }
-
-    public Revision getRevision(int version)
-    {
-      for (Iterator<Reference<Revision>> it = revisions.iterator(); it.hasNext();)
-      {
-        Reference<Revision> reference = it.next();
-        Revision revision = reference.get();
-        if (revision != null)
-        {
-          if (revision.getVersion() == version)
-          {
-            return revision;
-          }
-        }
-        else
-        {
-          it.remove();
-          break;
-        }
-      }
-
-      long time = System.currentTimeMillis();
-      Revision revision = loadRevision(id, version);
-      time = System.currentTimeMillis() - time;
-
-      addRevision(revision);
-      return revision;
-    }
-
-    public void addRevision(Revision revision)
-    {
-      revisions.add(new CacheElement(revision, getReferenceQueue()));
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class CacheElement extends SoftReference<Revision>
-  {
-    private int id;
-
-    private int version;
-
-    // private Reference<Revision> ref;
-
-    public CacheElement(Revision revision, ReferenceQueue<Revision> queue)
-    {
-      super(revision, queue);
-      // ref = new WeakReference<Revision>(revision, queue);
-      id = revision.getID();
-      version = revision.getVersion();
-    }
-
-    public int getID()
-    {
-      return id;
-    }
-
-    public int getVersion()
-    {
-      return version;
-    }
-
-    @Override
-    public String toString()
-    {
-      return "R" + id + "v" + version + (get() == null ? "" : " UNCLEARED");
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java
deleted file mode 100644
index 183f79dfcd..0000000000
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.tests.cache;
-
-import org.eclipse.net4j.util.ref.KeyedWeakReference;
-import org.eclipse.net4j.util.tests.AbstractOMTest;
-
-import java.lang.ref.ReferenceQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * @author Eike Stepper
- */
-public class SensitiveProtoTest extends AbstractOMTest
-{
-  @SuppressWarnings("unchecked")
-  public void testSensitiveCacheWithEvictionPolicy() throws Exception
-  {
-    ConcurrentMap<Integer, KeyedAndValuedWeakReference<Integer, String>> map //
-    = new ConcurrentHashMap<Integer, KeyedAndValuedWeakReference<Integer, String>>();
-
-    ReferenceQueue<String> queue //
-    = new ReferenceQueue<String>();
-
-    for (int i = 0; i < 20; i++)
-    {
-      map.put(i, new KeyedAndValuedWeakReference<Integer, String>(i, String.valueOf(i), queue));
-    }
-
-    for (int gc = 0; gc < 10; gc++)
-    {
-      System.gc();
-      sleep(100);
-    }
-
-    KeyedAndValuedWeakReference<Integer, String> ref;
-    while ((ref = (KeyedAndValuedWeakReference<Integer, String>)queue.poll()) != null)
-    {
-      int i = ref.getKey();
-      System.out.println("Dequeued i=" + i);
-      if (i < 10)
-      {
-        map.put(i, new KeyedAndValuedWeakReference<Integer, String>(i, ref.getValue(), queue));
-      }
-      else
-      {
-        map.remove(i, ref);
-      }
-    }
-
-    assertEquals(10, map.size());
-  }
-
-  public static class KeyedAndValuedWeakReference<K, T> extends KeyedWeakReference<K, T>
-  {
-    private T value;
-
-    public KeyedAndValuedWeakReference(K key, T ref, ReferenceQueue<T> queue)
-    {
-      super(key, ref, queue);
-      value = ref;
-    }
-
-    public KeyedAndValuedWeakReference(K key, T ref)
-    {
-      super(key, ref);
-      value = ref;
-    }
-
-    public T getValue()
-    {
-      return value;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.tests/test.xml b/plugins/org.eclipse.net4j.tests/test.xml
deleted file mode 100644
index ee303ae0f3..0000000000
--- a/plugins/org.eclipse.net4j.tests/test.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties plugin-name, and library-file -->
-  <property name="plugin-name" value="org.eclipse.net4j.tests"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="emf-folder" value="${eclipse-home}/emf_folder"/>
-    <delete dir="${emf-folder}" quiet="true"/>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${emf-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.net4j.tests.AllTests"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.ui/.classpath b/plugins/org.eclipse.net4j.ui/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.ui/.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.ui/.cvsignore b/plugins/org.eclipse.net4j.ui/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.net4j.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.net4j.ui/.options b/plugins/org.eclipse.net4j.ui/.options
deleted file mode 100644
index 8e5649c8f7..0000000000
--- a/plugins/org.eclipse.net4j.ui/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.ui/debug = true
diff --git a/plugins/org.eclipse.net4j.ui/.project b/plugins/org.eclipse.net4j.ui/.project
deleted file mode 100644
index c015ab0a94..0000000000
--- a/plugins/org.eclipse.net4j.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.ui</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d5c5fdc6ff..0000000000
--- a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:44:39 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 544fb9b2db..0000000000
--- a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:44:39 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 73435e6fa7..0000000000
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.ui;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.internal.ui.bundle.OM$Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.net4j;visibility:=reexport,
- org.eclipse.net4j.util.ui;visibility:=reexport
-Export-Package: org.eclipse.net4j.internal.ui;version="0.8.0",
- org.eclipse.net4j.internal.ui.views;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.ui/about.html b/plugins/org.eclipse.net4j.ui/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.ui/about.html
+++ /dev/null
@@ -1,28 +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.ui/about.ini b/plugins/org.eclipse.net4j.ui/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.net4j.ui/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.ui/about.mappings b/plugins/org.eclipse.net4j.ui/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.net4j.ui/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.ui/about.properties b/plugins/org.eclipse.net4j.ui/about.properties
deleted file mode 100644
index d52661d667..0000000000
--- a/plugins/org.eclipse.net4j.ui/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 UI (Incubation)
-featureText = Net4j UI \n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/Net4j
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.ui/build.properties b/plugins/org.eclipse.net4j.ui/build.properties
deleted file mode 100644
index 9f11214f80..0000000000
--- a/plugins/org.eclipse.net4j.ui/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               icons/,\
-               license.html,\
-               plugin.properties,\
-               plugin.xml,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
diff --git a/plugins/org.eclipse.net4j.ui/copyright.txt b/plugins/org.eclipse.net4j.ui/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.ui/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.ui/epl-v10.html b/plugins/org.eclipse.net4j.ui/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.ui/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.ui/icons/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/H.gif b/plugins/org.eclipse.net4j.ui/icons/H.gif
deleted file mode 100644
index 5d86350a54..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/H.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gif b/plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gif
deleted file mode 100644
index 7c7dca802e..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gif
deleted file mode 100644
index 252d7ebcb8..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gif
deleted file mode 100644
index 5af19b1240..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gif
deleted file mode 100644
index 8fbb69bae8..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gif
deleted file mode 100644
index b6922ac11c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gif
deleted file mode 100644
index e3831471a6..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gif
deleted file mode 100644
index a830867191..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gif
deleted file mode 100644
index e8c1e6ff7e..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gif
deleted file mode 100644
index df67abd507..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gif
deleted file mode 100644
index 3b3ad7c16e..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gif
deleted file mode 100644
index 955d5e87a5..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gif
deleted file mode 100644
index 42e027c933..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gif b/plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gif
deleted file mode 100644
index a830867191..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gif b/plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gif
deleted file mode 100644
index 3b3ad7c16e..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gif b/plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gif
deleted file mode 100644
index 7ef3c2c80b..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gif b/plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gif
deleted file mode 100644
index 405fda6480..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/plus.gif b/plugins/org.eclipse.net4j.ui/icons/plus.gif
deleted file mode 100644
index 571b553ecd..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/plus.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/icons/sample.gif b/plugins/org.eclipse.net4j.ui/icons/sample.gif
deleted file mode 100644
index 34fb3c9d8c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/sample.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/license.html b/plugins/org.eclipse.net4j.ui/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.ui/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.ui/modeling32.png b/plugins/org.eclipse.net4j.ui/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.net4j.ui/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.ui/plugin.properties b/plugins/org.eclipse.net4j.ui/plugin.properties
deleted file mode 100644
index 3bc9355fd4..0000000000
--- a/plugins/org.eclipse.net4j.ui/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j UI (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.ui/plugin.xml b/plugins/org.eclipse.net4j.ui/plugin.xml
deleted file mode 100644
index bf41dbbc7d..0000000000
--- a/plugins/org.eclipse.net4j.ui/plugin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            id="org.eclipse.net4j"
-            name="Net4j">
-      </category>
-      <view
-            category="org.eclipse.net4j"
-            class="org.eclipse.net4j.internal.ui.views.AcceptorsView"
-            icon="icons/full/view16/acceptors.gif"
-            id="org.eclipse.net4j.AcceptorsView"
-            name="Acceptors">
-      </view>
-      <view
-            category="org.eclipse.net4j"
-            class="org.eclipse.net4j.internal.ui.views.ConnectorsView"
-            icon="icons/full/view16/connectors.gif"
-            id="org.eclipse.net4j.ConnectorsView"
-            name="Connectors">
-      </view>
-   </extension>
-   
-</plugin>
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/AcceptorContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/AcceptorContentProvider.java
deleted file mode 100644
index 6542469bfb..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/AcceptorContentProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.ui;
-
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.ui.StructuredContentProvider;
-
-import org.eclipse.internal.net4j.acceptor.AcceptorFactory;
-
-/**
- * @author Eike Stepper
- */
-public class AcceptorContentProvider extends StructuredContentProvider<IManagedContainer>
-{
-  public static final String PRODUCT_GROUP = AcceptorFactory.PRODUCT_GROUP;
-
-  public AcceptorContentProvider()
-  {
-  }
-
-  public Object[] getElements(Object inputElement)
-  {
-    return getInput().getElements(PRODUCT_GROUP);
-  }
-
-  @Override
-  protected void connectInput(IManagedContainer input)
-  {
-    input.addListener(this);
-  }
-
-  @Override
-  protected void disconnectInput(IManagedContainer input)
-  {
-    input.removeListener(this);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/ConnectorContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/ConnectorContentProvider.java
deleted file mode 100644
index 8571e1d890..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/ConnectorContentProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.ui;
-
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.ui.StructuredContentProvider;
-
-import org.eclipse.internal.net4j.connector.ConnectorFactory;
-
-/**
- * @author Eike Stepper
- */
-public class ConnectorContentProvider extends StructuredContentProvider<IManagedContainer>
-{
-  public static final String PRODUCT_GROUP = ConnectorFactory.PRODUCT_GROUP;
-
-  public ConnectorContentProvider()
-  {
-  }
-
-  public Object[] getElements(Object inputElement)
-  {
-    return getInput().getElements(PRODUCT_GROUP);
-  }
-
-  @Override
-  protected void connectInput(IManagedContainer input)
-  {
-    input.addListener(this);
-  }
-
-  @Override
-  protected void disconnectInput(IManagedContainer input)
-  {
-    input.removeListener(this);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/FactoryTypeContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/FactoryTypeContentProvider.java
deleted file mode 100644
index 99064292b8..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/FactoryTypeContentProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.ui;
-
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.ui.StructuredContentProvider;
-
-/**
- * @author Eike Stepper
- */
-public class FactoryTypeContentProvider extends StructuredContentProvider<IManagedContainer>
-{
-  private String productGroup;
-
-  public FactoryTypeContentProvider(String productGroup)
-  {
-    this.productGroup = productGroup;
-  }
-
-  public String getProductGroup()
-  {
-    return productGroup;
-  }
-
-  public Object[] getElements(Object inputElement)
-  {
-    return getInput().getFactoryTypes(productGroup).toArray();
-  }
-
-  @Override
-  protected void connectInput(IManagedContainer input)
-  {
-    input.addListener(this);
-    input.getFactoryRegistry().addListener(this);
-  }
-
-  @Override
-  protected void disconnectInput(IManagedContainer input)
-  {
-    input.removeListener(this);
-    input.getFactoryRegistry().removeListener(this);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java
deleted file mode 100644
index 6b5a79329b..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.ui;
-
-import org.eclipse.net4j.internal.ui.bundle.OM;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class SharedIcons
-{
-  private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
-
-  private static final String ETOOL = "etool16/";
-
-  private static final String OBJ = "obj16/";
-
-  public static final String OBJ_ACCEPTOR = OBJ + "acceptor";
-
-  public static final String OBJ_ADAPTER = OBJ + "adapter";
-
-  public static final String OBJ_CHANNEL = OBJ + "channel";
-
-  public static final String OBJ_CONNECTOR = OBJ + "connector";
-
-  public static final String OBJ_FACTORY = OBJ + "factory";
-
-  public static final String OBJ_FOLDER = OBJ + "folder";
-
-  public static final String ETOOL_ADD_ACCEPTOR = ETOOL + "add_acceptor";
-
-  public static final String ETOOL_ADD_CONNECTOR = ETOOL + "add_connector";
-
-  public static final String ETOOL_ADD = ETOOL + "add";
-
-  public static final String ETOOL_DELETE = ETOOL + "delete";
-
-  public static final String ETOOL_REFRESH = ETOOL + "refresh";
-
-  public static Image getImage(String key)
-  {
-    key = mangleKey(key);
-    Image image = REGISTRY.get(key);
-    if (image == null)
-    {
-      createDescriptor(key);
-      image = REGISTRY.get(key);
-    }
-
-    return image;
-  }
-
-  public static ImageDescriptor getDescriptor(String key)
-  {
-    key = mangleKey(key);
-    ImageDescriptor descriptor = REGISTRY.getDescriptor(key);
-    if (descriptor == null)
-    {
-      descriptor = createDescriptor(key);
-    }
-
-    return descriptor;
-  }
-
-  private static ImageDescriptor createDescriptor(String key)
-  {
-    ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
-    if (descriptor != null)
-    {
-      REGISTRY.put(key, descriptor);
-    }
-
-    return descriptor;
-  }
-
-  private static Display getDisplay()
-  {
-    Display display = Display.getCurrent();
-    if (display == null)
-    {
-      display = Display.getDefault();
-    }
-
-    if (display == null)
-    {
-      throw new IllegalStateException("display == null");
-    }
-
-    return display;
-  }
-
-  private static String mangleKey(String key)
-  {
-    return "icons/full/" + key + ".gif";
-  }
-}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
deleted file mode 100644
index f6c4a5f069..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.ui.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.pref.OMPreferences;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-import org.eclipse.net4j.util.ui.UIActivator;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.ui"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  public static final OMPreferences PREFS = BUNDLE.preferences();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends UIActivator
-  {
-    public static Activator INSTANCE;
-
-    public Activator()
-    {
-      super(BUNDLE);
-      INSTANCE = this;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java
deleted file mode 100644
index 14684dab19..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.ui.views;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.acceptor.IAcceptor;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.views.ContainerView;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IToolBarManager;
-
-/**
- * @author Eike Stepper
- */
-public class AcceptorsView extends ContainerView
-{
-  private Action addAcceptorAction2036 = new SafeAction("Add Acceptor 2036", "Add an acceptor for port 2036",
-      getAddImageDescriptor())
-  {
-    @Override
-    protected void safeRun() throws Exception
-    {
-      Net4jUtil.getAcceptor(IPluginContainer.INSTANCE, "tcp", "0.0.0.0:2036");
-    }
-  };
-
-  private Action addAcceptorAction2037 = new SafeAction("Add Acceptor 2037", "Add an acceptor for port 2037",
-      getAddImageDescriptor())
-  {
-    @Override
-    protected void safeRun() throws Exception
-    {
-      Net4jUtil.getAcceptor(IPluginContainer.INSTANCE, "tcp", "0.0.0.0:2037");
-    }
-  };
-
-  public AcceptorsView()
-  {
-  }
-
-  @Override
-  protected IManagedContainer getContainer()
-  {
-    return IPluginContainer.INSTANCE;
-  }
-
-  @Override
-  protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
-  {
-    return new Net4jItemProvider(new IElementFilter()
-    {
-      public boolean filter(Object element)
-      {
-        return element instanceof IAcceptor;
-      }
-    });
-  }
-
-  @Override
-  protected void fillLocalToolBar(IToolBarManager manager)
-  {
-    manager.add(addAcceptorAction2036);
-    manager.add(addAcceptorAction2037);
-    super.fillLocalToolBar(manager);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
deleted file mode 100644
index 3268fcb80b..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.ui.views;
-
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.views.ContainerView;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-public class ConnectorsView extends ContainerView
-{
-  public ConnectorsView()
-  {
-  }
-
-  @Override
-  protected IManagedContainer getContainer()
-  {
-    return IPluginContainer.INSTANCE;
-  }
-
-  @Override
-  protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
-  {
-    return new Net4jItemProvider(new IElementFilter()
-    {
-      public boolean filter(Object element)
-      {
-        return element instanceof IConnector;
-      }
-    });
-  }
-}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
deleted file mode 100644
index 31705f95b0..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.ui.views;
-
-import org.eclipse.net4j.acceptor.IAcceptor;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.ui.SharedIcons;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.views.ContainerView;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Eike Stepper
- */
-public class Net4jItemProvider extends ContainerItemProvider<IContainer<Object>>
-{
-  public Net4jItemProvider()
-  {
-  }
-
-  public Net4jItemProvider(IElementFilter rootElementFilter)
-  {
-    super(rootElementFilter);
-  }
-
-  @Override
-  public Image getImage(Object obj)
-  {
-    if (obj instanceof IAcceptor)
-    {
-      return SharedIcons.getImage(SharedIcons.OBJ_ACCEPTOR);
-    }
-
-    if (obj instanceof IConnector)
-    {
-      return SharedIcons.getImage(SharedIcons.OBJ_CONNECTOR);
-    }
-
-    if (obj instanceof IChannel)
-    {
-      return SharedIcons.getImage(SharedIcons.OBJ_CHANNEL);
-    }
-
-    return super.getImage(obj);
-  }
-
-  @Override
-  protected void fillContextMenu(IMenuManager manager, ITreeSelection selection)
-  {
-    if (selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj instanceof IAcceptor || obj instanceof IConnector || obj instanceof IChannel)
-      {
-        manager.add(new RemoveAction(obj));
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class RemoveAction extends LongRunningAction
-  {
-    private Object object;
-
-    public RemoveAction(Object object)
-    {
-      super("Remove", "Remove", ContainerView.getDeleteImageDescriptor());
-      this.object = object;
-    }
-
-    @Override
-    protected void doRun() throws Exception
-    {
-      LifecycleUtil.deactivateNoisy(object);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/.classpath b/plugins/org.eclipse.net4j.util.ui/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/.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.util.ui/.cvsignore b/plugins/org.eclipse.net4j.util.ui/.cvsignore
deleted file mode 100644
index 693869726d..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-doc
diff --git a/plugins/org.eclipse.net4j.util.ui/.options b/plugins/org.eclipse.net4j.util.ui/.options
deleted file mode 100644
index 2379ae46e3..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.util.ui/debug = true
diff --git a/plugins/org.eclipse.net4j.util.ui/.project b/plugins/org.eclipse.net4j.util.ui/.project
deleted file mode 100644
index a10d2cbd97..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.util.ui</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e12e6616ee..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:45:00 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index af7b63812b..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:45:00 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7b6f812ff6..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.net4j.util.ui;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.net4j.util.internal.ui.bundle.OM$Activator
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;visibility:=reexport,
- org.eclipse.net4j.util;visibility:=reexport
-Export-Package: org.eclipse.net4j.util.internal.ui;version="0.8.0",
- org.eclipse.net4j.util.internal.ui.actions;version="0.8.0",
- org.eclipse.net4j.util.internal.ui.security;version="0.8.0",
- org.eclipse.net4j.util.internal.ui.views;version="0.8.0",
- org.eclipse.net4j.util.ui;version="0.8.0",
- org.eclipse.net4j.util.ui.actions;version="0.8.0",
- org.eclipse.net4j.util.ui.dnd;version="0.8.0",
- org.eclipse.net4j.util.ui.prefs;version="0.8.0",
- org.eclipse.net4j.util.ui.proposals;version="0.8.0",
- org.eclipse.net4j.util.ui.views;version="0.8.0",
- org.eclipse.net4j.util.ui.widgets;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.util.ui/about.html b/plugins/org.eclipse.net4j.util.ui/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/about.html
+++ /dev/null
@@ -1,28 +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.util.ui/build.properties b/plugins/org.eclipse.net4j.util.ui/build.properties
deleted file mode 100644
index ed0d12527a..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               icons/,\
-               license.html,\
-               plugin.properties,\
-               plugin.xml
diff --git a/plugins/org.eclipse.net4j.util.ui/copyright.txt b/plugins/org.eclipse.net4j.util.ui/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util.ui/epl-v10.html b/plugins/org.eclipse.net4j.util.ui/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/full/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/add.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/add.gif
deleted file mode 100644
index 252d7ebcb8..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/add.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/delete.gif
deleted file mode 100644
index b6922ac11c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/delete.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/refresh.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/refresh.gif
deleted file mode 100644
index e3831471a6..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/etool16/refresh.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/adapter.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/adapter.gif
deleted file mode 100644
index e8c1e6ff7e..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/adapter.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/factory.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/factory.gif
deleted file mode 100644
index 955d5e87a5..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/factory.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/folder.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/folder.gif
deleted file mode 100644
index 42e027c933..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/folder.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/javabean.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/javabean.gif
deleted file mode 100644
index d9bfbd0541..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/obj16/javabean.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/.cvsignore b/plugins/org.eclipse.net4j.util.ui/icons/full/view16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/container.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/view16/container.gif
deleted file mode 100644
index 6a2267e6cc..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/container.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean.gif
deleted file mode 100644
index 854e13912e..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean_light.gif b/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean_light.gif
deleted file mode 100644
index d9bfbd0541..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/icons/full/view16/javabean_light.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j.util.ui/license.html b/plugins/org.eclipse.net4j.util.ui/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util.ui/plugin.properties b/plugins/org.eclipse.net4j.util.ui/plugin.properties
deleted file mode 100644
index 2e1ecc794b..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Utilities UI (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.util.ui/plugin.xml b/plugins/org.eclipse.net4j.util.ui/plugin.xml
deleted file mode 100644
index 06573ea22b..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            id="org.eclipse.net4j.debug"
-            name="Net4j Debug">
-      </category>
-      <view
-            category="org.eclipse.net4j.debug"
-            id="org.eclipse.net4j.util.Net4jContainerView"
-            class="org.eclipse.net4j.util.internal.ui.views.Net4jContainerView"
-            name="Container"
-            icon="icons/full/view16/container.gif"/>
-      <view
-            category="org.eclipse.net4j.debug"
-            id="org.eclipse.net4j.util.Net4jIntrospectorView"
-            class="org.eclipse.net4j.util.internal.ui.views.Net4jIntrospectorView"
-            name="Introspector"
-            icon="icons/full/view16/javabean.gif"/>
-   </extension>
-   
-</plugin>
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java
deleted file mode 100644
index 74d1776498..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.internal.ui;
-
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class SharedIcons
-{
-  private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
-
-  private static final String TOOL = "etool16/";
-
-  private static final String OBJ = "obj16/";
-
-  private static final String VIEW = "view16/";
-
-  public static final String OBJ_ADAPTER = OBJ + "adapter";
-
-  public static final String OBJ_FACTORY = OBJ + "factory";
-
-  public static final String OBJ_FOLDER = OBJ + "folder";
-
-  public static final String OBJ_BEAN = OBJ + "javabean";
-
-  public static final String VIEW_CONTAINER = VIEW + "container";
-
-  public static final String TOOL_ADD = TOOL + "add";
-
-  public static final String TOOL_DELETE = TOOL + "delete";
-
-  public static final String TOOL_REFRESH = TOOL + "refresh";
-
-  public static Image getImage(String key)
-  {
-    key = mangleKey(key);
-    Image image = REGISTRY.get(key);
-    if (image == null)
-    {
-      createDescriptor(key);
-      image = REGISTRY.get(key);
-    }
-
-    return image;
-  }
-
-  public static ImageDescriptor getDescriptor(String key)
-  {
-    key = mangleKey(key);
-    ImageDescriptor descriptor = REGISTRY.getDescriptor(key);
-    if (descriptor == null)
-    {
-      descriptor = createDescriptor(key);
-    }
-
-    return descriptor;
-  }
-
-  private static ImageDescriptor createDescriptor(String key)
-  {
-    ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
-    if (descriptor != null)
-    {
-      REGISTRY.put(key, descriptor);
-    }
-
-    return descriptor;
-  }
-
-  private static Display getDisplay()
-  {
-    Display display = Display.getCurrent();
-    if (display == null)
-    {
-      display = Display.getDefault();
-    }
-
-    if (display == null)
-    {
-      throw new IllegalStateException("display == null");
-    }
-
-    return display;
-  }
-
-  private static String mangleKey(String key)
-  {
-    return "icons/full/" + key + ".gif";
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java
deleted file mode 100644
index 12e70b9f7f..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.internal.ui.actions;
-
-import org.eclipse.net4j.util.internal.ui.views.Net4jIntrospectorView;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-
-/**
- * @author Eike Stepper
- */
-public class IntrospectAction extends SafeAction
-{
-  private Object object;
-
-  public IntrospectAction(Object object)
-  {
-    super("Introspect");
-    this.object = object;
-  }
-
-  @Override
-  protected void safeRun() throws Exception
-  {
-    Net4jIntrospectorView introspector = Net4jIntrospectorView.getInstance(true);
-    introspector.setObject(object);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java
deleted file mode 100644
index c9f433a76d..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.internal.ui.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.pref.OMPreferences;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-import org.eclipse.net4j.util.ui.UIActivator;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.util.ui"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  public static final OMPreferences PREFS = BUNDLE.preferences();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends UIActivator
-  {
-    public static Activator INSTANCE;
-
-    public Activator()
-    {
-      super(BUNDLE);
-      INSTANCE = this;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/CredentialsDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/CredentialsDialog.java
deleted file mode 100644
index a4ea0b0442..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/CredentialsDialog.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.internal.ui.security;
-
-import org.eclipse.net4j.internal.util.security.PasswordCredentials;
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-import org.eclipse.net4j.util.security.IPasswordCredentials;
-import org.eclipse.net4j.util.ui.UIUtil;
-import org.eclipse.net4j.util.ui.widgets.BaseDialog;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Eike Stepper
- */
-public class CredentialsDialog extends BaseDialog<Viewer>
-{
-  private static final String TITLE = "Login";
-
-  private static final String MESSAGE = "Enter your user ID and password.";
-
-  private Text userIDControl;
-
-  private Text passwordControl;
-
-  private IPasswordCredentials credentials;
-
-  public CredentialsDialog(Shell shell)
-  {
-    super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, TITLE, MESSAGE, OM.Activator.INSTANCE.getDialogSettings());
-  }
-
-  public IPasswordCredentials getCredentials()
-  {
-    return credentials;
-  }
-
-  @Override
-  protected void createUI(Composite parent)
-  {
-    Composite composite = new Composite(parent, SWT.NONE);
-    composite.setLayout(new GridLayout(2, false));
-    composite.setLayoutData(UIUtil.createGridData());
-
-    new Label(composite, SWT.NONE).setText("User ID:");
-    userIDControl = new Text(composite, SWT.BORDER);
-
-    new Label(composite, SWT.NONE).setText("Password:");
-    passwordControl = new Text(composite, SWT.BORDER | SWT.PASSWORD);
-  }
-
-  @Override
-  protected void okPressed()
-  {
-    String userID = userIDControl.getText();
-    String password = passwordControl.getText();
-    credentials = new PasswordCredentials(userID, password.toCharArray());
-    super.okPressed();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/InteractiveCredentialsProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/InteractiveCredentialsProvider.java
deleted file mode 100644
index 992093b098..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/InteractiveCredentialsProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.internal.ui.security;
-
-import org.eclipse.net4j.util.security.IPasswordCredentials;
-import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Eike Stepper
- */
-public class InteractiveCredentialsProvider implements IPasswordCredentialsProvider
-{
-  public InteractiveCredentialsProvider()
-  {
-  }
-
-  public boolean isInteractive()
-  {
-    return true;
-  }
-
-  public IPasswordCredentials getCredentials()
-  {
-    final IPasswordCredentials[] credentials = new IPasswordCredentials[1];
-    final Display display = UIUtil.getDisplay();
-    display.syncExec(new Runnable()
-    {
-      public void run()
-      {
-        CredentialsDialog dialog = new CredentialsDialog(new Shell(display));
-        if (dialog.open() == CredentialsDialog.OK)
-        {
-          credentials[0] = dialog.getCredentials();
-        }
-      }
-    });
-
-    return credentials[0];
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
deleted file mode 100644
index b1a10e380a..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.internal.ui.views;
-
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.internal.ui.SharedIcons;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.views.ContainerView;
-import org.eclipse.net4j.util.ui.views.IElementFilter;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.swt.graphics.Image;
-
-import java.util.Iterator;
-
-/**
- * @author Eike Stepper
- */
-public class Net4jContainerItemProvider extends ContainerItemProvider<IContainer<Object>>
-{
-  public Net4jContainerItemProvider()
-  {
-  }
-
-  public Net4jContainerItemProvider(IElementFilter rootElementFilter)
-  {
-    super(rootElementFilter);
-  }
-
-  @Override
-  protected void fillContextMenu(IMenuManager manager, ITreeSelection selection)
-  {
-    manager.add(new RemoveAction(selection));
-  }
-
-  @Override
-  public Image getImage(Object obj)
-  {
-    return SharedIcons.getImage(SharedIcons.OBJ_BEAN);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class RemoveAction extends LongRunningAction
-  {
-    private ITreeSelection selection;
-
-    public RemoveAction(ITreeSelection selection)
-    {
-      super("Remove", "Remove", ContainerView.getDeleteImageDescriptor());
-      this.selection = selection;
-    }
-
-    @Override
-    protected void doRun() throws Exception
-    {
-      for (Iterator<?> it = selection.iterator(); it.hasNext();)
-      {
-        Object object = it.next();
-        LifecycleUtil.deactivate(object);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
deleted file mode 100644
index 82b4f3ce91..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.internal.ui.views;
-
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
-import org.eclipse.net4j.util.ui.views.ContainerView;
-
-public class Net4jContainerView extends ContainerView
-{
-  public Net4jContainerView()
-  {
-  }
-
-  @Override
-  protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
-  {
-    return new Net4jContainerItemProvider();
-  }
-
-  @Override
-  protected IManagedContainer getContainer()
-  {
-    return IPluginContainer.INSTANCE;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
deleted file mode 100644
index 85b79f0e49..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
+++ /dev/null
@@ -1,641 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.internal.ui.views;
-
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.collection.Pair;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.event.EventUtil;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.internal.ui.SharedIcons;
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-/**
- * @author Eike Stepper
- */
-public class Net4jIntrospectorView extends ViewPart implements ISelectionListener, IDoubleClickListener, IListener
-{
-  public static final String VIEW_ID = "org.eclipse.net4j.util.Net4jIntrospectorView";
-
-  private static final Object[] NO_ELEMENTS = {};
-
-  private static Net4jIntrospectorView instance;
-
-  private TableViewer currentViewer;
-
-  private TableViewer objectViewer;
-
-  private TableViewer iterableViewer;
-
-  private TableViewer mapViewer;
-
-  private Stack<Object> elements = new Stack<Object>();
-
-  private Text classLabel;
-
-  private Text objectLabel;
-
-  private IAction backAction = new BackAction();
-
-  private IAction containerAction = new ContainerAction();
-
-  private StackLayout stackLayout;
-
-  private Composite stacked;
-
-  public Net4jIntrospectorView()
-  {
-  }
-
-  @Override
-  public void dispose()
-  {
-    getSite().getPage().removeSelectionListener(this);
-    super.dispose();
-  }
-
-  public static Net4jIntrospectorView getInstance()
-  {
-    return instance;
-  }
-
-  public static synchronized Net4jIntrospectorView getInstance(boolean show)
-  {
-    if (instance == null)
-    {
-      try
-      {
-        IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        page.showView(VIEW_ID);
-      }
-      catch (Exception ex)
-      {
-        throw WrappedException.wrap(ex);
-      }
-    }
-
-    return instance;
-  }
-
-  @Override
-  public void createPartControl(Composite parent)
-  {
-    Color bg = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-    Color gray = parent.getDisplay().getSystemColor(SWT.COLOR_DARK_BLUE);
-
-    Composite composite = new Composite(parent, SWT.NONE);
-    composite.setLayout(UIUtil.createGridLayout(1));
-
-    Composite c = new Composite(composite, SWT.BORDER);
-    c.setLayout(UIUtil.createGridLayout(2));
-    c.setLayoutData(UIUtil.createGridData(true, false));
-
-    classLabel = new Text(c, SWT.READ_ONLY);
-    classLabel.setLayoutData(UIUtil.createGridData(false, false));
-    classLabel.setBackground(bg);
-    classLabel.setForeground(gray);
-
-    objectLabel = new Text(c, SWT.READ_ONLY);
-    objectLabel.setLayoutData(UIUtil.createGridData(true, false));
-    objectLabel.setBackground(bg);
-
-    stackLayout = new StackLayout();
-    stacked = new Composite(composite, SWT.NONE);
-    stacked.setLayoutData(UIUtil.createGridData());
-    stacked.setLayout(stackLayout);
-
-    objectViewer = createViewer(stacked);
-    createObjectColmuns();
-    objectViewer.addDoubleClickListener(this);
-    objectViewer.setContentProvider(new ObjectContentProvider());
-    objectViewer.setLabelProvider(new ObjectLabelProvider());
-    objectViewer.setSorter(new NameSorter());
-    objectViewer.setInput(getViewSite());
-
-    iterableViewer = createViewer(stacked);
-    createIterableColmuns();
-    iterableViewer.addDoubleClickListener(this);
-    iterableViewer.setContentProvider(new IterableContentProvider());
-    iterableViewer.setLabelProvider(new IterableLabelProvider());
-    iterableViewer.setInput(getViewSite());
-
-    mapViewer = createViewer(stacked);
-    createMapColmuns();
-    mapViewer.addDoubleClickListener(this);
-    mapViewer.setContentProvider(new MapContentProvider());
-    mapViewer.setLabelProvider(new MapLabelProvider());
-    mapViewer.setSorter(new NameSorter());
-    mapViewer.setInput(getViewSite());
-
-    IActionBars bars = getViewSite().getActionBars();
-    fillLocalPullDown(bars.getMenuManager());
-    fillLocalToolBar(bars.getToolBarManager());
-    getSite().getPage().addSelectionListener(this);
-    setCurrentViewer(objectViewer);
-    instance = this;
-  }
-
-  private void setCurrentViewer(TableViewer viewer)
-  {
-    currentViewer = viewer;
-    stackLayout.topControl = currentViewer.getControl();
-    stacked.layout();
-  }
-
-  private TableViewer createViewer(Composite parent)
-  {
-    TableViewer viewer = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-    viewer.getTable().setLayoutData(UIUtil.createGridData());
-    viewer.getTable().setHeaderVisible(true);
-    viewer.getTable().setLinesVisible(true);
-    return viewer;
-  }
-
-  public void refreshViewer()
-  {
-    try
-    {
-      currentViewer.getControl().getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            currentViewer.refresh();
-          }
-          catch (RuntimeException ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  public void selectionChanged(IWorkbenchPart part, ISelection sel)
-  {
-    if (part == this)
-    {
-      return;
-    }
-
-    if (sel instanceof IStructuredSelection)
-    {
-      IStructuredSelection ssel = (IStructuredSelection)sel;
-      elements.clear();
-      setObject(ssel.getFirstElement());
-    }
-    else
-    {
-      setObject(null);
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public void doubleClick(DoubleClickEvent event)
-  {
-    ISelection sel = event.getSelection();
-    if (sel instanceof IStructuredSelection)
-    {
-      IStructuredSelection ssel = (IStructuredSelection)sel;
-      Object element = ssel.getFirstElement();
-      if (currentViewer == objectViewer && element instanceof Pair)
-      {
-        Pair<Field, Object> pair = (Pair<Field, Object>)element;
-        Field field = pair.getElement1();
-        if (!field.getType().isPrimitive())
-        {
-          setObject(pair.getElement2());
-        }
-      }
-      else if (currentViewer == mapViewer && element instanceof Map.Entry)
-      {
-        Map.Entry<?, ?> entry = (Map.Entry<?, ?>)element;
-        setObject(entry.getValue());
-      }
-      else if (currentViewer == iterableViewer)
-      {
-        setObject(element);
-      }
-    }
-  }
-
-  /**
-   * Passing the focus request to the viewer's control.
-   */
-  @Override
-  public void setFocus()
-  {
-    try
-    {
-      currentViewer.getControl().setFocus();
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  public void notifyEvent(IEvent event)
-  {
-    refreshViewer();
-  }
-
-  public void setObject(Object object)
-  {
-    EventUtil.removeListener(object, this);
-    if (object != null)
-    {
-      if (!elements.isEmpty())
-      {
-        Object element = elements.peek();
-        if (element != object)
-        {
-          EventUtil.removeListener(element, this);
-          elements.push(object);
-        }
-      }
-      else
-      {
-        elements.push(object);
-      }
-    }
-
-    if (object == null)
-    {
-      classLabel.setText("");
-      objectLabel.setText("");
-      currentViewer = objectViewer;
-    }
-    else
-    {
-      EventUtil.addListener(object, this);
-      String className = object.getClass().getName();
-      classLabel.setText(className);
-
-      String value = object.toString();
-      if (value.startsWith(className + "@"))
-      {
-        objectLabel.setText(value.substring(className.length()));
-      }
-      else
-      {
-        objectLabel.setText(value);
-      }
-    }
-
-    classLabel.getParent().layout();
-    backAction.setEnabled(elements.size() >= 2);
-
-    if (object instanceof Map)
-    {
-      setCurrentViewer(mapViewer);
-    }
-    else if (object instanceof Iterable)
-    {
-      setCurrentViewer(iterableViewer);
-    }
-    else
-    {
-      setCurrentViewer(objectViewer);
-    }
-
-    refreshViewer();
-  }
-
-  private void createObjectColmuns()
-  {
-    Table table = objectViewer.getTable();
-    String[] columnNames = { "Field", "Value", "Declared Type", "Concrete Type" };
-    int[] columnWidths = { 200, 400, 300, 300 };
-    createColumns(table, columnNames, columnWidths);
-  }
-
-  private void createMapColmuns()
-  {
-    Table table = mapViewer.getTable();
-    String[] columnNames = { "Key", "Value", "Type" };
-    int[] columnWidths = { 200, 400, 300 };
-    createColumns(table, columnNames, columnWidths);
-  }
-
-  private void createIterableColmuns()
-  {
-    Table table = iterableViewer.getTable();
-    String[] columnNames = { "Element", "Type" };
-    int[] columnWidths = { 400, 300 };
-    createColumns(table, columnNames, columnWidths);
-  }
-
-  private void createColumns(Table table, String[] columnNames, int[] columnWidths)
-  {
-    TableColumn[] columns = new TableColumn[columnNames.length];
-    for (int i = 0; i < columns.length; i++)
-    {
-      TableColumn column = new TableColumn(table, SWT.LEFT, i);
-      column.setText(columnNames[i]);
-      column.setWidth(columnWidths[i]);
-      column.setMoveable(true);
-      column.setResizable(true);
-    }
-  }
-
-  private void fillLocalPullDown(IMenuManager manager)
-  {
-  }
-
-  private void fillLocalToolBar(IToolBarManager manager)
-  {
-    manager.add(backAction);
-    manager.add(containerAction);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class BackAction extends Action
-  {
-    private BackAction()
-    {
-      super("Back");
-      ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-      setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_BACK));
-      setDisabledImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_BACK_DISABLED));
-    }
-
-    @Override
-    public void run()
-    {
-      if (!elements.isEmpty())
-      {
-        elements.pop();
-        if (!elements.isEmpty())
-        {
-          setObject(elements.peek());
-        }
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class ContainerAction extends Action
-  {
-    private ContainerAction()
-    {
-      super("Container");
-      setImageDescriptor(SharedIcons.getDescriptor(SharedIcons.VIEW_CONTAINER));
-    }
-
-    @Override
-    public void run()
-    {
-      setObject(IPluginContainer.INSTANCE);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  abstract class AbstractContentProvider implements IStructuredContentProvider
-  {
-    public void inputChanged(Viewer v, Object oldInput, Object newInput)
-    {
-    }
-
-    public void dispose()
-    {
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  abstract class AbstractLabelProvider extends LabelProvider implements ITableLabelProvider
-  {
-    @Override
-    public String getText(Object element)
-    {
-      return getColumnText(element, 0);
-    }
-
-    public Image getColumnImage(Object obj, int index)
-    {
-      return null;
-    }
-
-    @Override
-    public Image getImage(Object obj)
-    {
-      return null;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class ObjectContentProvider extends AbstractContentProvider
-  {
-    public Object[] getElements(Object parent)
-    {
-      if (!elements.isEmpty())
-      {
-        try
-        {
-          return ReflectUtil.dumpToArray(elements.peek());
-        }
-        catch (RuntimeException ex)
-        {
-          OM.LOG.error(ex);
-        }
-      }
-
-      return NO_ELEMENTS;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class ObjectLabelProvider extends AbstractLabelProvider
-  {
-    @SuppressWarnings("unchecked")
-    public String getColumnText(Object obj, int index)
-    {
-      if (obj instanceof Pair)
-      {
-        try
-        {
-          Pair<Field, Object> pair = (Pair<Field, Object>)obj;
-          Field field = pair.getElement1();
-          Object value = pair.getElement2();
-          switch (index)
-          {
-          case 0:
-            return field.getName();
-          case 1:
-            return value == null ? "null" : value.toString();
-          case 2:
-            return field.getType().getName();
-          case 3:
-            return value == null ? "" : value.getClass().getName();
-          }
-        }
-        catch (RuntimeException ex)
-        {
-          OM.LOG.error(ex);
-        }
-      }
-
-      return "";
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class IterableContentProvider extends AbstractContentProvider
-  {
-    public Object[] getElements(Object parent)
-    {
-      if (!elements.isEmpty())
-      {
-        Object element = elements.peek();
-        if (element instanceof Iterable)
-        {
-          List<Object> result = new ArrayList<Object>();
-          for (Object object : (Iterable<?>)element)
-          {
-            result.add(object);
-          }
-
-          return result.toArray();
-        }
-      }
-
-      return NO_ELEMENTS;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class IterableLabelProvider extends AbstractLabelProvider
-  {
-    public String getColumnText(Object obj, int index)
-    {
-      switch (index)
-      {
-      case 0:
-        return obj == null ? "null" : obj.toString();
-      case 1:
-        return obj == null ? "" : obj.getClass().getName();
-      }
-
-      return "";
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class MapContentProvider extends AbstractContentProvider
-  {
-    public Object[] getElements(Object parent)
-    {
-      if (!elements.isEmpty())
-      {
-        Object element = elements.peek();
-        if (element instanceof Map)
-        {
-          return ((Map<?, ?>)element).entrySet().toArray();
-        }
-      }
-
-      return NO_ELEMENTS;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class MapLabelProvider extends AbstractLabelProvider
-  {
-    public String getColumnText(Object obj, int index)
-    {
-      if (obj instanceof Map.Entry)
-      {
-        Map.Entry<?, ?> entry = (Map.Entry<?, ?>)obj;
-        Object key = entry.getKey();
-        Object value = entry.getValue();
-        switch (index)
-        {
-        case 0:
-          return key == null ? "null" : key.toString();
-        case 1:
-          return value == null ? "null" : value.toString();
-        case 2:
-          return value == null ? "" : value.getClass().getName();
-        }
-      }
-
-      return "";
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class NameSorter extends ViewerSorter
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ComboAutoCompleter.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ComboAutoCompleter.java
deleted file mode 100644
index 7fbe7c772c..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ComboAutoCompleter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui;
-
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-
-/**
- * @author Eike Stepper
- */
-public class ComboAutoCompleter implements ModifyListener
-{
-  private ComboViewer viewer;
-
-  public ComboAutoCompleter(ComboViewer viewer)
-  {
-    this.viewer = viewer;
-  }
-
-  public final ComboViewer getViewer()
-  {
-    return viewer;
-  }
-
-  public final void modifyText(ModifyEvent e)
-  {
-    String text = getText();
-    Object foundElement = findShortestLabel(text);
-    if (foundElement != null)
-    {
-      setSelection(new StructuredSelection(foundElement));
-    }
-    else
-    {
-      // setSelection(StructuredSelection.EMPTY);
-    }
-  }
-
-  protected void setSelection(StructuredSelection selection)
-  {
-    viewer.setSelection(selection);
-  }
-
-  private Object findShortestLabel(String prefix)
-  {
-    Object foundElement = null;
-    String shortestLabel = null;
-    ILabelProvider labelProvider = (ILabelProvider)viewer.getLabelProvider();
-    IStructuredContentProvider contentProvider = (IStructuredContentProvider)viewer.getContentProvider();
-    for (Object element : contentProvider.getElements(viewer.getInput()))
-    {
-      String label = labelProvider.getText(element);
-      if (label.startsWith(prefix))
-      {
-        if (shortestLabel == null || label.length() < shortestLabel.length())
-        {
-          shortestLabel = label;
-          foundElement = element;
-        }
-      }
-    }
-
-    return foundElement;
-  }
-
-  private String getText()
-  {
-    return viewer.getCombo().getText();
-  }
-
-  public static void attach(ComboViewer viewer, ComboAutoCompleter completer)
-  {
-    viewer.getCombo().addModifyListener(completer);
-  }
-
-  public static void attach(ComboViewer viewer)
-  {
-    viewer.getCombo().addModifyListener(new ComboAutoCompleter(viewer));
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java
deleted file mode 100644
index ef6bd41540..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * @author Eike Stepper
- */
-public class DelegatingContentProvider implements IStructuredContentProvider
-{
-  public static final String NONE = "";
-
-  private IStructuredContentProvider delegate;
-
-  private boolean optional;
-
-  public DelegatingContentProvider(IStructuredContentProvider delegate, boolean optional)
-  {
-    this.delegate = delegate;
-    this.optional = optional;
-  }
-
-  public DelegatingContentProvider(IStructuredContentProvider delegate)
-  {
-    this(delegate, false);
-  }
-
-  public IStructuredContentProvider getDelegate()
-  {
-    return delegate;
-  }
-
-  public boolean isOptional()
-  {
-    return optional;
-  }
-
-  public void dispose()
-  {
-    delegate.dispose();
-  }
-
-  public Object[] getElements(Object inputElement)
-  {
-    Object[] elements = delegate.getElements(inputElement);
-    if (optional)
-    {
-      Object[] newElements = new Object[elements.length + 1];
-      newElements[0] = NONE;
-      System.arraycopy(elements, 0, newElements, 1, elements.length);
-      elements = newElements;
-    }
-
-    return elements;
-  }
-
-  public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-  {
-    delegate.inputChanged(viewer, oldInput, newInput);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
deleted file mode 100644
index 6481a9bd10..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui;
-
-import java.util.Collection;
-
-/**
- * @author Eike Stepper
- */
-public class StaticContentProvider extends StructuredContentProvider<Object>
-{
-  private Object[] elements;
-
-  public StaticContentProvider(Object[] elements)
-  {
-    this.elements = elements;
-  }
-
-  public StaticContentProvider(Collection<?> elements)
-  {
-    this(elements.toArray());
-  }
-
-  public StaticContentProvider(Class<Object> enumClass)
-  {
-    this(createElements(enumClass));
-  }
-
-  public Object[] getElements(Object inputElement)
-  {
-    return elements;
-  }
-
-  private static Object[] createElements(Class<Object> enumClass)
-  {
-    Object[] enumConstants = enumClass.getEnumConstants();
-    if (enumConstants == null)
-    {
-      throw new IllegalArgumentException("Illegal enum: " + enumClass);
-    }
-
-    return enumConstants;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
deleted file mode 100644
index b878039959..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui;
-
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Eike Stepper
- */
-public abstract class StructuredContentProvider<INPUT> implements IStructuredContentProvider, IListener
-{
-  private StructuredViewer viewer;
-
-  private INPUT input;
-
-  public StructuredContentProvider()
-  {
-  }
-
-  public void dispose()
-  {
-    if (input != null)
-    {
-      disconnectInput(input);
-      input = null;
-    }
-  }
-
-  public INPUT getInput()
-  {
-    return input;
-  }
-
-  public StructuredViewer getViewer()
-  {
-    return viewer;
-  }
-
-  @SuppressWarnings("unchecked")
-  public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-  {
-    this.viewer = (StructuredViewer)viewer;
-    if (newInput != input)
-    {
-      if (input != null)
-      {
-        disconnectInput(input);
-      }
-      try
-      {
-        input = (INPUT)newInput;
-        connectInput(input);
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-        input = null;
-      }
-    }
-  }
-
-  protected void connectInput(INPUT input)
-  {
-  }
-
-  protected void disconnectInput(INPUT input)
-  {
-  }
-
-  public void notifyEvent(IEvent event)
-  {
-    refreshViewer(true);
-  }
-
-  protected void refreshViewer(boolean updateLabels)
-  {
-    refreshElement(null, updateLabels);
-  }
-
-  protected void refreshElement(final Object element, final boolean updateLabels)
-  {
-    try
-    {
-      getDisplay().syncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            if (element != null && element != input)
-            {
-              viewer.refresh(element, updateLabels);
-            }
-            else
-            {
-              viewer.refresh(updateLabels);
-            }
-          }
-          catch (RuntimeException ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  protected void updateLabels(final Object element)
-  {
-    try
-    {
-      getDisplay().syncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            viewer.update(element, null);
-          }
-          catch (RuntimeException ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  protected void revealElement(final Object element)
-  {
-    try
-    {
-      getDisplay().syncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            viewer.reveal(element);
-          }
-          catch (RuntimeException ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  protected Display getDisplay()
-  {
-    Display display = viewer.getControl().getDisplay();
-    if (display == null)
-    {
-      display = UIUtil.getDisplay();
-    }
-
-    return display;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java
deleted file mode 100644
index 3a1e76da0f..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui;
-
-import org.eclipse.net4j.internal.util.om.OSGiBundle;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OSGiActivator;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Eike Stepper
- */
-public class UIActivator extends AbstractUIPlugin
-{
-  private OMBundle omBundle;
-
-  public UIActivator(OMBundle omBundle)
-  {
-    this.omBundle = omBundle;
-  }
-
-  public final OMBundle getOMBundle()
-  {
-    return omBundle;
-  }
-
-  @Override
-  public void start(BundleContext context) throws Exception
-  {
-    OSGiActivator.startBundle(context, (OSGiBundle)getOMBundle());
-    super.start(context);
-  }
-
-  @Override
-  public void stop(BundleContext context) throws Exception
-  {
-    super.stop(context);
-    OSGiActivator.stopBundle(context, (OSGiBundle)getOMBundle());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
deleted file mode 100644
index 055dfced0b..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui;
-
-import org.eclipse.net4j.util.internal.ui.security.InteractiveCredentialsProvider;
-import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
-
-import org.eclipse.jface.fieldassist.FieldDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Eike Stepper
- */
-public final class UIUtil
-{
-  private UIUtil()
-  {
-  }
-
-  public static void dispose(Font font)
-  {
-    if (font != null)
-    {
-      font.dispose();
-    }
-  }
-
-  public static void dispose(Color color)
-  {
-    if (color != null)
-    {
-      color.dispose();
-    }
-  }
-
-  public static void dispose(Widget widget)
-  {
-    if (widget != null)
-    {
-      widget.dispose();
-    }
-  }
-
-  public static Font getBoldFont(Control control)
-  {
-    FontData[] datas = control.getFont().getFontData().clone();
-    datas[0].setStyle(SWT.BOLD);
-    Display display = control.getShell().getDisplay();
-    Font font = new Font(display, datas);
-    return font;
-  }
-
-  public static Display getDisplay()
-  {
-    Display display = Display.getCurrent();
-    if (display == null)
-    {
-      try
-      {
-        display = PlatformUI.getWorkbench().getDisplay();
-      }
-      catch (RuntimeException ignore)
-      {
-      }
-    }
-
-    if (display == null)
-    {
-      display = Display.getDefault();
-    }
-
-    if (display == null)
-    {
-      display = new Display();
-    }
-
-    if (display == null)
-    {
-      throw new IllegalStateException("No display available");
-    }
-
-    return display;
-  }
-
-  public static IPasswordCredentialsProvider createInteractiveCredentialsProvider()
-  {
-    return new InteractiveCredentialsProvider();
-  }
-
-  public static Composite createGridComposite(Composite parent, int columns)
-  {
-    Composite composite = new Composite(parent, SWT.NONE);
-    composite.setLayout(createGridLayout(columns));
-    return composite;
-  }
-
-  public static GridLayout createGridLayout(int columns)
-  {
-    GridLayout layout = new GridLayout();
-    layout.numColumns = columns;
-    layout.marginHeight = 0;
-    layout.marginWidth = 0;
-    layout.verticalSpacing = 0;
-    layout.horizontalSpacing = 0;
-    return layout;
-  }
-
-  public static GridData createGridData()
-  {
-    return new GridData(SWT.FILL, SWT.FILL, true, true);
-  }
-
-  public static GridData createGridData(boolean grabHorizontal, boolean grabVertical)
-  {
-    return new GridData(SWT.FILL, SWT.FILL, grabHorizontal, grabVertical);
-  }
-
-  public static void addDecorationMargin(Control control)
-  {
-    Object data = control.getLayoutData();
-    if (data instanceof GridData)
-    {
-      GridData gd = (GridData)data;
-      FieldDecorationRegistry registry = FieldDecorationRegistry.getDefault();
-      FieldDecoration dec = registry.getFieldDecoration(FieldDecorationRegistry.DEC_CONTENT_PROPOSAL);
-      gd.horizontalIndent = dec.getImage().getBounds().width;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningAction.java
deleted file mode 100644
index d213e310d1..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningAction.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.actions;
-
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-import org.eclipse.net4j.util.om.monitor.MonitorUtil;
-import org.eclipse.net4j.util.om.monitor.MonitoredJob;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Eike Stepper
- */
-public abstract class LongRunningAction extends SafeAction
-{
-  private IWorkbenchPage page;
-
-  private int totalWork;
-
-  public LongRunningAction(IWorkbenchPage page)
-  {
-    this.page = page;
-  }
-
-  public LongRunningAction(IWorkbenchPage page, String text, String toolTipText, ImageDescriptor image)
-  {
-    super(text, toolTipText, image);
-    this.page = page;
-  }
-
-  public LongRunningAction(IWorkbenchPage page, String text, ImageDescriptor image)
-  {
-    super(text, image);
-    this.page = page;
-  }
-
-  public LongRunningAction(IWorkbenchPage page, String text, String toolTipText)
-  {
-    super(text, toolTipText);
-    this.page = page;
-  }
-
-  public LongRunningAction(IWorkbenchPage page, String text, int style)
-  {
-    super(text, style);
-    this.page = page;
-  }
-
-  public LongRunningAction(IWorkbenchPage page, String text)
-  {
-    super(text);
-    this.page = page;
-  }
-
-  public LongRunningAction()
-  {
-  }
-
-  public LongRunningAction(String text, ImageDescriptor image)
-  {
-    super(text, image);
-  }
-
-  public LongRunningAction(String text, int style)
-  {
-    super(text, style);
-  }
-
-  public LongRunningAction(String text, String toolTipText, ImageDescriptor image)
-  {
-    super(text, toolTipText, image);
-  }
-
-  public LongRunningAction(String text, String toolTipText)
-  {
-    super(text, toolTipText);
-  }
-
-  public LongRunningAction(String text)
-  {
-    super(text);
-  }
-
-  public void setPage(IWorkbenchPage page)
-  {
-    this.page = page;
-  }
-
-  public IWorkbenchPage getPage()
-  {
-    if (page != null)
-    {
-      return page;
-    }
-
-    IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    if (window != null)
-    {
-      return window.getActivePage();
-    }
-
-    return null;
-  }
-
-  public IWorkbenchWindow getWorkbenchWindow()
-  {
-    if (page != null)
-    {
-      return page.getWorkbenchWindow();
-    }
-
-    return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-  }
-
-  public Shell getShell()
-  {
-    return getWorkbenchWindow().getShell();
-  }
-
-  protected final int getTotalWork()
-  {
-    return totalWork;
-  }
-
-  protected final void setTotalWork(int totalWork)
-  {
-    this.totalWork = totalWork;
-  }
-
-  protected final void cancel()
-  {
-    totalWork = 0;
-  }
-
-  @Override
-  protected final void safeRun() throws Exception
-  {
-    totalWork = IProgressMonitor.UNKNOWN;
-    preRun();
-    if (totalWork != 0)
-    {
-      new MonitoredJob(getBundleID(), getText())
-      {
-        @Override
-        protected void run() throws Exception
-        {
-          try
-          {
-            MonitorUtil.begin(totalWork);
-            doRun();
-          }
-          catch (Exception ex)
-          {
-            OM.LOG.error(ex);
-            throw ex;
-          }
-        }
-      }.schedule();
-    }
-  }
-
-  protected void preRun() throws Exception
-  {
-  }
-
-  protected String getBundleID()
-  {
-    return OM.BUNDLE_ID;
-  }
-
-  protected abstract void doRun() throws Exception;
-
-  protected final void checkCancelation(IProgressMonitor monitor)
-  {
-    if (monitor.isCanceled())
-    {
-      throw new OperationCanceledException();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningActionDelegate.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningActionDelegate.java
deleted file mode 100644
index c90808d42b..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningActionDelegate.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.actions;
-
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-import org.eclipse.net4j.util.om.monitor.MonitorUtil;
-import org.eclipse.net4j.util.om.monitor.MonitoredJob;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class LongRunningActionDelegate extends SafeActionDelegate
-{
-  private int totalWork;
-
-  public LongRunningActionDelegate()
-  {
-  }
-
-  protected final int getTotalWork()
-  {
-    return totalWork;
-  }
-
-  protected final void setTotalWork(int totalWork)
-  {
-    this.totalWork = totalWork;
-  }
-
-  protected final void cancel()
-  {
-    totalWork = 0;
-  }
-
-  @Override
-  protected final void safeRun() throws Exception
-  {
-    totalWork = IProgressMonitor.UNKNOWN;
-    preRun();
-    if (totalWork != 0)
-    {
-      new MonitoredJob(getBundleID(), getText())
-      {
-        @Override
-        protected void run() throws Exception
-        {
-          try
-          {
-            MonitorUtil.begin(totalWork);
-            doRun();
-          }
-          catch (Exception ex)
-          {
-            OM.LOG.error(ex);
-            throw ex;
-          }
-        }
-      }.schedule();
-    }
-  }
-
-  protected void preRun() throws Exception
-  {
-  }
-
-  protected String getBundleID()
-  {
-    return OM.BUNDLE_ID;
-  }
-
-  protected abstract void doRun() throws Exception;
-
-  protected final void checkCancelation(IProgressMonitor monitor)
-  {
-    if (monitor.isCanceled())
-    {
-      throw new OperationCanceledException();
-    }
-  }
-
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java
deleted file mode 100644
index 63f4f1b653..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.actions;
-
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * @author Eike Stepper
- */
-public abstract class SafeAction extends Action
-{
-  public static final String INTERACTIVE = "...";
-
-  public SafeAction()
-  {
-  }
-
-  public SafeAction(String text, String toolTipText, ImageDescriptor image)
-  {
-    super(text, image);
-    setToolTipText(toolTipText);
-  }
-
-  public SafeAction(String text, String toolTipText)
-  {
-    super(text, null);
-    setToolTipText(toolTipText);
-  }
-
-  public SafeAction(String text, ImageDescriptor image)
-  {
-    super(text, image);
-  }
-
-  public SafeAction(String text, int style)
-  {
-    super(text, style);
-  }
-
-  public SafeAction(String text)
-  {
-    super(text);
-  }
-
-  @Override
-  public final void run()
-  {
-    try
-    {
-      safeRun();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      MessageDialog.openError(null, getText(), ex.getMessage() + "\nSee the Error log for details.");
-    }
-  }
-
-  protected abstract void safeRun() throws Exception;
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java
deleted file mode 100644
index 4b807d7e0d..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.actions;
-
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IActionDelegate;
-
-/**
- * @author Eike Stepper
- */
-public abstract class SafeActionDelegate implements IActionDelegate
-{
-  private IAction action;
-
-  private ISelection selection;
-
-  public SafeActionDelegate()
-  {
-  }
-
-  public IAction getAction()
-  {
-    return action;
-  }
-
-  public ISelection getSelection()
-  {
-    return selection;
-  }
-
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-    this.action = action;
-    this.selection = selection;
-  }
-
-  public void run(IAction action)
-  {
-    this.action = action;
-
-    try
-    {
-      safeRun();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      MessageDialog.openError(null, getText(), ex.getMessage() + "\nSee the Error log for details.");
-    }
-  }
-
-  protected abstract void safeRun() throws Exception;
-
-  protected String getText()
-  {
-    return action == null ? "Error" : action.getText();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java
deleted file mode 100644
index 8c7dc09409..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.actions;
-
-import org.eclipse.net4j.util.ui.widgets.SashComposite;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.MenuManager;
-
-/**
- * @author Eike Stepper
- */
-public abstract class SashLayoutAction extends SafeAction
-{
-  private SashComposite sashComposite;
-
-  public SashLayoutAction(SashComposite sashComposite, String text)
-  {
-    super(text, IAction.AS_RADIO_BUTTON);
-    this.sashComposite = sashComposite;
-  }
-
-  public SashComposite getSashComposite()
-  {
-    return sashComposite;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class Vertical extends SashLayoutAction
-  {
-    public Vertical(SashComposite sashComposite)
-    {
-      super(sashComposite, "Vertical");
-    }
-
-    @Override
-    protected void safeRun() throws Exception
-    {
-      getSashComposite().setVertical(true);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class Horizontal extends SashLayoutAction
-  {
-    public Horizontal(SashComposite sashComposite)
-    {
-      super(sashComposite, "Horizontal");
-    }
-
-    @Override
-    protected void safeRun() throws Exception
-    {
-      getSashComposite().setVertical(false);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class LayoutMenu extends MenuManager
-  {
-    private SafeAction verticalAction;
-
-    private SafeAction horizontalAction;
-
-    public LayoutMenu(SashComposite sashComposite)
-    {
-      this(sashComposite, true);
-    }
-
-    public LayoutMenu(SashComposite sashComposite, boolean defaultVertical)
-    {
-      super("Layout");
-      verticalAction = new SashLayoutAction.Vertical(sashComposite);
-      verticalAction.setChecked(defaultVertical);
-      add(verticalAction);
-
-      horizontalAction = new SashLayoutAction.Horizontal(sashComposite);
-      horizontalAction.setChecked(!defaultVertical);
-      add(horizontalAction);
-    }
-
-    public SafeAction getVerticalAction()
-    {
-      return verticalAction;
-    }
-
-    public SafeAction getHorizontalAction()
-    {
-      return horizontalAction;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDragListener.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDragListener.java
deleted file mode 100644
index 76e32d17c1..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDragListener.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.dnd;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.swt.dnd.DragSourceAdapter;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.Transfer;
-
-/**
- * @author Eike Stepper
- */
-public abstract class DNDDragListener<TYPE> extends DragSourceAdapter
-{
-  private Transfer transfer;
-
-  private StructuredViewer viewer;
-
-  public DNDDragListener(Transfer transfer, StructuredViewer viewer)
-  {
-    this.transfer = transfer;
-    this.viewer = viewer;
-  }
-
-  public Transfer getTransfer()
-  {
-    return transfer;
-  }
-
-  public StructuredViewer getViewer()
-  {
-    return viewer;
-  }
-
-  @Override
-  public void dragSetData(DragSourceEvent event)
-  {
-    if (transfer.isSupportedType(event.dataType))
-    {
-      IStructuredSelection selection = (IStructuredSelection)viewer.getSelection();
-      event.data = getObject(selection);
-    }
-  }
-
-  @Override
-  public void dragStart(DragSourceEvent event)
-  {
-    IStructuredSelection selection = (IStructuredSelection)viewer.getSelection();
-    event.doit = !viewer.getSelection().isEmpty() && getObject(selection) != null;
-  }
-
-  protected abstract TYPE getObject(IStructuredSelection selection);
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDropAdapter.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDropAdapter.java
deleted file mode 100644
index 62bd828256..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDropAdapter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.dnd;
-
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.ViewerDropAdapter;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-
-/**
- * @author Eike Stepper
- */
-public abstract class DNDDropAdapter<TYPE> extends ViewerDropAdapter
-{
-  private Transfer transfer;
-
-  private boolean dropBetweenEnabled;
-
-  protected DNDDropAdapter(Transfer transfer, StructuredViewer viewer)
-  {
-    super(viewer);
-    this.transfer = transfer;
-  }
-
-  public Transfer getTransfer()
-  {
-    return transfer;
-  }
-
-  @Override
-  public StructuredViewer getViewer()
-  {
-    return (StructuredViewer)super.getViewer();
-  }
-
-  public boolean isDropBetweenEnabled()
-  {
-    return dropBetweenEnabled;
-  }
-
-  public void setDropBetweenEnabled(boolean dropBetweenEnabled)
-  {
-    this.dropBetweenEnabled = dropBetweenEnabled;
-  }
-
-  @Override
-  protected int determineLocation(DropTargetEvent event)
-  {
-    int location = super.determineLocation(event);
-    if (location == LOCATION_BEFORE || location == LOCATION_AFTER)
-    {
-      if (!dropBetweenEnabled)
-      {
-        location = LOCATION_ON;
-      }
-    }
-
-    return location;
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public boolean performDrop(Object data)
-  {
-    Object target = getCurrentTarget();
-    if (target == null)
-    {
-      target = getViewer().getInput();
-    }
-
-    return performDrop((TYPE)data, target);
-  }
-
-  @Override
-  public boolean validateDrop(Object target, int operation, TransferData type)
-  {
-    return transfer.isSupportedType(type) && validateTarget(target, operation);
-  }
-
-  protected abstract boolean performDrop(TYPE data, Object target);
-
-  protected abstract boolean validateTarget(Object target, int operation);
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java
deleted file mode 100644
index fa2aae1976..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.dnd;
-
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import org.eclipse.swt.dnd.ByteArrayTransfer;
-import org.eclipse.swt.dnd.TransferData;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class DNDTransfer<TYPE> extends ByteArrayTransfer
-{
-  private String typeName;
-
-  private int typeID;
-
-  protected DNDTransfer(String typeName)
-  {
-    this.typeName = typeName;
-    typeID = registerType(typeName);
-  }
-
-  @Override
-  protected int[] getTypeIds()
-  {
-    return new int[] { typeID };
-  }
-
-  @Override
-  protected String[] getTypeNames()
-  {
-    return new String[] { typeName };
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  protected void javaToNative(Object object, TransferData transferData)
-  {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ExtendedDataOutputStream out = new ExtendedDataOutputStream(baos);
-    byte[] bytes = null;
-
-    try
-    {
-      writeObject(out, ((TYPE)object));
-      out.close();
-      bytes = baos.toByteArray();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-    }
-
-    if (bytes != null)
-    {
-      super.javaToNative(bytes, transferData);
-    }
-  }
-
-  @Override
-  protected Object nativeToJava(TransferData transferData)
-  {
-    byte[] bytes = (byte[])super.nativeToJava(transferData);
-    ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-    ExtendedDataInputStream in = new ExtendedDataInputStream(bais);
-
-    try
-    {
-      return readObject(in);
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      return null;
-    }
-  }
-
-  protected abstract void writeObject(ExtendedDataOutputStream out, TYPE object) throws IOException;
-
-  protected abstract TYPE readObject(ExtendedDataInputStream in) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java
deleted file mode 100644
index 6f1bb97ebf..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.eclipse.net4j.util.ui.prefs;
-
-import org.eclipse.net4j.util.om.pref.OMPreferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DateTime;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * @author Eike Stepper
- */
-public abstract class OMPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-  private IWorkbench workbench;
-
-  private OMPreferenceStore preferenceStore;
-
-  private SelectionListener selectionListener = new SelectionListener()
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      dialogChanged();
-    }
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      dialogChanged();
-    }
-  };
-
-  private ModifyListener modifyListener = new ModifyListener()
-  {
-    public void modifyText(ModifyEvent e)
-    {
-      dialogChanged();
-    }
-  };
-
-  public OMPreferencePage(OMPreferences preferences)
-  {
-    preferenceStore = new OMPreferenceStore(preferences);
-  }
-
-  public OMPreferences getPreferences()
-  {
-    return preferenceStore.getPreferences();
-  }
-
-  public IWorkbench getWorkbench()
-  {
-    return workbench;
-  }
-
-  public void init(IWorkbench workbench)
-  {
-    this.workbench = workbench;
-  }
-
-  @Override
-  protected IPreferenceStore doGetPreferenceStore()
-  {
-    return preferenceStore;
-  }
-
-  protected final SelectionListener getSelectionListener()
-  {
-    return selectionListener;
-  }
-
-  protected final ModifyListener getModifyListener()
-  {
-    return modifyListener;
-  }
-
-  protected void dialogChanged()
-  {
-  }
-
-  @Override
-  protected final Control createContents(Composite parent)
-  {
-    Control control = createUI(parent);
-    addListeners(control);
-    return control;
-  }
-
-  protected void addListeners(Control control)
-  {
-    if (control instanceof Text)
-    {
-      Text c = (Text)control;
-      c.addModifyListener(modifyListener);
-    }
-
-    if (control instanceof Combo)
-    {
-      Combo c = (Combo)control;
-      c.addModifyListener(modifyListener);
-      c.addSelectionListener(selectionListener);
-    }
-
-    if (control instanceof CCombo)
-    {
-      CCombo c = (CCombo)control;
-      c.addModifyListener(modifyListener);
-      c.addSelectionListener(selectionListener);
-    }
-
-    if (control instanceof List)
-    {
-      List c = (List)control;
-      c.addSelectionListener(selectionListener);
-    }
-
-    if (control instanceof DateTime)
-    {
-      DateTime c = (DateTime)control;
-      c.addSelectionListener(selectionListener);
-    }
-
-    if (control instanceof Table)
-    {
-      Table c = (Table)control;
-      c.addSelectionListener(selectionListener);
-    }
-
-    if (control instanceof Tree)
-    {
-      Table c = (Table)control;
-      c.addSelectionListener(selectionListener);
-    }
-
-    if (control instanceof Button)
-    {
-      Button c = (Button)control;
-      c.addSelectionListener(selectionListener);
-    }
-
-    if (control instanceof Composite)
-    {
-      Composite c = (Composite)control;
-      for (Control child : c.getChildren())
-      {
-        addListeners(child);
-      }
-    }
-  }
-
-  protected abstract Control createUI(Composite parent);
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
deleted file mode 100644
index 7024bb23f0..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.prefs;
-
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-import org.eclipse.net4j.util.om.pref.OMPreferences;
-import org.eclipse.net4j.util.om.pref.OMPreferencesChangeEvent;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class OMPreferenceStore implements IPreferenceStore
-{
-  private OMPreferences preferences;
-
-  private List<IPropertyChangeListener> listeners = new ArrayList<IPropertyChangeListener>(0);
-
-  private IListener preferencesListener = new IListener()
-  {
-    public void notifyEvent(IEvent event)
-    {
-      if (event instanceof OMPreferencesChangeEvent)
-      {
-        OMPreferencesChangeEvent<?> e = (OMPreferencesChangeEvent<?>)event;
-        firePropertyChangeEvent(e.getPreference().getName(), e.getOldValue(), e.getNewValue());
-      }
-    }
-  };
-
-  public OMPreferenceStore(OMPreferences preferences)
-  {
-    this.preferences = preferences;
-    preferences.addListener(preferencesListener);
-  }
-
-  public void dispose()
-  {
-    preferences.removeListener(preferencesListener);
-  }
-
-  public OMPreferences getPreferences()
-  {
-    return preferences;
-  }
-
-  public void addPropertyChangeListener(IPropertyChangeListener listener)
-  {
-    synchronized (listeners)
-    {
-      if (!listeners.contains(listener))
-      {
-        listeners.add(listener);
-      }
-    }
-  }
-
-  public void removePropertyChangeListener(IPropertyChangeListener listener)
-  {
-    synchronized (listeners)
-    {
-      listeners.remove(listener);
-    }
-  }
-
-  public void firePropertyChangeEvent(String name, Object oldValue, Object newValue)
-  {
-    PropertyChangeEvent event = new PropertyChangeEvent(this, name, oldValue, newValue);
-    for (IPropertyChangeListener listener : getPropertyChangeListenerListeners())
-    {
-      try
-      {
-        listener.propertyChange(event);
-      }
-      catch (RuntimeException ex)
-      {
-        OM.LOG.error(ex);
-      }
-    }
-  }
-
-  public boolean contains(String name)
-  {
-    return preferences.contains(name);
-  }
-
-  public boolean isDefault(String name)
-  {
-    return !getPreference(name).isSet();
-  }
-
-  public boolean needsSaving()
-  {
-    return preferences.isDirty();
-  }
-
-  public boolean getDefaultBoolean(String name)
-  {
-    return (Boolean)getPreference(name).getDefaultValue();
-  }
-
-  public double getDefaultDouble(String name)
-  {
-    return (Double)getPreference(name).getDefaultValue();
-  }
-
-  public float getDefaultFloat(String name)
-  {
-    return (Float)getPreference(name).getDefaultValue();
-  }
-
-  public int getDefaultInt(String name)
-  {
-    return (Integer)getPreference(name).getDefaultValue();
-  }
-
-  public long getDefaultLong(String name)
-  {
-    return (Long)getPreference(name).getDefaultValue();
-  }
-
-  public String getDefaultString(String name)
-  {
-    return (String)getPreference(name).getDefaultValue();
-  }
-
-  public void setDefault(String name, boolean value)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void setDefault(String name, double value)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void setDefault(String name, float value)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void setDefault(String name, int value)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void setDefault(String name, long value)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void setDefault(String name, String defaultObject)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void setToDefault(String name)
-  {
-    getPreference(name).unSet();
-  }
-
-  public boolean getBoolean(String name)
-  {
-    return (Boolean)getPreference(name).getValue();
-  }
-
-  public double getDouble(String name)
-  {
-    return (Double)getPreference(name).getValue();
-  }
-
-  public float getFloat(String name)
-  {
-    return (Float)getPreference(name).getValue();
-  }
-
-  public int getInt(String name)
-  {
-    return (Integer)getPreference(name).getValue();
-  }
-
-  public long getLong(String name)
-  {
-    return (Long)getPreference(name).getValue();
-  }
-
-  public String getString(String name)
-  {
-    return (String)getPreference(name).getValue();
-  }
-
-  public void putValue(String name, String value)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @SuppressWarnings("unchecked")
-  public void setValue(String name, boolean value)
-  {
-    OMPreference<Boolean> pref = (OMPreference<Boolean>)getPreference(name);
-    pref.setValue(value);
-  }
-
-  @SuppressWarnings("unchecked")
-  public void setValue(String name, double value)
-  {
-    OMPreference<Double> pref = (OMPreference<Double>)getPreference(name);
-    pref.setValue(value);
-  }
-
-  @SuppressWarnings("unchecked")
-  public void setValue(String name, float value)
-  {
-    OMPreference<Float> pref = (OMPreference<Float>)getPreference(name);
-    pref.setValue(value);
-  }
-
-  @SuppressWarnings("unchecked")
-  public void setValue(String name, int value)
-  {
-    OMPreference<Integer> pref = (OMPreference<Integer>)getPreference(name);
-    pref.setValue(value);
-  }
-
-  @SuppressWarnings("unchecked")
-  public void setValue(String name, long value)
-  {
-    OMPreference<Long> pref = (OMPreference<Long>)getPreference(name);
-    pref.setValue(value);
-  }
-
-  @SuppressWarnings("unchecked")
-  public void setValue(String name, String value)
-  {
-    OMPreference<String> pref = (OMPreference<String>)getPreference(name);
-    pref.setValue(value);
-  }
-
-  private IPropertyChangeListener[] getPropertyChangeListenerListeners()
-  {
-    synchronized (listeners)
-    {
-      return listeners.toArray(new IPropertyChangeListener[listeners.size()]);
-    }
-  }
-
-  private OMPreference<?> getPreference(String name)
-  {
-    OMPreference<?> pref = preferences.get(name);
-    if (pref == null)
-    {
-      throw new IllegalStateException("No preference for " + name);
-    }
-
-    return pref;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/README.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/README.java
deleted file mode 100644
index dc8631f1df..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/README.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.proposals;
-
-/**
- * The classes in this package are copied from org.eclipse.ui.texteditor because the class
- * org.eclipse.ui.texteditor.RegExContentProposalProvider is not public.
- * <p>
- * TODO We should ask platform guys to open this API.
- * 
- * @author Eike Stepper
- */
-class README
-{
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java
deleted file mode 100644
index b8d76d485a..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.net4j.util.ui.proposals;
-
-import org.eclipse.jface.fieldassist.IContentProposal;
-import org.eclipse.jface.fieldassist.IContentProposalProvider;
-
-import java.util.ArrayList;
-
-/**
- * Content assist proposal provider for regular expressions.
- * <p>
- * Note: Replaces <code>RegExContentAssistProcessor</code> which was introduced in 3.0.
- * </p>
- * Copied from org.eclipse.ui.texteditor.RegExContentProposalProvider.
- * <p>
- * Needed by org.eclipse.mylyn.internal.team.ui.preferences.workaround.MylynTeamPreferencePage.
- * <p>
- * TODO Ask platform guys to open this API
- * 
- * @since 3.2
- */
-public class RegExContentProposalProvider implements IContentProposalProvider
-{
-  /**
-   * Proposal computer.
-   */
-  private static class ProposalComputer
-  {
-    private static class Proposal implements IContentProposal
-    {
-      private String fContent;
-
-      private String fLabel;
-
-      private String fDescription;
-
-      private int fCursorPosition;
-
-      Proposal(String content, String label, String description, int cursorPosition)
-      {
-        fContent = content;
-        fLabel = label;
-        fDescription = description;
-        fCursorPosition = cursorPosition;
-      }
-
-      public String getContent()
-      {
-        return fContent;
-      }
-
-      public String getLabel()
-      {
-        return fLabel;
-      }
-
-      public String getDescription()
-      {
-        return fDescription;
-      }
-
-      public int getCursorPosition()
-      {
-        return fCursorPosition;
-      }
-    }
-
-    /**
-     * The whole regular expression.
-     */
-    private final String fExpression;
-
-    /**
-     * The document offset.
-     */
-    private final int fDocumentOffset;
-
-    /**
-     * The high-priority proposals.
-     */
-    private final ArrayList<Proposal> fPriorityProposals;
-
-    /**
-     * The low-priority proposals.
-     */
-    private final ArrayList<Proposal> fProposals;
-
-    /**
-     * <code>true</code> iff <code>fExpression</code> ends with an open escape.
-     */
-    private final boolean fIsEscape;
-
-    /**
-     * Creates a new Proposal Computer.
-     * 
-     * @param contents
-     *          the contents of the subject control
-     * @param position
-     *          the cursor position
-     */
-    public ProposalComputer(String contents, int position)
-    {
-      fExpression = contents;
-      fDocumentOffset = position;
-      fPriorityProposals = new ArrayList<Proposal>();
-      fProposals = new ArrayList<Proposal>();
-
-      boolean isEscape = false;
-      esc: for (int i = position - 1; i >= 0; i--)
-      {
-        if (fExpression.charAt(i) == '\\')
-          isEscape = !isEscape;
-        else
-          break esc;
-      }
-
-      fIsEscape = isEscape;
-    }
-
-    /**
-     * Computes applicable proposals for the find field.
-     * 
-     * @return the proposals
-     */
-    public IContentProposal[] computeFindProposals()
-    {
-      // characters
-      addBsProposal("\\\\", RegExMessages.displayString_bs_bs, RegExMessages.additionalInfo_bs_bs); //$NON-NLS-1$
-      addBracketProposal("\\0", 2, RegExMessages.displayString_bs_0, RegExMessages.additionalInfo_bs_0); //$NON-NLS-1$
-      addBracketProposal("\\x", 2, RegExMessages.displayString_bs_x, RegExMessages.additionalInfo_bs_x); //$NON-NLS-1$
-      addBracketProposal("\\u", 2, RegExMessages.displayString_bs_u, RegExMessages.additionalInfo_bs_u); //$NON-NLS-1$
-      addBsProposal("\\t", RegExMessages.displayString_bs_t, RegExMessages.additionalInfo_bs_t); //$NON-NLS-1$
-      addBsProposal("\\n", RegExMessages.displayString_bs_n, RegExMessages.additionalInfo_bs_n); //$NON-NLS-1$
-      addBsProposal("\\r", RegExMessages.displayString_bs_r, RegExMessages.additionalInfo_bs_r); //$NON-NLS-1$
-      addBsProposal("\\f", RegExMessages.displayString_bs_f, RegExMessages.additionalInfo_bs_f); //$NON-NLS-1$
-      addBsProposal("\\a", RegExMessages.displayString_bs_a, RegExMessages.additionalInfo_bs_a); //$NON-NLS-1$
-      addBsProposal("\\e", RegExMessages.displayString_bs_e, RegExMessages.additionalInfo_bs_e); //$NON-NLS-1$
-      addBsProposal("\\c", RegExMessages.displayString_bs_c, RegExMessages.additionalInfo_bs_c); //$NON-NLS-1$
-
-      if (!fIsEscape) addBracketProposal(".", 1, RegExMessages.displayString_dot, RegExMessages.additionalInfo_dot); //$NON-NLS-1$
-      addBsProposal("\\d", RegExMessages.displayString_bs_d, RegExMessages.additionalInfo_bs_d); //$NON-NLS-1$
-      addBsProposal("\\D", RegExMessages.displayString_bs_D, RegExMessages.additionalInfo_bs_D); //$NON-NLS-1$
-      addBsProposal("\\s", RegExMessages.displayString_bs_s, RegExMessages.additionalInfo_bs_s); //$NON-NLS-1$
-      addBsProposal("\\S", RegExMessages.displayString_bs_S, RegExMessages.additionalInfo_bs_S); //$NON-NLS-1$
-      addBsProposal("\\w", RegExMessages.displayString_bs_w, RegExMessages.additionalInfo_bs_w); //$NON-NLS-1$
-      addBsProposal("\\W", RegExMessages.displayString_bs_W, RegExMessages.additionalInfo_bs_W); //$NON-NLS-1$
-
-      // back reference
-      addBsProposal("\\", RegExMessages.displayString_bs_i, RegExMessages.additionalInfo_bs_i); //$NON-NLS-1$
-
-      // quoting
-      addBsProposal("\\", RegExMessages.displayString_bs, RegExMessages.additionalInfo_bs); //$NON-NLS-1$
-      addBsProposal("\\Q", RegExMessages.displayString_bs_Q, RegExMessages.additionalInfo_bs_Q); //$NON-NLS-1$
-      addBsProposal("\\E", RegExMessages.displayString_bs_E, RegExMessages.additionalInfo_bs_E); //$NON-NLS-1$
-
-      // character sets
-      if (!fIsEscape)
-      {
-        addBracketProposal("[]", 1, RegExMessages.displayString_set, RegExMessages.additionalInfo_set); //$NON-NLS-1$
-        addBracketProposal("[^]", 2, RegExMessages.displayString_setExcl, RegExMessages.additionalInfo_setExcl); //$NON-NLS-1$
-        addBracketProposal("[-]", 1, RegExMessages.displayString_setRange, RegExMessages.additionalInfo_setRange); //$NON-NLS-1$
-        addProposal("&&", RegExMessages.displayString_setInter, RegExMessages.additionalInfo_setInter); //$NON-NLS-1$
-      }
-      if (!fIsEscape && fDocumentOffset > 0 && fExpression.charAt(fDocumentOffset - 1) == '\\')
-      {
-        addProposal("\\p{}", 3, RegExMessages.displayString_posix, RegExMessages.additionalInfo_posix); //$NON-NLS-1$
-        addProposal("\\P{}", 3, RegExMessages.displayString_posixNot, RegExMessages.additionalInfo_posixNot); //$NON-NLS-1$
-      }
-      else
-      {
-        addBracketProposal("\\p{}", 3, RegExMessages.displayString_posix, RegExMessages.additionalInfo_posix); //$NON-NLS-1$
-        addBracketProposal("\\P{}", 3, RegExMessages.displayString_posixNot, RegExMessages.additionalInfo_posixNot); //$NON-NLS-1$
-      }
-
-      // boundary matchers
-      if (fDocumentOffset == 0)
-      {
-        addPriorityProposal("^", RegExMessages.displayString_start, RegExMessages.additionalInfo_start); //$NON-NLS-1$
-      }
-      else if (fDocumentOffset == 1 && fExpression.charAt(0) == '^')
-      {
-        addBracketProposal("^", 1, RegExMessages.displayString_start, RegExMessages.additionalInfo_start); //$NON-NLS-1$
-      }
-      if (fDocumentOffset == fExpression.length())
-      {
-        addProposal("$", RegExMessages.displayString_end, RegExMessages.additionalInfo_end); //$NON-NLS-1$
-      }
-      addBsProposal("\\b", RegExMessages.displayString_bs_b, RegExMessages.additionalInfo_bs_b); //$NON-NLS-1$
-      addBsProposal("\\B", RegExMessages.displayString_bs_B, RegExMessages.additionalInfo_bs_B); //$NON-NLS-1$
-      addBsProposal("\\A", RegExMessages.displayString_bs_A, RegExMessages.additionalInfo_bs_A); //$NON-NLS-1$
-      addBsProposal("\\G", RegExMessages.displayString_bs_G, RegExMessages.additionalInfo_bs_G); //$NON-NLS-1$
-      addBsProposal("\\Z", RegExMessages.displayString_bs_Z, RegExMessages.additionalInfo_bs_Z); //$NON-NLS-1$
-      addBsProposal("\\z", RegExMessages.displayString_bs_z, RegExMessages.additionalInfo_bs_z); //$NON-NLS-1$
-
-      if (!fIsEscape)
-      {
-        // capturing groups
-        addBracketProposal("()", 1, RegExMessages.displayString_group, RegExMessages.additionalInfo_group); //$NON-NLS-1$
-
-        // flags
-        addBracketProposal("(?)", 2, RegExMessages.displayString_flag, RegExMessages.additionalInfo_flag); //$NON-NLS-1$
-        addBracketProposal("(?:)", 3, RegExMessages.displayString_flagExpr, RegExMessages.additionalInfo_flagExpr); //$NON-NLS-1$
-
-        // non-capturing group
-        addBracketProposal("(?:)", 3, RegExMessages.displayString_nonCap, RegExMessages.additionalInfo_nonCap); //$NON-NLS-1$
-        addBracketProposal("(?>)", 3, RegExMessages.displayString_atomicCap, RegExMessages.additionalInfo_atomicCap); //$NON-NLS-1$
-
-        // lookaraound
-        addBracketProposal(
-            "(?=)", 3, RegExMessages.displayString_posLookahead, RegExMessages.additionalInfo_posLookahead); //$NON-NLS-1$
-        addBracketProposal(
-            "(?!)", 3, RegExMessages.displayString_negLookahead, RegExMessages.additionalInfo_negLookahead); //$NON-NLS-1$
-        addBracketProposal(
-            "(?<=)", 4, RegExMessages.displayString_posLookbehind, RegExMessages.additionalInfo_posLookbehind); //$NON-NLS-1$
-        addBracketProposal(
-            "(?<!)", 4, RegExMessages.displayString_negLookbehind, RegExMessages.additionalInfo_negLookbehind); //$NON-NLS-1$
-
-        // greedy quantifiers
-        addBracketProposal("?", 1, RegExMessages.displayString_quest, RegExMessages.additionalInfo_quest); //$NON-NLS-1$
-        addBracketProposal("*", 1, RegExMessages.displayString_star, RegExMessages.additionalInfo_star); //$NON-NLS-1$
-        addBracketProposal("+", 1, RegExMessages.displayString_plus, RegExMessages.additionalInfo_plus); //$NON-NLS-1$
-        addBracketProposal("{}", 1, RegExMessages.displayString_exact, RegExMessages.additionalInfo_exact); //$NON-NLS-1$
-        addBracketProposal("{,}", 1, RegExMessages.displayString_least, RegExMessages.additionalInfo_least); //$NON-NLS-1$
-        addBracketProposal("{,}", 1, RegExMessages.displayString_count, RegExMessages.additionalInfo_count); //$NON-NLS-1$
-
-        // lazy quantifiers
-        addBracketProposal("??", 1, RegExMessages.displayString_questLazy, RegExMessages.additionalInfo_questLazy); //$NON-NLS-1$
-        addBracketProposal("*?", 1, RegExMessages.displayString_starLazy, RegExMessages.additionalInfo_starLazy); //$NON-NLS-1$
-        addBracketProposal("+?", 1, RegExMessages.displayString_plusLazy, RegExMessages.additionalInfo_plusLazy); //$NON-NLS-1$
-        addBracketProposal("{}?", 1, RegExMessages.displayString_exactLazy, RegExMessages.additionalInfo_exactLazy); //$NON-NLS-1$
-        addBracketProposal("{,}?", 1, RegExMessages.displayString_leastLazy, RegExMessages.additionalInfo_leastLazy); //$NON-NLS-1$
-        addBracketProposal("{,}?", 1, RegExMessages.displayString_countLazy, RegExMessages.additionalInfo_countLazy); //$NON-NLS-1$
-
-        // possessive quantifiers
-        addBracketProposal("?+", 1, RegExMessages.displayString_questPoss, RegExMessages.additionalInfo_questPoss); //$NON-NLS-1$
-        addBracketProposal("*+", 1, RegExMessages.displayString_starPoss, RegExMessages.additionalInfo_starPoss); //$NON-NLS-1$
-        addBracketProposal("++", 1, RegExMessages.displayString_plusPoss, RegExMessages.additionalInfo_plusPoss); //$NON-NLS-1$
-        addBracketProposal("{}+", 1, RegExMessages.displayString_exactPoss, RegExMessages.additionalInfo_exactPoss); //$NON-NLS-1$
-        addBracketProposal("{,}+", 1, RegExMessages.displayString_leastPoss, RegExMessages.additionalInfo_leastPoss); //$NON-NLS-1$
-        addBracketProposal("{,}+", 1, RegExMessages.displayString_countPoss, RegExMessages.additionalInfo_countPoss); //$NON-NLS-1$
-
-        // alternative
-        addBracketProposal("|", 1, RegExMessages.displayString_alt, RegExMessages.additionalInfo_alt); //$NON-NLS-1$
-      }
-
-      fPriorityProposals.addAll(fProposals);
-      return fPriorityProposals.toArray(new IContentProposal[fProposals.size()]);
-    }
-
-    /**
-     * Computes applicable proposals for the replace field.
-     * 
-     * @return the proposals
-     */
-    public IContentProposal[] computeReplaceProposals()
-    {
-      if (fDocumentOffset > 0 && '$' == fExpression.charAt(fDocumentOffset - 1))
-      {
-        addProposal("", RegExMessages.displayString_dollar, RegExMessages.additionalInfo_dollar); //$NON-NLS-1$
-      }
-      else
-      {
-        addProposal("$", RegExMessages.displayString_dollar, RegExMessages.additionalInfo_dollar); //$NON-NLS-1$
-        addBsProposal("\\", RegExMessages.displayString_replace_bs, RegExMessages.additionalInfo_replace_bs); //$NON-NLS-1$
-        addProposal("\t", RegExMessages.displayString_tab, RegExMessages.additionalInfo_tab); //$NON-NLS-1$
-      }
-      return fProposals.toArray(new IContentProposal[fProposals.size()]);
-    }
-
-    /**
-     * Adds a proposal.
-     * 
-     * @param proposal
-     *          the string to be inserted
-     * @param displayString
-     *          the proposal's label
-     * @param additionalInfo
-     *          the additional information
-     */
-    private void addProposal(String proposal, String displayString, String additionalInfo)
-    {
-      fProposals.add(new Proposal(proposal, displayString, additionalInfo, proposal.length()));
-    }
-
-    /**
-     * Adds a proposal.
-     * 
-     * @param proposal
-     *          the string to be inserted
-     * @param cursorPosition
-     *          the cursor position after insertion, relative to the start of the proposal
-     * @param displayString
-     *          the proposal's label
-     * @param additionalInfo
-     *          the additional information
-     */
-    private void addProposal(String proposal, int cursorPosition, String displayString, String additionalInfo)
-    {
-      fProposals.add(new Proposal(proposal, displayString, additionalInfo, cursorPosition));
-    }
-
-    /**
-     * Adds a proposal to the priority proposals list.
-     * 
-     * @param proposal
-     *          the string to be inserted
-     * @param displayString
-     *          the proposal's label
-     * @param additionalInfo
-     *          the additional information
-     */
-    private void addPriorityProposal(String proposal, String displayString, String additionalInfo)
-    {
-      fPriorityProposals.add(new Proposal(proposal, displayString, additionalInfo, proposal.length()));
-    }
-
-    /**
-     * Adds a proposal. Ensures that existing pre- and postfixes are not duplicated.
-     * 
-     * @param proposal
-     *          the string to be inserted
-     * @param cursorPosition
-     *          the cursor position after insertion, relative to the start of the proposal
-     * @param displayString
-     *          the proposal's label
-     * @param additionalInfo
-     *          the additional information
-     */
-    private void addBracketProposal(String proposal, int cursorPosition, String displayString, String additionalInfo)
-    {
-      String prolog = fExpression.substring(0, fDocumentOffset);
-      if (!fIsEscape && prolog.endsWith("\\") && proposal.startsWith("\\")) { //$NON-NLS-1$//$NON-NLS-2$
-        fProposals.add(new Proposal(proposal, displayString, additionalInfo, cursorPosition));
-        return;
-      }
-      for (int i = 1; i <= cursorPosition; i++)
-      {
-        String prefix = proposal.substring(0, i);
-        if (prolog.endsWith(prefix))
-        {
-          String postfix = proposal.substring(cursorPosition);
-          String epilog = fExpression.substring(fDocumentOffset);
-          if (epilog.startsWith(postfix))
-          {
-            fPriorityProposals.add(new Proposal(proposal.substring(i, cursorPosition), displayString, additionalInfo,
-                cursorPosition - i));
-          }
-          else
-          {
-            fPriorityProposals.add(new Proposal(proposal.substring(i), displayString, additionalInfo, cursorPosition
-                - i));
-          }
-          return;
-        }
-      }
-      fProposals.add(new Proposal(proposal, displayString, additionalInfo, cursorPosition));
-    }
-
-    /**
-     * Adds a proposal that starts with a backslash. Ensures that the backslash is not repeated if already typed.
-     * 
-     * @param proposal
-     *          the string to be inserted
-     * @param displayString
-     *          the proposal's label
-     * @param additionalInfo
-     *          the additional information
-     */
-    private void addBsProposal(String proposal, String displayString, String additionalInfo)
-    {
-      String prolog = fExpression.substring(0, fDocumentOffset);
-      int position = proposal.length();
-      // If the string already contains the backslash, do not include in
-      // the proposal
-      if (prolog.endsWith("\\")) { //$NON-NLS-1$
-        position--;
-        proposal = proposal.substring(1);
-      }
-
-      if (fIsEscape)
-      {
-        fPriorityProposals.add(new Proposal(proposal, displayString, additionalInfo, position));
-      }
-      else
-      {
-        addProposal(proposal, position, displayString, additionalInfo);
-      }
-    }
-  }
-
-  /**
-   * <code>true</code> iff the processor is for the find field. <code>false</code> iff the processor is for the
-   * replace field.
-   */
-  private final boolean fIsFind;
-
-  /**
-   * Creates a new completion proposal provider.
-   * 
-   * @param isFind
-   *          <code>true</code> if the provider is used for the 'find' field <code>false</code> if the provider is
-   *          used for the 'reaplce' field
-   */
-  public RegExContentProposalProvider(boolean isFind)
-  {
-    fIsFind = isFind;
-  }
-
-  /*
-   * @see org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java.lang.String, int)
-   */
-  public IContentProposal[] getProposals(String contents, int position)
-  {
-    if (fIsFind) return new ProposalComputer(contents, position).computeFindProposals();
-    return new ProposalComputer(contents, position).computeReplaceProposals();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java
deleted file mode 100644
index fdc5b8995e..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.net4j.util.ui.proposals;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * RegEx messages. Helper class to get NLSed messages.
- * <p>
- * Copied from org.eclipse.ui.texteditor.RegExMessages.
- * <p>
- * Needed by org.eclipse.mylyn.internal.team.ui.preferences.workaround.RegExContentProposalProvider.
- * <p>
- * TODO Ask platform guys to open this API
- * 
- * @since 3.1
- */
-final class RegExMessages extends NLS
-{
-
-  private static final String BUNDLE_NAME = RegExMessages.class.getName();
-
-  private RegExMessages()
-  {
-    // Do not instantiate
-  }
-
-  static
-  {
-    reloadMessages();
-  }
-
-  static void reloadMessages()
-  {
-    NLS.initializeMessages(BUNDLE_NAME, RegExMessages.class);
-  }
-
-  // characters
-  public static String displayString_bs_bs;
-
-  public static String additionalInfo_bs_bs;
-
-  public static String displayString_bs_0;
-
-  public static String additionalInfo_bs_0;
-
-  public static String displayString_bs_x;
-
-  public static String additionalInfo_bs_x;
-
-  public static String displayString_bs_u;
-
-  public static String additionalInfo_bs_u;
-
-  public static String displayString_bs_t;
-
-  public static String additionalInfo_bs_t;
-
-  public static String displayString_bs_n;
-
-  public static String additionalInfo_bs_n;
-
-  public static String displayString_bs_r;
-
-  public static String additionalInfo_bs_r;
-
-  public static String displayString_bs_f;
-
-  public static String additionalInfo_bs_f;
-
-  public static String displayString_bs_a;
-
-  public static String additionalInfo_bs_a;
-
-  public static String displayString_bs_e;
-
-  public static String additionalInfo_bs_e;
-
-  public static String displayString_bs_c;
-
-  public static String additionalInfo_bs_c;
-
-  // character classes
-  public static String displayString_dot;
-
-  public static String additionalInfo_dot;
-
-  public static String displayString_bs_d;
-
-  public static String additionalInfo_bs_d;
-
-  public static String displayString_bs_D;
-
-  public static String additionalInfo_bs_D;
-
-  public static String displayString_bs_s;
-
-  public static String additionalInfo_bs_s;
-
-  public static String displayString_bs_S;
-
-  public static String additionalInfo_bs_S;
-
-  public static String displayString_bs_w;
-
-  public static String additionalInfo_bs_w;
-
-  public static String displayString_bs_W;
-
-  public static String additionalInfo_bs_W;
-
-  // boundary matchers
-  public static String displayString_start;
-
-  public static String additionalInfo_start;
-
-  public static String displayString_end;
-
-  public static String additionalInfo_end;
-
-  public static String displayString_bs_b;
-
-  public static String additionalInfo_bs_b;
-
-  public static String displayString_bs_B;
-
-  public static String additionalInfo_bs_B;
-
-  public static String displayString_bs_A;
-
-  public static String additionalInfo_bs_A;
-
-  public static String displayString_bs_G;
-
-  public static String additionalInfo_bs_G;
-
-  public static String displayString_bs_Z;
-
-  public static String additionalInfo_bs_Z;
-
-  public static String displayString_bs_z;
-
-  public static String additionalInfo_bs_z;
-
-  // greedy quantifiers
-  public static String displayString_quest;
-
-  public static String additionalInfo_quest;
-
-  public static String displayString_star;
-
-  public static String additionalInfo_star;
-
-  public static String displayString_plus;
-
-  public static String additionalInfo_plus;
-
-  public static String displayString_exact;
-
-  public static String additionalInfo_exact;
-
-  public static String displayString_least;
-
-  public static String additionalInfo_least;
-
-  public static String displayString_count;
-
-  public static String additionalInfo_count;
-
-  // lazy quantifiers
-  public static String displayString_questLazy;
-
-  public static String additionalInfo_questLazy;
-
-  public static String displayString_starLazy;
-
-  public static String additionalInfo_starLazy;
-
-  public static String displayString_plusLazy;
-
-  public static String additionalInfo_plusLazy;
-
-  public static String displayString_exactLazy;
-
-  public static String additionalInfo_exactLazy;
-
-  public static String displayString_leastLazy;
-
-  public static String additionalInfo_leastLazy;
-
-  public static String displayString_countLazy;
-
-  public static String additionalInfo_countLazy;
-
-  // possessive quantifiers
-  public static String displayString_questPoss;
-
-  public static String additionalInfo_questPoss;
-
-  public static String displayString_starPoss;
-
-  public static String additionalInfo_starPoss;
-
-  public static String displayString_plusPoss;
-
-  public static String additionalInfo_plusPoss;
-
-  public static String displayString_exactPoss;
-
-  public static String additionalInfo_exactPoss;
-
-  public static String displayString_leastPoss;
-
-  public static String additionalInfo_leastPoss;
-
-  public static String displayString_countPoss;
-
-  public static String additionalInfo_countPoss;
-
-  // alternative
-  public static String displayString_alt;
-
-  public static String additionalInfo_alt;
-
-  // capturing groups
-  public static String displayString_group;
-
-  public static String additionalInfo_group;
-
-  public static String displayString_bs_i;
-
-  public static String additionalInfo_bs_i;
-
-  // quoting
-  public static String displayString_bs;
-
-  public static String additionalInfo_bs;
-
-  public static String displayString_bs_Q;
-
-  public static String additionalInfo_bs_Q;
-
-  public static String displayString_bs_E;
-
-  public static String additionalInfo_bs_E;
-
-  // character sets
-  public static String displayString_set;
-
-  public static String additionalInfo_set;
-
-  public static String displayString_setExcl;
-
-  public static String additionalInfo_setExcl;
-
-  public static String displayString_setRange;
-
-  public static String additionalInfo_setRange;
-
-  public static String displayString_setInter;
-
-  public static String additionalInfo_setInter;
-
-  public static String displayString_posix;
-
-  public static String additionalInfo_posix;
-
-  public static String displayString_posixNot;
-
-  public static String additionalInfo_posixNot;
-
-  public static String displayString_flag;
-
-  public static String additionalInfo_flag;
-
-  public static String displayString_flagExpr;
-
-  public static String additionalInfo_flagExpr;
-
-  // non-capturing group
-  public static String displayString_nonCap;
-
-  public static String additionalInfo_nonCap;
-
-  public static String displayString_atomicCap;
-
-  public static String additionalInfo_atomicCap;
-
-  // look-ahead
-  public static String displayString_posLookahead;
-
-  public static String additionalInfo_posLookahead;
-
-  public static String displayString_negLookahead;
-
-  public static String additionalInfo_negLookahead;
-
-  public static String displayString_posLookbehind;
-
-  public static String additionalInfo_posLookbehind;
-
-  public static String displayString_negLookbehind;
-
-  public static String additionalInfo_negLookbehind;
-
-  // replace
-  public static String displayString_dollar;
-
-  public static String additionalInfo_dollar;
-
-  public static String additionalInfo_replace_bs;
-
-  public static String displayString_replace_bs;
-
-  public static String displayString_tab;
-
-  public static String additionalInfo_tab;
-
-  public static String displayString_nl;
-
-  public static String additionalInfo_nl;
-
-  public static String displayString_cr;
-
-  public static String additionalInfo_cr;
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.properties b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.properties
deleted file mode 100644
index e79cbc7fb3..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.properties
+++ /dev/null
@@ -1,495 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-## Content Assist for regular expressions ##
-## Copied from org.eclipse.ui.texteditor.RegExMessages.properties.
-## Needed by org.eclipse.mylyn.internal.team.ui.preferences.workaround.RegExMessages.
-## TODO Ask platform guys to open this API
-# use \\\u0075 for a backslash-u
-displayString_bs_bs= \\\\ - Backslash
-additionalInfo_bs_bs= Backslash
-displayString_bs_0= \\0nnn - Octal character code
-additionalInfo_bs_0= Octal character code\n\nExamples:\n\\011 (tabulator)\n\\0112 (character J)
-displayString_bs_x= \\xhh - Hex character code
-additionalInfo_bs_x= Hexadecimal character code\n\nExamples:\n\\x09 (tabulator)\n\\x4A or \\x4a (character J)
-displayString_bs_u= \\\u0075hhhh - Hex code for Unicode character
-additionalInfo_bs_u= Hexadecimal code for Unicode character\n\nExamples:\n\\\u0075004A (character J)\n\\\u007503B2 (lowercase Greek letter beta: \u03B2)
-displayString_bs_t= \\t - Tab
-additionalInfo_bs_t= Tabulator (\\x09, decimal: 9)
-displayString_bs_n= \\n - Newline
-additionalInfo_bs_n= Newline (\\x0A, decimal: 10)
-displayString_bs_r= \\r - CR
-additionalInfo_bs_r= Carriage Return (\\x0D, decimal: 13)
-displayString_bs_f= \\f - FF
-additionalInfo_bs_f= Form Feed (\\x0C, decimal: 12)
-displayString_bs_a= \\a - Beep
-additionalInfo_bs_a= Beep, Bell, Alert (\\x07, decimal: 7)
-displayString_bs_e= \\e - Esc
-additionalInfo_bs_e= Escape (\\x1B, decimal: 27)
-displayString_bs_c= \\c - Control character
-additionalInfo_bs_c= Control character\n\nExample:\n\\cC (Ctrl+C)
-
-displayString_dot= . - Any character
-additionalInfo_dot= The dot matches any character except line terminators.\n\n\
-To make the dot match line terminators as well, \n\
-start the expression with the embedded flag expression \n\
-"(?s)" (without quotes).
-displayString_bs_d= \\d - A digit
-additionalInfo_bs_d= A digit: [0-9]
-displayString_bs_D= \\D - Not a digit
-additionalInfo_bs_D= Not a digit: [^0-9]
-displayString_bs_s= \\s - A whitespace
-additionalInfo_bs_s= A whitespace: [ \\t\\n\\x0B\\f\\r]
-displayString_bs_S= \\S - Not a whitespace
-additionalInfo_bs_S= Not a whitespace: [^\\s]
-displayString_bs_w= \\w - An alphanumeric (word character)
-additionalInfo_bs_w= An alphanumeric (a word character): [a-zA-Z_0-9]
-displayString_bs_W= \\W - Not an alphanumeric
-additionalInfo_bs_W= Not an alphanumeric (not a word character): [^\\w]
-
-displayString_start= ^ - Line start
-additionalInfo_start= Line start (positional match)\n\nExample:\n\
-The expression "^Eclipse" matches the term "Eclipse"\n\
-only on the second line of text\n\
-"The Eclipse Project\n\
-Eclipse Platform".
-displayString_end= $ - Line end
-additionalInfo_end= Line end (positional match)\n\nExample:\n\
-The expression "Eclipse$" matches the term "Eclipse"\n\
-only on the second line of text\n\
-"- Install the Eclipse Platform\n\
-- Run Eclipse".
-displayString_bs_b= \\b- Word beginning or end
-additionalInfo_bs_b= Word beginning or end (positional match)\n\nExample:\n\
-The expression "s\\b" matches only the last "s" of "glasses" in text\n\
-"I lost my glasses."
-displayString_bs_B= \\B - Not a word beginning or end
-additionalInfo_bs_B= Not a word beginning or end (positional match)\n\nExample:\n\
-The expression "\\BS" matches only "S" of "printString" in text\n\
-"void print(String printString)".
-displayString_bs_A= \\A - Start of input
-additionalInfo_bs_A= Start of input (positional match)\n\nExample:\n\
-The expression "\\ABC" matches only "BC" of "BCD" in text\n\
-"BCD ABC\n\
-BCDEF".
-displayString_bs_G= \\G - Previous match's end
-additionalInfo_bs_G= Previous match's end (positional match)\n\nExample:\n\
-The expression "\\Ga" matches the first and then the second "a" in text\n\
-"aardvark" (when starting from the beginning).
-displayString_bs_Z= \\Z - End of input, does not consider last line terminator
-additionalInfo_bs_Z= End of input, does not consider last line terminator (positional match)\n\n\
-The expression matches at the end of the file, except for when the\n\
-file ends in a line terminator, in which case it matches before that\n\
-line terminator.\n\nExample:\n\
-The expression "ing\\Z" matches "ing" in text\n\
-"testing", as well as in text\n\
-"testing\n\
-", but doesn't match in text\n\
-"testing\n\
-\n\
-"
-displayString_bs_z= \\z - End of input
-additionalInfo_bs_z= End of input (positional match)\n\nExample:\n\
-The expression "ing\\z" matches "ing" in text\n\
-"testing", but doesn't match in text\n\
-"testing\n\
-"
-
-### repetition quantifiers ###
-displayString_quest= ? - Greedy match 0 or 1 times
-additionalInfo_quest= Greedy match 0 or 1 times.\n\n\
-First tries to match the preceding token.\n\
-Falls back to not matching if this choice made a full match impossible.\n\nExample:\n\
-The expression "fo?" matches "f", "fo", and "fo" in text\n\
-"f fo foo".
-displayString_star= * - Greedy match 0 or more times
-additionalInfo_star= Greedy match 0 or more times.\n\n\
-First tries to match the preceding token as many times as possible.\n\
-Falls back to matching it less often if this choice made a full match impossible.\n\nExamples:\n\
-- The expression "fo*" matches "f", "fo", and "foo" in text\n\
-"f fo foo".\n\
-- The expression "fo*o\\d" matches all three words in text\n\
-"fo1 foo2 fooo3".\n\
-- The expression "<.*>" matches the whole text\n\
-"<p><b>bold</b>".
-displayString_plus= + - Greedy match 1 or more times
-additionalInfo_plus= Greedy match 1 or more times\n\n\
-First tries to match the preceding token as many times as possible.\n\
-Falls back to matching it less often if this choice made a full match impossible.\n\nExamples:\n\
-- The expression "fo+" matches "fo" and "foo" in text\n\
-"f fo foo".\n\
-- The expression "fo+o\\d" matches "foo2" and "fooo3" in text\n\
-"fo1 foo2 fooo3".\n\
-- The expression "<.+>" matches the whole text\n\
-"<p><b>bold</b>", but does not match anywhere in "<>".
-displayString_exact= {n} - Greedy match exactly n times
-additionalInfo_exact= Greedy match exactly n times.\n\nExamples:\n\
-- The expression "\\\\0[0-3][0-7]{2}" matches all three-digit octal character tokens.\n\
-- The expression "\\b\\w{4}\\b" matches all four-letter-words\n\
-such as "Java", "cool", or "food" (but not "dog").
-displayString_least= {n,} - Greedy match >= n times
-additionalInfo_least= Greedy match >= n times.\n\n\
-First tries to match the preceding token as many times as possible.\n\
-Falls back to matching it less often (but at least n times),\n\
-if this choice made a full match impossible.\n\nExamples:\n\
-- The expression "fo{2,}" matches "foo" and "fooo" in text\n\
-"f fo foo fooo".\n\
-- The expression "fo{2,}o\\d" matches "fooo3" and "foooo4" in text\n\
-"fo1 foo2 fooo3 foooo4".\n\
-- The expression "10{3,}[^0]" matches all powers of ten that are larger than one thousand.\n\n\
-Note: The expressions "{0,}" and "*" are equivalent;\n\
-likewise, "{1,}" is equivalent to "+".
-displayString_count= {n,m} - Greedy match >= n times but <= m times
-additionalInfo_count= Greedy match >= n times but <= m times.\n\n\
-First tries to match the preceding token m times.\n\
-Falls back to matching it less often (but at least n times),\n\
-if this choice made a full match impossible.\n\nExamples:\n\
-- The expression "fo{1,2}" matches "fo", "foo", and "foo" in text\n\
-"f fo foo fooo".\n\
-- The expression "fo{1,2}o\\d" matches "foo2" and "fooo3" in text\n\
-"fo1 foo2 fooo3 foooo4".\n\
-- The expression "^.{70,80}$" matches all the lines that contain\n\
-between 70 and 80 characters (inclusive).
-
-displayString_questLazy= ?? - Lazy match 0 or 1 times
-additionalInfo_questLazy= Lazy match 0 or 1 times.\n\n\
-First tries to not match the preceding token.\n\
-Falls back to matching it if this choice made a full match impossible.\n\nExample:\n\
-The expression "fo??" matches "f", "f", and "f" in text\n\
-"f fo foo".
-displayString_starLazy= *? - Lazy match 0 or more times
-additionalInfo_starLazy= Lazy match 0 or more times.\n\n\
-First tries to not match the preceding token.\n\
-Falls back to matching it more often if this choice made a full match impossible.\n\nExamples:\n\
-- The expression "fo*?" matches "f", "f", and "f" in text\n\
-"f fo foo".\n\
-- The expression "fo*?o\\d" matches all three words in text\n\
-"fo1 foo2 fooo3".\n\
-- The expression "<.*?>" matches "<p>", "<b>", and "</b>" in text\n\
-"<p><b>bold</b>". Note: a more performant expression for finding\n\
-xml tags is "<[^>]*>", which avoids backtracking.
-displayString_plusLazy= +? - Lazy match 1 or more times
-additionalInfo_plusLazy= Lazy match 1 or more times\n\n\
-First tries to match the preceding token once.\n\
-Falls back to matching it more often if this choice made a full match impossible.\n\nExamples:\n\
-- The expression "fo+?" matches "fo" and "fo" in text\n\
-"f fo foo".\n\
-- The expression "fo+?o\\d" matches "foo2" and "fooo3" in text\n\
-"fo1 foo2 fooo3".\n\
-- The expression "<.+?>" matches "<p>", "<b>", and "</b>" in text\n\
-"<p><b>bold</b>". Note: a more performant expression for finding\n\
-xml tags is "<[^>]*>", which avoids backtracking.
-displayString_exactLazy= {n}? - Lazy match exactly n times
-additionalInfo_exactLazy= Lazy match exactly n times.\n\n\
-This expression is equivalent to the expression\n\
-{n} - Greedy match exactly n times.
-displayString_leastLazy= {n,}? - Lazy match >= n times
-additionalInfo_leastLazy= Lazy match >= n times.\n\n\
-First tries to match the preceding token n times. Falls back to\n\
-matching it more often, if this choice made a full match impossible.\n\nExamples:\n\
-- The expression "fo{2,}?" matches "foo" and "foo" in text\n\
-"f fo foo fooo".\n\
-- The expression "fo{2,}?o\\d" matches "fooo3" and "foooo4" in text\n\
-"fo1 foo2 fooo3 foooo4".\n\
-- The expression "10{3,}?[^0]" matches all powers of ten that are larger than one thousand.\n\n\
-Note: The expressions "{0,}?" and "*?" are equivalent;\n\
-likewise, "{1,}?" is equivalent to "+?".
-displayString_countLazy= {n,m}? - Lazy match >= n times but <= m times
-additionalInfo_countLazy= Lazy match >= n times but <= m times.\n\n\
-First tries to match the preceding token n times.\n\
-Falls back to matching it more often (but at most m times),\n\
-if this choice made a full match impossible.\n\nExamples:\n\
-- The expression "fo{1,2}?" matches "fo", "fo", and "fo" in text\n\
-"f fo foo fooo".\n\
-- The expression "fo{1,2}?o\\d" matches "foo2" and "fooo3" in text\n\
-"fo1 foo2 fooo3 foooo4".\n\
-
-displayString_questPoss= ?+ - Possessive match 0 or 1 times (no backtracking)
-additionalInfo_questPoss= Possessive match 0 or 1 times.\n\n\
-Matches the preceding token if possible. Never backtracks,\n\
-even if this choice renders a full match impossible.\n\nExample:\n\
-The expression "fo?+o\\d" matches the first, but not the second line in text\n\
-"fo1\n\
-foo1".
-displayString_starPoss= *+ Possessive match 0 or more times (no backtracking)
-additionalInfo_starPoss= Possessive match 0 or more times.\n\n\
-Tries to match the preceding token as many times as possible. Never backtracks,\n\
-even if this choice renders a full match impossible.\n\nExamples:\n\
-- The expression "fo*+" matches "f", "fo" and "foo" in text\n\
-"f fo foo".\n\
-- The expression "fo*+o\\d" matches nowhere in text\n\
-"fo1 foo2 fooo3".\n\
-- The expression "<.*+>" matches nowhere in text\n\
-"<p><b>bold</b>".
-displayString_plusPoss= ++ - Possessive match 1 or more times (no backtracking)
-additionalInfo_plusPoss= Possessive match 1 or more times.\n\n\
-Tries to match the preceding token as many times as possible. Never backtracks,\n\
-even if this choice renders a full match impossible.\n\nExamples:\n\
-- The expression "fo++" matches "fo" and "foo" in text\n\
-"f fo foo".\n\
-- The expression "fo++o\\d" matches nowhere in text\n\
-"fo1 foo2 fooo3".\n\
-- The expression "<.++>" matches nowhere in text\n\
-"<p><b>bold</b>".
-
-displayString_exactPoss= {n}+ - Possessive match exactly n times (no backtracking)
-additionalInfo_exactPoss= Possessive match exactly n times.\n\n\
-This expression is equivalent to the expression\n\
-{n} - Greedy match exactly n times.
-displayString_leastPoss= {n,}+ - Possessive match >= n times (no backtracking)
-additionalInfo_leastPoss= Possessive match >= n times.\n\n\
-Tries to match the preceding token as many times as possible, but at least n times.\n\
-Never backtracks, even if this choice renders a full match impossible.\n\nExamples:\n\
-- The expression "fo{2,}+" matches "foo" and "fooo" in text\n\
-"f fo foo fooo".\n\
-- The expression "fo{2,}?o\\d" matches nowhere in text\n\
-"fo1 foo2 fooo3 foooo4".\n\
-Note: The expressions "{0,}?" and "*?" are equivalent;\n\
-likewise, "{1,}?" is equivalent to "+?".
-
-displayString_countPoss= {n,m}+ - Possessive match >= n times but <= m times (no backtracking)
-additionalInfo_countPoss= Possessive match >= n times but <= m times.\n\n\
-Tries to match the preceding token as many times as possible, \n\
-at least n times and at most m times.\n\
-Never backtracks, even if this choice renders a full match impossible.\n\nExamples:\n\
-- The expression "fo{1,2}+" matches "fo", "foo", and "foo" in text\n\
-"f fo foo fooo".\n\
-- The expression "fo{1,2}+o\\d" matches only "fooo3" in text\n\
-"fo1 foo2 fooo3 foooo4".\n\
-- The expression "^.{70,80}+$" matches all the lines that contain\n\
-between 70 and 80 characters (inclusive).
-
-displayString_alt= U|V - Alternation: U or V
-additionalInfo_alt= Alternation.\n\n\
-First tries to match subexpression U. Falls back and tries to match V if U didn't match.\n\nExamples:\n\
-- The expression "A|B" applied to text "BA" first matches "B", then "A".\n\
-- The expression "AB|BC|CD" applied to text "ABC BC DAB" matches, in sequence:\n\
-"AB" in the first word, the second word "BC", "AB" at the very end.
-displayString_group= (Expr) - Mark Expr as capturing group
-additionalInfo_group= Mark Expr as capturing group.\n\n\
-Capturing groups are numbered by counting their opening parentheses from left to right.\n\
-In the expression "((A)(B(C)))", for example, there are four such groups:\n\
-1   ((A)(B(C)))\n\
-2   (A)\n\
-3   (B(C))\n\
-4   (C)\n\
-\n\
-Group zero always stands for the entire expression. During a match,\n\
-each subsequence of the input sequence that matches such a group is saved.\n\
-The captured subsequence i may be used later in the expression, via a back reference "\\i",\n\
-and may also be used in the replace string via "$i".\n\
-\n\
-Note: Groups beginning with (? are pure, non-capturing groups that\n\
-do not capture text and do not count towards the group total.
-
-displayString_bs_i= \\i - Match of the capturing group i
-additionalInfo_bs_i= Match of the capturing group i.\n\n\
-\\i matches the subsequence that has already been saved as capturing group i.\n\
-\\0 is not a valid group number in the regular expression.\n\nExample:\n\
-The expression "(\\d+)\\+\\1" matches "10+10" in text "9+10+10+11".\n\
-\n\
-Note: in the replace string, $i stands for the capturing group i. 
-
-displayString_bs= \\ - Quote next character
-additionalInfo_bs= Quote next character\n\nExample:\n\
-The expression "\\{\\n\\}" matches the text "{n}".
-
-displayString_bs_Q= \\Q - Start quoting
-additionalInfo_bs_Q= Start quoting\n\n\
-All characters between \\Q and the next \\E are taken literally and are not interpreted.\n\nExample:\n\
-The expression "\\Qnew int[] {42}\\E;" matches text "new int[] {42}".
-displayString_bs_E= \\E - End quoting
-additionalInfo_bs_E= End quoting\n\n\
-All characters between \\Q and the next \\E are taken literally and are not interpreted.\n\nExample:\n\
-The expression "\\Qnew int[] {42}\\E;" matches text "new int[] {42}".
-
-displayString_set= [ecl] - Character set
-additionalInfo_set= Character set\n\n\
-Matches a single character out of the set.\n\nExample:\n\
-The expression "[ecl]" matches "c" and "l" in text "cold".
-displayString_setExcl= [^ecl] - Excluded character set
-additionalInfo_setExcl= Excluded character set\n\n\
-Matches a single character that is not one of the excluded characters.\n\nExamples:\n\
-The expression "[^ecl]" matches "o" and "d" in text "cold".\n\
-The expression "[a-z&&[^ecl]]" matches any character from a to z, excluding e, c, and l.
-displayString_setRange= [c-l] - Character range
-additionalInfo_setRange= Character range\n\n\
-Matches a single character out of the range from 'c' to 'l'.\n\nExamples:\n\
-The expression "[c-l]" matches "c", "l", and "d" in text "cold".\n\
-The expression "[a-z&&[^ecl]]" matches any character from a to z, excluding e, c, and l.
-displayString_setInter= && - Intersection of character sets
-additionalInfo_setInter= Intersection of character sets\n\n\
-Matches a character that is in both of the given sets.\n\nExample:\n\
-The expression "[a-z&&[^ecl]]" matches any character from a to z, excluding e, c, and l.
-
-displayString_posix= \\p{Class} - POSIX or Unicode character class
-additionalInfo_posix= POSIX or Unicode character class\n\n\
-Matches a character from the given character class 'Class'.\n\
-Valid classes are:\n\
-\n\
-- POSIX character classes (US-ASCII only):\n\
-\    Lower, Upper, ASCII, Alpha, Digit, Alnum, Punct,\n\
-\    Graph, Print, Blank, Cntrl, XDigit, and Space.\n\
-\n\
-- Unicode blocks and categories, e.g.:\n\
-\    BasicLatin\n\
-\    Latin-1Supplement\n\
-\    Greek\n\
-\    Lu: Uppercase Letter\n\
-\    Ll: Lowercase Letter\n\
-\    L:  Letter\n\
-\    N:  Number\n\
-\    Z:  Separator\n\
-\    LD: Letter or Digit\n\
-\    L1: Latin-1
-
-displayString_posixNot= \\P{Class} - Excluded POSIX or Unicode character class
-additionalInfo_posixNot= Excluded POSIX or Unicode character class\n\n\
-Negation of character set \\p{Class}. Example:\n\
-\\P{ASCII} is equivalent to [^\\p{ASCII}] and matches all non-ASCII characters.\n\n\
-Valid classes are:\n\
-\n\
-- POSIX character classes (US-ASCII only):\n\
-\    Lower, Upper, ASCII, Alpha, Digit, Alnum, Punct,\n\
-\    Graph, Print, Blank, Cntrl, XDigit, and Space.\n\
-\n\
-- Unicode blocks and categories, e.g.:\n\
-\    BasicLatin\n\
-\    Latin-1Supplement\n\
-\    Greek\n\
-\    Lu: Uppercase Letter\n\
-\    Ll: Lowercase Letter\n\
-\    L:  Letter\n\
-\    N:  Number\n\
-\    Z:  Separator\n\
-\    LD: Letter or Digit\n\
-\    L1: Latin-1
-
-
-#Flags:
-displayString_flag= (?ismd-ismd) - Turn flags on or off
-additionalInfo_flag= Turn flags on and off for the rest of the matching process.\n\n\
-Flags before the dash are turned on; those after the dash are turned off.\n\
-The following flags are supported:\n\
-- i: case-insensitive matching\n\
-\n\
-- s: single-line, or dotall matching mode:\n\
-\        The expression . matches any character, including a line terminator.\n\
-\n\
-- m: multiline matching mode:\n\
-\        The expressions ^ and $ match just after or just before,\n\
-\        respectively, a line terminator or the end of the input sequence.\n\
-\        By default these expressions only match at the beginning and the\n\
-\        end of the entire input sequence.\n\
-\n\
-- d: Unix lines matching mode:\n\
-\        Only the '\\n' line terminator\n\
-\        is recognized in the behavior of ., ^, and $
-# - u: unicode-aware case folding:\n\
-#        Case-insensitive matching, when enabled, is done in a manner consistent\n\
-#        with the Unicode Standard. By default, case-insensitive matching\n\
-#        assumes that only characters in the US-ASCII charset are being matched.
-# - c: canonical equivalence\n\
-#        Two characters will be considered to match if, and only if, their full\n\
-#        canonical decompositions match. The expression "a\\\u0075030A", for example,\n\
-#        will match the string "a\u030A" when this flag is specified.\n\
-#        By default, matching does not take canonical equivalence into account.
-# - x: comments mode\n\
-#        Whitespace is ignored, and embedded comments starting with\n\
-#        # are ignored until the end of a line.\n\
-
-displayString_flagExpr= (?ismd-ismd:Expr) - Turn flags on or off in Expr
-additionalInfo_flagExpr= Turn flags on and off in Expr.\n\n\
-Flags before the dash are turned on; those after the dash are turned off.\n\
-The following flags are supported:\n\
-- i: case-insensitive matching\n\
-\n\
-- s: single-line, or dotall matching mode:\n\
-\        The expression . matches any character, including a line terminator.\n\
-\n\
-- m: multiline matching mode:\n\
-\        The expressions ^ and $ match just after or just before,\n\
-\        respectively, a line terminator or the end of the input sequence.\n\
-\        By default these expressions only match at the beginning and the\n\
-\        end of the entire input sequence.\n\
-\n\
-- d: Unix lines matching mode:\n\
-\        Only the '\\n' line terminator\n\
-\        is recognized in the behavior of ., ^, and $
-
-
-#Noncapturing groups:
-displayString_nonCap= (?:Expr) - Non-capturing group
-additionalInfo_nonCap= Non-capturing group of regular expression Expr.\n\n\
-The group is not saved in a back reference.\n\nExample:\n\
-The expression "(?:\\w+) (\\d+)" matches "bug 42" in text "It's bug 42.".\n\
-A back reference "$1" in the replace string will be replaced by "42".
-
-displayString_atomicCap= (?>Expr) - Non-capturing atomic group
-additionalInfo_atomicCap= Non-capturing atomic group of regular expression Expr.\n\n\
-Matches the regular expression Expr once, but does not backtrack into the expression\n\
-again if the first match did not prove to be successful later on.\n\
-The group is not saved in a back reference.
-
-#Lookaround:
-displayString_posLookahead= (?=Expr) - Zero-width positive lookahead
-additionalInfo_posLookahead= Expr, via zero-width positive lookahead.\n\n\
-Matches a position (zero-width: does not consume the matched characters),\n\
-where the next characters (-> lookahead)\n\
-do match (-> positive) the embedded expression Expr.\n\nExamples:\n\
-- The expression "var(?==)" matches only the first "var" in text "var=17; other=var;".\n\
-- The expression "\\b(?=\\w{7}\\b)\\w*clip\\w*\\b" matches any\n\
-seven-letter-word that contains "clip". It matches "Eclipse", but not "paperclip".
-
-displayString_negLookahead= (?!Expr) - Zero-width negative lookahead
-additionalInfo_negLookahead= Expr, via zero-width negative lookahead.\n\n\
-Matches a position (zero-width: does not consume the matched characters),\n\
-where the next characters (-> lookahead)\n\
-do not match (-> negative) the embedded expression Expr.\n\nExamples:\n\
-- The expression "var(?!=)" matches only the second "var" in text "var=17; other=var;".\n\
-- The expression "\\b(?!\\w{5,7}\\b)\\w*clip\\w*\\b" matches any\n\
-word that contains "clip" and consists of less than 5 or more than 7 characters.\n\
-It matches "clip" and "paperclip", but not "Eclipse".
-
-displayString_posLookbehind= (?<=Expr) - Zero-width positive lookbehind
-additionalInfo_posLookbehind= Expr, via zero-width positive lookbehind.\n\n\
-Matches a position (zero-width: does not consume the matched characters),\n\
-where the previous characters (-> lookbehind)\n\
-do match (-> positive) the embedded expression Expr.\n\nExample:\n\
-- The expression "\\w{5,}+(?<=as)\\b" matches "alias" and "bananas",\n\
-but does not match "peas", "apples", or "Alaska".
-
-displayString_negLookbehind= (?<!Expr) - Zero-width negative lookbehind
-additionalInfo_negLookbehind= Expr, via zero-width negative lookbehind.\n\n\
-Matches a position (zero-width: does not consume the matched characters),\n\
-where the previous characters (-> lookbehind)\n\
-do not match (-> negative) the embedded expression Expr.\n\nExample:\n\
-- The expression "\\w{5,}+(?<!as)\\b" matches "Eclipse" and "apples",\n\
-but does not match "peas" or "bananas".
-
-#Replace string:
-displayString_dollar= $i - Match of the capturing group i
-additionalInfo_dollar= Match of the capturing group i.\n\n\
-$i is the string that has been saved as capturing group i.\n\
-$0 is the subsequence matched by the entire expression.\n\
-\n\
-Note: in the find expression, \\i stands for the capturing group i. 
-displayString_replace_bs= \\ - Quote next character
-additionalInfo_replace_bs= Quote next character\n\nExamples:\n\
-"\\$" will be replaced by "$".\n\
-"\\a" will be replaced by "a".\n\
-"\\\\" will be replaced by "\\".
-displayString_tab= Tab - The tabulator character
-additionalInfo_tab= The tabulator character (\\t in the find expression).
-displayString_cr= CR - The carriage return character
-additionalInfo_cr= The carriage return character (\\r or \\x0D in the find expression).
-displayString_nl= Newline - The newline character
-additionalInfo_nl= The newline character (\\n or \\x0A in the find expression).
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
deleted file mode 100644
index ddd3ae9efd..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
+++ /dev/null
@@ -1,507 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.views;
-
-import org.eclipse.net4j.internal.util.container.ContainerEventAdapter;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.event.EventUtil;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycleState;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import org.eclipse.jface.viewers.TreePath;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends ItemProvider<CONTAINER>
-{
-  private Map<Object, Node> nodes = new HashMap<Object, Node>();
-
-  private Node root;
-
-  private IElementFilter rootElementFilter;
-
-  public ContainerItemProvider()
-  {
-  }
-
-  public ContainerItemProvider(IElementFilter rootElementFilter)
-  {
-    this.rootElementFilter = rootElementFilter;
-  }
-
-  public IElementFilter getRootElementFilter()
-  {
-    return rootElementFilter;
-  }
-
-  @Override
-  public boolean hasChildren(Object element)
-  {
-    try
-    {
-      Node node = getNode(element);
-      return !node.getChildren().isEmpty();
-    }
-    catch (Exception ex)
-    {
-      return false;
-    }
-  }
-
-  public Object[] getChildren(Object element)
-  {
-    try
-    {
-      Node node = getNode(element);
-      List<Node> children = node.getChildren();
-      for (Iterator<Node> it = children.iterator(); it.hasNext();)
-      {
-        Node child = it.next();
-        if (child.isDisposed())
-        {
-          it.remove();
-        }
-        else
-        {
-          Object childElement = child.getElement();
-          ILifecycleState lifecycleState = LifecycleUtil.getLifecycleState(childElement);
-          if (lifecycleState == ILifecycleState.INACTIVE || lifecycleState == ILifecycleState.DEACTIVATING)
-          {
-            it.remove();
-            child.dispose();
-          }
-        }
-      }
-
-      Object[] result = new Object[children.size()];
-      for (int i = 0; i < result.length; i++)
-      {
-        result[i] = children.get(i).getElement();
-      }
-
-      return result;
-    }
-    catch (RuntimeException ex)
-    {
-      return NO_ELEMENTS;
-    }
-  }
-
-  public Object getParent(Object element)
-  {
-    try
-    {
-      Node node = getNode(element);
-      Node parentNode = node.getParent();
-      return parentNode == null ? null : parentNode.getElement();
-    }
-    catch (RuntimeException ex)
-    {
-      return null;
-    }
-  }
-
-  @Override
-  public void dispose()
-  {
-    super.dispose();
-  }
-
-  @Override
-  protected void connectInput(CONTAINER input)
-  {
-    root = createNode(null, input);
-    if (root != null)
-    {
-      addNode(input, root);
-    }
-  }
-
-  @Override
-  protected void disconnectInput(CONTAINER input)
-  {
-    root.dispose();
-    root = null;
-    nodes.clear();
-  }
-
-  protected void elementAdded(Object element, Object parent)
-  {
-  }
-
-  protected void elementRemoved(Object element, Object parent)
-  {
-  }
-
-  protected Node getRoot()
-  {
-    return root;
-  }
-
-  protected Map<Object, Node> getNodes()
-  {
-    return nodes;
-  }
-
-  protected Node getNode(Object element)
-  {
-    Node node = root;
-    if (element != getInput())
-    {
-      node = nodes.get(element);
-    }
-
-    if (node == null)
-    {
-      throw new IllegalStateException("No node for " + element);
-    }
-
-    return node;
-  }
-
-  protected Node createNode(Node parent, Object element)
-  {
-    if (element instanceof IContainer)
-    {
-      return createContaineNode(parent, element);
-    }
-
-    return createLeafNode(parent, element);
-  }
-
-  protected LeafNode createLeafNode(Node parent, Object element)
-  {
-    return new LeafNode(parent, element);
-  }
-
-  @SuppressWarnings("unchecked")
-  protected ContainerNode createContaineNode(Node parent, Object element)
-  {
-    return new ContainerNode(parent, (IContainer<Object>)element);
-  }
-
-  protected void addNode(Object element, Node node)
-  {
-    nodes.put(element, node);
-  }
-
-  protected Node removeNode(Object element)
-  {
-    return nodes.remove(element);
-  }
-
-  protected boolean filterRootElement(Object element)
-  {
-    if (rootElementFilter != null)
-    {
-      return rootElementFilter.filter(element);
-    }
-
-    return true;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface Node
-  {
-    public void dispose();
-
-    public boolean isDisposed();
-
-    public Object getElement();
-
-    public Node getParent();
-
-    public List<Node> getChildren();
-
-    public TreePath getTreePath();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public abstract class AbstractNode implements Node
-  {
-    private Node parent;
-
-    private boolean disposed;
-
-    public AbstractNode(Node parent)
-    {
-      this.parent = parent;
-    }
-
-    public void dispose()
-    {
-      if (!disposed)
-      {
-        removeNode(getElement());
-        parent = null;
-        disposed = true;
-      }
-    }
-
-    public boolean isDisposed()
-    {
-      return disposed;
-    }
-
-    @Override
-    public String toString()
-    {
-      return MessageFormat.format("{0}[{1}]", getClass().getSimpleName(), getElement());
-    }
-
-    public final Node getParent()
-    {
-      checkNotDisposed();
-      return parent;
-    }
-
-    public TreePath getTreePath()
-    {
-      TreePath parentPath = parent == null ? TreePath.EMPTY : parent.getTreePath();
-      return parentPath.createChildPath(getElement());
-    }
-
-    protected void checkNotDisposed()
-    {
-      if (disposed)
-      {
-        throw new IllegalStateException("Node is already disposed of");
-      }
-    }
-
-    protected Node addChild(Collection<Node> children, Object element)
-    {
-      if (nodes.containsKey(element))
-      {
-        return null;
-      }
-
-      if (this != root || filterRootElement(element))
-      {
-        Node node = createNode(this, element);
-        if (node != null)
-        {
-          addNode(element, node);
-          children.add(node);
-          return node;
-        }
-      }
-
-      return null;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public abstract class AbstractContainerNode extends AbstractNode
-  {
-    private List<Node> children;
-
-    protected IListener containerListener = new ContainerEventAdapter<Object>()
-    {
-      @Override
-      protected void onAdded(IContainer<Object> container, Object element)
-      {
-        AbstractContainerNode.this.onAdded(container, element);
-      }
-
-      @Override
-      protected void onRemoved(IContainer<Object> container, Object element)
-      {
-        AbstractContainerNode.this.onRemoved(container, element);
-      }
-
-      @Override
-      protected void notifyOtherEvent(IEvent event)
-      {
-        updateLabels(event.getSource());
-      }
-    };
-
-    public AbstractContainerNode(Node parent)
-    {
-      super(parent);
-    }
-
-    @Override
-    public void dispose()
-    {
-      if (!isDisposed())
-      {
-        if (children != null)
-        {
-          for (Node child : children)
-          {
-            child.dispose();
-          }
-
-          children.clear();
-          children = null;
-          containerListener = null;
-
-        }
-
-        super.dispose();
-      }
-    }
-
-    public final List<Node> getChildren()
-    {
-      checkNotDisposed();
-      if (children == null)
-      {
-        children = createChildren();
-      }
-
-      return children;
-    }
-
-    @SuppressWarnings("unchecked")
-    public IContainer<Object> getContainer()
-    {
-      return (IContainer<Object>)getElement();
-    }
-
-    protected List<Node> createChildren()
-    {
-      Object[] elements = getContainer().getElements();
-      List<Node> children = new ArrayList<Node>(elements.length);
-      for (int i = 0; i < elements.length; i++)
-      {
-        Object element = elements[i];
-        addChild(children, element);
-      }
-
-      getContainer().addListener(containerListener);
-      return children;
-    }
-
-    protected void onAdded(IContainer<Object> container, Object element)
-    {
-      Node node = addChild(getChildren(), element);
-      if (node != null)
-      {
-        refreshElement(container, true);
-        revealElement(element);
-        elementAdded(element, container);
-      }
-    }
-
-    protected void onRemoved(IContainer<Object> container, Object element)
-    {
-      Node node = removeNode(element);
-      if (node != null)
-      {
-        getChildren().remove(node);
-        elementRemoved(element, container);
-
-        Object rootElement = root.getElement();
-        Object refreshElement = container == rootElement ? null : container;
-        refreshElement(refreshElement, true);
-        node.dispose();
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class ContainerNode extends AbstractContainerNode
-  {
-    private IContainer<Object> container;
-
-    public ContainerNode(Node parent, IContainer<Object> container)
-    {
-      super(parent);
-      this.container = container;
-      if (container == null)
-      {
-        throw new IllegalArgumentException("container == null");
-      }
-    }
-
-    @Override
-    public void dispose()
-    {
-      if (!isDisposed())
-      {
-        container.removeListener(containerListener);
-        container = null;
-        super.dispose();
-      }
-    }
-
-    public Object getElement()
-    {
-      return container;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class LeafNode extends AbstractNode implements IListener
-  {
-    private Object element;
-
-    public LeafNode(Node parent, Object element)
-    {
-      super(parent);
-      this.element = element;
-      EventUtil.addListener(element, this);
-    }
-
-    @Override
-    public void dispose()
-    {
-      if (!isDisposed())
-      {
-        EventUtil.removeListener(element, this);
-        element = null;
-        super.dispose();
-      }
-    }
-
-    public Object getElement()
-    {
-      checkNotDisposed();
-      return element;
-    }
-
-    public List<Node> getChildren()
-    {
-      checkNotDisposed();
-      return Collections.emptyList();
-    }
-
-    public void notifyEvent(IEvent event)
-    {
-      updateLabels(event.getSource());
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerNameSorter.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerNameSorter.java
deleted file mode 100644
index cc21f234c3..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerNameSorter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.views;
-
-import org.eclipse.jface.viewers.ViewerSorter;
-
-public class ContainerNameSorter extends ViewerSorter
-{
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java
deleted file mode 100644
index 2a158b35be..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.views;
-
-import org.eclipse.net4j.util.container.IContainer;
-
-import org.eclipse.jface.viewers.ITreePathContentProvider;
-import org.eclipse.jface.viewers.TreePath;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-@Deprecated
-public class ContainerPathItemProvider<CONTAINER extends IContainer<Object>> extends ContainerItemProvider<CONTAINER>
-    implements ITreePathContentProvider
-{
-  private Map<Object, List<TreePath>> parents = new HashMap<Object, List<TreePath>>();
-
-  public ContainerPathItemProvider()
-  {
-  }
-
-  public ContainerPathItemProvider(IElementFilter rootElementFilter)
-  {
-    super(rootElementFilter);
-  }
-
-  public boolean hasChildren(TreePath path)
-  {
-    return hasChildren((Object)path);
-  }
-
-  public Object[] getChildren(TreePath path)
-  {
-    return getChildren((Object)path);
-  }
-
-  public TreePath[] getParents(Object element)
-  {
-    List<TreePath> paths = parents.get(element);
-    if (paths != null)
-    {
-      return paths.toArray(new TreePath[paths.size()]);
-    }
-
-    return null;
-  }
-
-  @Override
-  protected void addNode(Object element, Node node)
-  {
-    super.addNode(node.getTreePath(), node);
-    TreePath path = getParentPath(node);
-    List<TreePath> paths = parents.get(element);
-    if (paths == null)
-    {
-      paths = new ArrayList<TreePath>();
-      parents.put(element, paths);
-    }
-
-    paths.add(path);
-  }
-
-  @Override
-  protected Node removeNode(Object element)
-  {
-    Node node = super.removeNode(element);
-    TreePath path = getParentPath(node);
-    List<TreePath> paths = parents.get(element);
-    if (paths != null)
-    {
-      paths.remove(path);
-    }
-
-    return node;
-  }
-
-  @Override
-  protected void disconnectInput(CONTAINER input)
-  {
-    super.disconnectInput(input);
-  }
-
-  protected TreePath getParentPath(Node node)
-  {
-    Node parent = node.getParent();
-    return parent == null ? TreePath.EMPTY : parent.getTreePath();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
deleted file mode 100644
index a9dc8c34e6..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.views;
-
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.internal.ui.SharedIcons;
-import org.eclipse.net4j.util.internal.ui.actions.IntrospectAction;
-import org.eclipse.net4j.util.ui.UIUtil;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.ui.part.ViewPart;
-
-public abstract class ContainerView extends ViewPart implements ISetSelectionTarget
-{
-  private Shell shell;
-
-  private ContainerItemProvider<IContainer<Object>> itemProvider;
-
-  private TreeViewer viewer;
-
-  private ISelectionChangedListener selectionListener = new ISelectionChangedListener()
-  {
-    public void selectionChanged(SelectionChangedEvent event)
-    {
-      ITreeSelection selection = (ITreeSelection)event.getSelection();
-      IActionBars bars = getViewSite().getActionBars();
-      ContainerView.this.selectionChanged(bars, selection);
-    }
-  };
-
-  private Action refreshAction = new RefreshAction();
-
-  public ContainerView()
-  {
-  }
-
-  public Shell getShell()
-  {
-    return shell;
-  }
-
-  public TreeViewer getViewer()
-  {
-    return viewer;
-  }
-
-  @Override
-  public void setFocus()
-  {
-    viewer.getControl().setFocus();
-  }
-
-  public void resetInput()
-  {
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        try
-        {
-          IContainer<?> container = getContainer();
-          viewer.setInput(container);
-        }
-        catch (RuntimeException ignore)
-        {
-        }
-      }
-    };
-
-    try
-    {
-      Display display = getDisplay();
-      if (display.getThread() == Thread.currentThread())
-      {
-        runnable.run();
-      }
-      else
-      {
-        display.asyncExec(runnable);
-      }
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  public void selectReveal(ISelection selection)
-  {
-    viewer.setSelection(selection, true);
-  }
-
-  @Override
-  public final void createPartControl(Composite parent)
-  {
-    shell = parent.getShell();
-    Composite composite = UIUtil.createGridComposite(parent, 1);
-
-    Control control = createUI(composite);
-    control.setLayoutData(UIUtil.createGridData());
-
-    hookContextMenu();
-    hookDoubleClick();
-    contributeToActionBars();
-  }
-
-  protected Control createUI(Composite parent)
-  {
-    itemProvider = createContainerItemProvider();
-    viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-    viewer.setContentProvider(itemProvider);
-    viewer.setLabelProvider(itemProvider);
-    viewer.setSorter(new ContainerNameSorter());
-    resetInput();
-    viewer.addSelectionChangedListener(selectionListener);
-    getSite().setSelectionProvider(viewer);
-    return viewer.getControl();
-  }
-
-  protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
-  {
-    return new ContainerItemProvider<IContainer<Object>>(getRootElementFilter())
-    {
-      @Override
-      public Image getImage(Object obj)
-      {
-        Image image = getElementImage(obj);
-        if (image == null)
-        {
-          image = super.getImage(obj);
-        }
-
-        return image;
-      }
-
-      @Override
-      public String getText(Object obj)
-      {
-        String text = getElementText(obj);
-        if (text == null)
-        {
-          text = super.getText(obj);
-        }
-
-        return text;
-      }
-    };
-  }
-
-  protected String getElementText(Object element)
-  {
-    return null;
-  }
-
-  protected Image getElementImage(Object element)
-  {
-    return null;
-  }
-
-  protected IElementFilter getRootElementFilter()
-  {
-    return null;
-  }
-
-  protected abstract IContainer<?> getContainer();
-
-  protected void hookDoubleClick()
-  {
-    viewer.addDoubleClickListener(new IDoubleClickListener()
-    {
-      public void doubleClick(DoubleClickEvent event)
-      {
-        ITreeSelection selection = (ITreeSelection)viewer.getSelection();
-        Object object = selection.getFirstElement();
-        doubleClicked(object);
-      }
-    });
-  }
-
-  protected void hookContextMenu()
-  {
-    MenuManager menuMgr = new MenuManager("#PopupMenu");
-    menuMgr.setRemoveAllWhenShown(true);
-    menuMgr.addMenuListener(new IMenuListener()
-    {
-      public void menuAboutToShow(IMenuManager manager)
-      {
-        ITreeSelection selection = (ITreeSelection)viewer.getSelection();
-        fillContextMenu(manager, selection);
-      }
-    });
-
-    Menu menu = menuMgr.createContextMenu(viewer.getControl());
-    viewer.getControl().setMenu(menu);
-    getSite().registerContextMenu(menuMgr, viewer);
-  }
-
-  protected void contributeToActionBars()
-  {
-    IActionBars bars = getViewSite().getActionBars();
-    fillLocalPullDown(bars.getMenuManager());
-    fillLocalToolBar(bars.getToolBarManager());
-  }
-
-  protected void fillLocalPullDown(IMenuManager manager)
-  {
-    manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-    manager.add(refreshAction);
-    manager.add(new IntrospectAction(getViewer()));
-  }
-
-  protected void fillLocalToolBar(IToolBarManager manager)
-  {
-    manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-  }
-
-  protected void fillContextMenu(IMenuManager manager, ITreeSelection selection)
-  {
-    manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-    itemProvider.fillContextMenu(manager, selection);
-  }
-
-  protected void selectionChanged(IActionBars bars, ITreeSelection selection)
-  {
-  }
-
-  protected void doubleClicked(Object object)
-  {
-    if (object != null && viewer.isExpandable(object))
-    {
-      if (viewer.getExpandedState(object))
-      {
-        viewer.collapseToLevel(object, TreeViewer.ALL_LEVELS);
-      }
-      else
-      {
-        viewer.expandToLevel(object, 1);
-      }
-    }
-  }
-
-  protected void closeView()
-  {
-    try
-    {
-      getSite().getShell().getDisplay().syncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            getSite().getPage().hideView(ContainerView.this);
-            ContainerView.this.dispose();
-          }
-          catch (Exception ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (Exception ignore)
-    {
-    }
-  }
-
-  protected void showMessage(String message)
-  {
-    showMessage(MessageType.INFORMATION, message);
-  }
-
-  protected boolean showMessage(MessageType type, String message)
-  {
-    switch (type)
-    {
-    case INFORMATION:
-      MessageDialog.openInformation(viewer.getControl().getShell(), getTitle(), message);
-      return true;
-
-    case ERROR:
-      MessageDialog.openError(viewer.getControl().getShell(), getTitle(), message);
-      return true;
-
-    case WARNING:
-      MessageDialog.openWarning(viewer.getControl().getShell(), getTitle(), message);
-      return true;
-
-    case CONFIRM:
-      return MessageDialog.openConfirm(viewer.getControl().getShell(), getTitle(), message);
-
-    case QUESTION:
-      return MessageDialog.openQuestion(viewer.getControl().getShell(), getTitle(), message);
-
-    default:
-      return true;
-    }
-  }
-
-  public void refreshViewer(boolean updateLabels)
-  {
-    refreshElement(null, updateLabels);
-  }
-
-  public void refreshElement(final Object element, final boolean updateLabels)
-  {
-    try
-    {
-      getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            if (element != null)
-            {
-              viewer.refresh(element, updateLabels);
-            }
-            else
-            {
-              viewer.refresh(updateLabels);
-            }
-          }
-          catch (RuntimeException ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  public void updateLabels(final Object element)
-  {
-    try
-    {
-      getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            viewer.update(element, null);
-          }
-          catch (RuntimeException ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  public void revealElement(final Object element)
-  {
-    try
-    {
-      getDisplay().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          try
-          {
-            viewer.reveal(element);
-          }
-          catch (RuntimeException ignore)
-          {
-          }
-        }
-      });
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  protected Display getDisplay()
-  {
-    Display display = viewer.getControl().getDisplay();
-    if (display == null)
-    {
-      display = UIUtil.getDisplay();
-    }
-
-    return display;
-  }
-
-  public static ImageDescriptor getAddImageDescriptor()
-  {
-    return SharedIcons.getDescriptor(SharedIcons.TOOL_ADD);
-  }
-
-  public static ImageDescriptor getDeleteImageDescriptor()
-  {
-    return SharedIcons.getDescriptor(SharedIcons.TOOL_DELETE);
-  }
-
-  public static ImageDescriptor getRefreshImageDescriptor()
-  {
-    return SharedIcons.getDescriptor(SharedIcons.TOOL_REFRESH);
-  }
-
-  protected static enum MessageType
-  {
-    INFORMATION, ERROR, WARNING, CONFIRM, QUESTION
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class RefreshAction extends SafeAction
-  {
-    private RefreshAction()
-    {
-      super("Refresh", "Refresh view", getRefreshImageDescriptor());
-    }
-
-    @Override
-    protected void safeRun() throws Exception
-    {
-      viewer.refresh(false);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/IElementFilter.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/IElementFilter.java
deleted file mode 100644
index 75dbfa72d7..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/IElementFilter.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.views;
-
-/**
- * @author Eike Stepper
- */
-public interface IElementFilter
-{
-  public boolean filter(Object element);
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java
deleted file mode 100644
index 5a844980d6..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.views;
-
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.ui.StructuredContentProvider;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public abstract class ItemProvider<INPUT> extends StructuredContentProvider<INPUT> implements ITreeContentProvider,
-    ILabelProvider, IColorProvider, IFontProvider
-{
-  public static final Object[] NO_ELEMENTS = {};
-
-  private List<ILabelProviderListener> listeners = new ArrayList<ILabelProviderListener>(0);
-
-  public ItemProvider()
-  {
-  }
-
-  public final Object[] getElements(Object parent)
-  {
-    return getChildren(parent);
-  }
-
-  public boolean hasChildren(Object parent)
-  {
-    return getChildren(parent).length != 0;
-  }
-
-  public String getText(Object obj)
-  {
-    return obj.toString();
-  }
-
-  public Image getImage(Object obj)
-  {
-    String imageKey = ISharedImages.IMG_OBJ_ELEMENT;
-    return PlatformUI.getWorkbench().getSharedImages().getImage(imageKey);
-  }
-
-  public Color getBackground(Object element)
-  {
-    return null;
-  }
-
-  public Color getForeground(Object element)
-  {
-    if (!LifecycleUtil.isActive(element))
-    {
-      return getDisplay().getSystemColor(SWT.COLOR_GRAY);
-    }
-
-    return null;
-  }
-
-  public Font getFont(Object element)
-  {
-    return null;
-  }
-
-  public boolean isLabelProperty(Object element, String property)
-  {
-    return true;
-  }
-
-  public ILabelProviderListener[] getListeners()
-  {
-    synchronized (listeners)
-    {
-      return listeners.toArray(new ILabelProviderListener[listeners.size()]);
-    }
-  }
-
-  public void addListener(ILabelProviderListener listener)
-  {
-    synchronized (listeners)
-    {
-      listeners.add(listener);
-    }
-  }
-
-  public void removeListener(ILabelProviderListener listener)
-  {
-    synchronized (listeners)
-    {
-      listeners.remove(listener);
-    }
-  }
-
-  protected void fillContextMenu(IMenuManager manager, ITreeSelection selection)
-  {
-  }
-
-  protected void fireLabelProviderChanged()
-  {
-    fireLabelProviderChanged(new LabelProviderChangedEvent(this));
-  }
-
-  protected void fireLabelProviderChanged(Object element)
-  {
-    fireLabelProviderChanged(new LabelProviderChangedEvent(this, element));
-  }
-
-  protected void fireLabelProviderChanged(Object[] elements)
-  {
-    fireLabelProviderChanged(new LabelProviderChangedEvent(this, elements));
-  }
-
-  /**
-   * Fires a label provider changed event to all registered listeners Only listeners registered at the time this method
-   * is called are notified.
-   * 
-   * @param event
-   *          a label provider changed event
-   * @see ILabelProviderListener#labelProviderChanged
-   */
-  private void fireLabelProviderChanged(LabelProviderChangedEvent event)
-  {
-    for (ILabelProviderListener listener : getListeners())
-    {
-      try
-      {
-        listener.labelProviderChanged(event);
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java
deleted file mode 100644
index c4d39fc69e..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.widgets;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Eike Stepper
- */
-public abstract class BaseDialog<VIEWER extends Viewer> extends TitleAreaDialog
-{
-  public static final int DEFAULT_SHELL_STYLE = SWT.SHELL_TRIM;
-
-  private String title;
-
-  private String message;
-
-  private IDialogSettings settings;
-
-  private VIEWER currentViewer;
-
-  private MenuManager contextMenu;
-
-  public BaseDialog(Shell parentShell, int shellStyle, String title, String message, IDialogSettings settings)
-  {
-    super(parentShell);
-    setShellStyle(shellStyle);
-    this.title = title;
-    this.message = message;
-    this.settings = settings;
-  }
-
-  public BaseDialog(Shell parentShell, String title, String message, IDialogSettings settings)
-  {
-    this(parentShell, DEFAULT_SHELL_STYLE, title, message, settings);
-  }
-
-  @Override
-  protected void configureShell(Shell newShell)
-  {
-    super.configureShell(newShell);
-    newShell.setText(title);
-  }
-
-  @Override
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = (Composite)super.createDialogArea(parent);
-    setTitle(title);
-    setMessage(message);
-
-    contextMenu = new MenuManager("#PopupMenu");
-    contextMenu.setRemoveAllWhenShown(true);
-    contextMenu.addMenuListener(new IMenuListener()
-    {
-      public void menuAboutToShow(IMenuManager manager)
-      {
-        VIEWER viewer = getCurrentViewer();
-        if (viewer != null)
-        {
-          fillContextMenu(manager, viewer);
-        }
-      }
-    });
-
-    createUI(composite);
-    return composite;
-  }
-
-  protected abstract void createUI(Composite parent);
-
-  public VIEWER getCurrentViewer()
-  {
-    return currentViewer;
-  }
-
-  public void setCurrentViewer(VIEWER currentViewer)
-  {
-    if (this.currentViewer != null)
-    {
-      Control control = this.currentViewer.getControl();
-      control.setMenu(null);
-    }
-
-    this.currentViewer = currentViewer;
-    if (this.currentViewer != null)
-    {
-      Control control = this.currentViewer.getControl();
-      Menu menu = contextMenu.createContextMenu(control);
-      control.setMenu(menu);
-    }
-  }
-
-  protected void hookContextMenu()
-  {
-    contextMenu = new MenuManager("#PopupMenu");
-    contextMenu.setRemoveAllWhenShown(true);
-    contextMenu.addMenuListener(new IMenuListener()
-    {
-      public void menuAboutToShow(IMenuManager manager)
-      {
-        fillContextMenu(manager, getCurrentViewer());
-      }
-    });
-  }
-
-  protected void fillContextMenu(IMenuManager manager, VIEWER viewer)
-  {
-  }
-
-  @Override
-  protected IDialogSettings getDialogBoundsSettings()
-  {
-    if (settings == null)
-    {
-      return null;
-    }
-
-    IDialogSettings section = settings.getSection(title);
-    if (section == null)
-    {
-      section = settings.addNewSection(title);
-    }
-
-    return section;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
deleted file mode 100644
index be57e64bdb..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.widgets;
-
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.collection.IHistory;
-import org.eclipse.net4j.util.collection.IHistoryChangeEvent;
-import org.eclipse.net4j.util.collection.IHistoryElement;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.internal.ui.bundle.OM;
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-
-import java.lang.reflect.Method;
-
-/**
- * @author Eike Stepper
- */
-public class HistoryText
-{
-  private IHistory<String> history;
-
-  private CCombo combo;
-
-  private Method droppedMethod;
-
-  private IListener historyListener = new IListener()
-  {
-    public void notifyEvent(IEvent event)
-    {
-      if (event instanceof IHistoryChangeEvent)
-      {
-        historyChanged();
-      }
-    }
-  };
-
-  public HistoryText(Composite parent, int style, IHistory<String> history)
-  {
-    this.history = history;
-    history.addListener(historyListener);
-
-    combo = new CCombo(parent, style);
-    combo.setLayoutData(UIUtil.createGridData());
-    combo.addDisposeListener(new DisposeListener()
-    {
-      public void widgetDisposed(DisposeEvent e)
-      {
-        HistoryText.this.history.removeListener(historyListener);
-      }
-    });
-
-    // TODO Can't get traversal working when keyListener is added ;-(
-    // combo.addKeyListener(new KeyAdapter()
-    // {
-    // @Override
-    // public void keyPressed(KeyEvent event)
-    // {
-    // if (event.character == SWT.DEL && event.stateMask == 0 && isDropped())
-    // {
-    // int index = combo.getSelectionIndex();
-    // if (index != -1)
-    // {
-    // HistoryText.this.history.remove(index);
-    // }
-    // }
-    // }
-    // });
-
-    try
-    {
-      droppedMethod = combo.getClass().getDeclaredMethod("isDropped", ReflectUtil.NO_PARAMETERS);
-      droppedMethod.setAccessible(true);
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-    }
-
-    historyChanged();
-  }
-
-  public IHistory<String> getHistory()
-  {
-    return history;
-  }
-
-  public CCombo getCombo()
-  {
-    return combo;
-  }
-
-  public void append(String string)
-  {
-    combo.setText(combo.getText() + string);
-  }
-
-  public int getCharCount()
-  {
-    return combo.getText().length();
-  }
-
-  public int getLineCount()
-  {
-    return StringUtil.occurrences(combo.getText(), getLineDelimiter()) + 1;
-  }
-
-  public String getLineDelimiter()
-  {
-    return Text.DELIMITER;
-  }
-
-  public int getLineHeight()
-  {
-    return combo.getTextHeight();
-  }
-
-  public String getText(boolean addHistory)
-  {
-    String text = combo.getText();
-    if (addHistory)
-    {
-      history.add(text);
-    }
-
-    return text;
-  }
-
-  public String getText()
-  {
-    return getText(false);
-  }
-
-  public void setText(String string)
-  {
-    combo.setText(string);
-  }
-
-  public boolean setFocus()
-  {
-    return combo.setFocus();
-  }
-
-  public boolean isDropped()
-  {
-    if (droppedMethod != null)
-    {
-      try
-      {
-        return (Boolean)droppedMethod.invoke(combo, ReflectUtil.NO_ARGUMENTS);
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-      }
-    }
-
-    return false;
-  }
-
-  protected void historyChanged()
-  {
-    if (combo.isDisposed())
-    {
-      return;
-    }
-
-    combo.removeAll();
-    for (IHistoryElement<String> element : history)
-    {
-      combo.add(element.getData());
-    }
-
-    String mostRecent = history.getMostRecent();
-    if (mostRecent != null)
-    {
-      setText(mostRecent);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
deleted file mode 100644
index 79ea263f52..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.widgets;
-
-import org.eclipse.net4j.util.collection.IHistory;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * TODO extend BaseDialog
- * 
- * @author Eike Stepper
- */
-public class HistoryTextDialog extends InputDialog
-{
-  private static final String EMPTY = "";
-
-  private IHistory<String> history;
-
-  private String value = EMPTY;
-
-  private HistoryText historyText;
-
-  public HistoryTextDialog(Shell parentShell, String dialogTitle, String dialogMessage, IHistory<String> history,
-      IInputValidator validator)
-  {
-    super(parentShell, dialogTitle, dialogMessage, history.getMostRecent(), validator);
-    this.history = history;
-    value = super.getValue();
-  }
-
-  public IHistory<String> getHistory()
-  {
-    return history;
-  }
-
-  public HistoryText getHistoryText()
-  {
-    return historyText;
-  }
-
-  @Override
-  public String getValue()
-  {
-    return value;
-  }
-
-  @Override
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = (Composite)super.createDialogArea(parent);
-    Text text = getText();
-    text.setVisible(false);
-    text.setEnabled(false);
-
-    historyText = new HistoryText(composite, SWT.BORDER, history);
-    historyText.getCombo().moveAbove(text);
-    historyText.getCombo().setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-    historyText.getCombo().addModifyListener(new ModifyListener()
-    {
-      public void modifyText(ModifyEvent e)
-      {
-        validateInput();
-      }
-    });
-
-    text.addFocusListener(new FocusAdapter()
-    {
-      @Override
-      public void focusGained(FocusEvent e)
-      {
-        historyText.setFocus();
-      }
-    });
-
-    composite.getShell().layout(true);
-    return composite;
-  }
-
-  @Override
-  protected void buttonPressed(int buttonId)
-  {
-    if (IDialogConstants.OK_ID == buttonId)
-    {
-      value = historyText.getText();
-      okPressed();
-    }
-    else if (IDialogConstants.CANCEL_ID == buttonId)
-    {
-      value = null;
-      cancelPressed();
-    }
-  }
-
-  @Override
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    super.createButtonsForButtonBar(parent);
-    historyText.setFocus();
-    if (value != null)
-    {
-      historyText.setText(value);
-    }
-  }
-
-  @Override
-  protected void validateInput()
-  {
-    String errorMessage = null;
-    if (getValidator() != null)
-    {
-      errorMessage = getValidator().isValid(historyText.getText());
-    }
-    // Bug 16256: important not to treat "" (blank error) the same as null
-    // (no error)
-    setErrorMessage(errorMessage);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java
deleted file mode 100644
index 4bf72c5be8..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.widgets;
-
-import org.eclipse.net4j.util.io.IORuntimeException;
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.TextStyle;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class LogDialog extends BaseDialog<Viewer>
-{
-  private StringBuilder log = new StringBuilder();
-
-  private StyledText text;
-
-  private TextStyle textStyle;
-
-  private List<StyleRange> styleRanges = new ArrayList<StyleRange>();
-
-  private StyleRange currentStyleRange = new StyleRange();
-
-  private StyleRange lastStyleRange;
-
-  private Font font;
-
-  public LogDialog(Shell parentShell, int shellStyle, String title, String message, IDialogSettings settings)
-  {
-    super(parentShell, shellStyle, title, message, settings);
-  }
-
-  public LogDialog(Shell parentShell, String title, String message, IDialogSettings settings)
-  {
-    this(parentShell, DEFAULT_SHELL_STYLE, title, message, settings);
-  }
-
-  public TextStyle getTextStyle()
-  {
-    return textStyle;
-  }
-
-  public void setTextStyle(TextStyle textStyle)
-  {
-    if (textStyle == null)
-    {
-      throw new IllegalArgumentException("textStyle == null");
-    }
-
-    if (textStyle.equals(this.textStyle))
-    {
-      return;
-    }
-
-    lastStyleRange = currentStyleRange;
-    this.textStyle = textStyle;
-
-    currentStyleRange = new StyleRange();
-    currentStyleRange.start = log.length();
-    currentStyleRange.rise = textStyle.rise;
-    currentStyleRange.background = textStyle.background;
-    currentStyleRange.font = textStyle.font;
-    currentStyleRange.foreground = textStyle.foreground;
-    currentStyleRange.metrics = textStyle.metrics;
-    currentStyleRange.strikeout = textStyle.strikeout;
-    currentStyleRange.underline = textStyle.underline;
-  }
-
-  public void append(String text)
-  {
-    checkStyleRange();
-    log.append(text);
-    currentStyleRange.length += text.length();
-  }
-
-  public void append(Throwable t)
-  {
-    try
-    {
-      checkStyleRange();
-      ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-      String message = t.getMessage() + "\n";
-      bytes.write(message.getBytes());
-      t.printStackTrace(new PrintStream(bytes));
-
-      String text = bytes.toString();
-      log.append(text);
-      currentStyleRange.length += text.length();
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  @Override
-  public boolean close()
-  {
-    font.dispose();
-    return super.close();
-  }
-
-  @Override
-  protected void createUI(Composite parent)
-  {
-    GridLayout grid = new GridLayout();
-    grid.marginTop = 6;
-    grid.marginLeft = 6;
-    grid.marginRight = 6;
-    grid.marginBottom = 6;
-
-    Composite composite = new Composite(parent, SWT.NONE);
-    composite.setLayout(grid);
-    composite.setLayoutData(UIUtil.createGridData());
-
-    font = new Font(getShell().getDisplay(), "Courier New", 9, SWT.NORMAL);
-    checkStyleRange();
-    lastStyleRange = currentStyleRange;
-    checkStyleRange();
-
-    text = new StyledText(composite, SWT.MULTI | SWT.READ_ONLY | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-    text.setLayoutData(UIUtil.createGridData());
-    text.setText(log.toString());
-    text.setStyleRanges(styleRanges.toArray(new StyleRange[styleRanges.size()]));
-    text.setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_WHITE));
-    text.setFont(font);
-  }
-
-  @Override
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    createButton(parent, IDialogConstants.OK_ID, IDialogConstants.CLOSE_LABEL, true);
-  }
-
-  private void checkStyleRange()
-  {
-    if (lastStyleRange != null)
-    {
-      styleRanges.add(lastStyleRange);
-      lastStyleRange = null;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorDialog.java
deleted file mode 100644
index c8381ddf0b..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorDialog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.widgets;
-
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.om.monitor.MonitorUtil;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * @author Eike Stepper
- */
-public class MonitorDialog extends ProgressMonitorDialog
-{
-  public static final int DEFAULT_SHELL_STYLE = SWT.SHELL_TRIM;
-
-  private String title;
-
-  private IDialogSettings settings;
-
-  private MonitorLogDialog log;
-
-  public MonitorDialog(Shell parentShell, int shellStyle, String title, IDialogSettings settings)
-  {
-    super(parentShell);
-    setShellStyle(shellStyle);
-    this.title = title;
-    this.settings = settings;
-  }
-
-  public MonitorDialog(Shell parentShell, String title, IDialogSettings settings)
-  {
-    this(parentShell, DEFAULT_SHELL_STYLE, title, settings);
-  }
-
-  public void run(boolean fork, boolean cancelable, final Runnable runnable)
-  {
-    try
-    {
-      log = new MonitorLogDialog(getShell(), getShellStyle(), "Log of " + title, "See the log for details.", settings);
-      log.setEmphasizePrefix("Woven class ", "Mixed in ", "Reversioned ");
-
-      super.run(fork, cancelable, new IRunnableWithProgress()
-      {
-        public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-        {
-          MonitorUtil.Eclipse.startMonitoring(monitor, log);
-          try
-          {
-            runnable.run();
-          }
-          catch (RuntimeException ex)
-          {
-            log.append(ex);
-            throw ex;
-          }
-          finally
-          {
-            MonitorUtil.Eclipse.stopMonitoring();
-          }
-        }
-      });
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  @Override
-  protected void finishedRun()
-  {
-    super.finishedRun();
-    if (log != null)
-    {
-      log.open();
-    }
-  }
-
-  @Override
-  @Deprecated
-  public final void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable)
-      throws InvocationTargetException, InterruptedException
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  protected void configureShell(Shell newShell)
-  {
-    super.configureShell(newShell);
-    newShell.setText(title);
-  }
-
-  @Override
-  protected IDialogSettings getDialogBoundsSettings()
-  {
-    if (settings == null)
-    {
-      return null;
-    }
-
-    IDialogSettings section = settings.getSection(title);
-    if (section == null)
-    {
-      section = settings.addNewSection(title);
-    }
-
-    return section;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorLogDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorLogDialog.java
deleted file mode 100644
index 2837e5bf11..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorLogDialog.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.widgets;
-
-import org.eclipse.net4j.util.om.monitor.OMMonitorHandler;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.TextStyle;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Eike Stepper
- */
-public class MonitorLogDialog extends LogDialog implements OMMonitorHandler
-{
-  private String[] emphasizePrefix;
-
-  private TextStyle taskStyle;
-
-  private TextStyle normalStyle;
-
-  private TextStyle emphasizedStyle;
-
-  private TextStyle problemStyle;
-
-  public MonitorLogDialog(Shell parentShell, int shellStyle, String title, String message, IDialogSettings settings)
-  {
-    super(parentShell, shellStyle, title, message, settings);
-    Display display = Display.getCurrent();
-    taskStyle = new TextStyle(null, display.getSystemColor(SWT.COLOR_BLACK), null);
-    normalStyle = new TextStyle(null, display.getSystemColor(SWT.COLOR_DARK_GRAY), null);
-    emphasizedStyle = new TextStyle(null, display.getSystemColor(SWT.COLOR_BLUE), null);
-    problemStyle = new TextStyle(null, display.getSystemColor(SWT.COLOR_RED), null);
-  }
-
-  public MonitorLogDialog(Shell parentShell, String title, String message, IDialogSettings settings)
-  {
-    this(parentShell, DEFAULT_SHELL_STYLE, title, message, settings);
-  }
-
-  public String[] getEmphasizePrefix()
-  {
-    return emphasizePrefix;
-  }
-
-  public void setEmphasizePrefix(String... emphasizePrefix)
-  {
-    this.emphasizePrefix = emphasizePrefix;
-  }
-
-  public TextStyle getNormalStyle()
-  {
-    return normalStyle;
-  }
-
-  public TextStyle getTaskStyle()
-  {
-    return taskStyle;
-  }
-
-  public TextStyle getProblemStyle()
-  {
-    return problemStyle;
-  }
-
-  public TextStyle getEmphasizedStyle()
-  {
-    return emphasizedStyle;
-  }
-
-  public void handleTask(String task, int level)
-  {
-    setTextStyle(taskStyle);
-    append(task);
-    append("\n");
-  }
-
-  public void handleMessage(String msg, int level)
-  {
-    boolean emphasized = false;
-    if (emphasizePrefix != null)
-    {
-      for (String prefix : emphasizePrefix)
-      {
-        if (msg.startsWith(prefix))
-        {
-          setTextStyle(emphasizedStyle);
-          emphasized = true;
-          break;
-        }
-      }
-    }
-
-    if (!emphasized)
-    {
-      setTextStyle(normalStyle);
-    }
-
-    append(msg);
-    append("\n");
-  }
-
-  @Override
-  public void append(Throwable t)
-  {
-    setTextStyle(problemStyle);
-    super.append(t);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/PreferenceButton.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/PreferenceButton.java
deleted file mode 100644
index 09c38376cb..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/PreferenceButton.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.widgets;
-
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Eike Stepper
- */
-public class PreferenceButton
-{
-  private OMPreference<Boolean> preference;
-
-  private Button button;
-
-  public PreferenceButton(Composite parent, int style, String text, final OMPreference<Boolean> preference)
-  {
-    this.preference = preference;
-
-    button = new Button(parent, style);
-    button.setText(text);
-    button.setSelection(preference.getValue());
-    button.addSelectionListener(new SelectionAdapter()
-    {
-      @Override
-      public void widgetSelected(SelectionEvent e)
-      {
-        preference.setValue(button.getSelection());
-      }
-    });
-  }
-
-  public OMPreference<Boolean> getPreference()
-  {
-    return preference;
-  }
-
-  public Button getButton()
-  {
-    return button;
-  }
-
-  public int getAlignment()
-  {
-    return button.getAlignment();
-  }
-
-  public Image getImage()
-  {
-    return button.getImage();
-  }
-
-  public boolean getSelection(boolean setPreference)
-  {
-    boolean selection = button.getSelection();
-    if (setPreference)
-    {
-      preference.setValue(selection);
-    }
-
-    return selection;
-  }
-
-  public boolean getSelection()
-  {
-    return getSelection(false);
-  }
-
-  public String getText()
-  {
-    return button.getText();
-  }
-
-  public void setAlignment(int alignment)
-  {
-    button.setAlignment(alignment);
-  }
-
-  public void setImage(Image image)
-  {
-    button.setImage(image);
-  }
-
-  public void setSelection(boolean selected)
-  {
-    button.setSelection(selected);
-  }
-
-  public void setText(String string)
-  {
-    button.setText(string);
-  }
-
-  public boolean setFocus()
-  {
-    return button.setFocus();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SashComposite.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SashComposite.java
deleted file mode 100644
index b60e63e6ea..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SashComposite.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.widgets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Sash;
-
-public abstract class SashComposite extends Composite
-{
-  private boolean vertical;
-
-  private FormLayout form;
-
-  private Sash sash;
-
-  private Control control1;
-
-  private Control control2;
-
-  private FormData sashData;
-
-  private FormData control1Data;
-
-  private FormData control2Data;
-
-  private int limit;
-
-  private int percent;
-
-  public SashComposite(Composite parent, int style, int limit, int percent)
-  {
-    this(parent, style, limit, percent, true);
-  }
-
-  public SashComposite(Composite parent, int style, int limit, int percent, boolean vertical)
-  {
-    super(parent, style);
-    this.vertical = vertical;
-    this.limit = limit;
-    this.percent = percent;
-
-    form = new FormLayout();
-    setLayout(form);
-
-    control1Data = new FormData();
-    control1 = createControl1(this);
-    control1.setLayoutData(control1Data);
-
-    sashData = new FormData();
-    sash = createSash(this);
-    sash.setLayoutData(sashData);
-
-    control2Data = new FormData();
-    control2 = createControl2(this);
-    control2.setLayoutData(control2Data);
-
-    init();
-  }
-
-  public boolean isVertical()
-  {
-    return vertical;
-  }
-
-  public void setVertical(boolean vertical)
-  {
-    if (this.vertical != vertical)
-    {
-      this.vertical = vertical;
-
-      Sash newSash = createSash(this);
-      newSash.moveBelow(control1);
-      newSash.setLayoutData(sash.getLayoutData());
-
-      sash.setLayoutData(null);
-      sash.dispose();
-      sash = newSash;
-
-      init();
-      layout();
-    }
-  }
-
-  public Sash getSash()
-  {
-    return sash;
-  }
-
-  public Control getControl1()
-  {
-    return control1;
-  }
-
-  public Control getControl2()
-  {
-    return control2;
-  }
-
-  protected void init()
-  {
-    control1Data.left = new FormAttachment(0, 0);
-    control1Data.right = new FormAttachment(sash, 0);
-    control1Data.top = new FormAttachment(0, 0);
-    control1Data.bottom = new FormAttachment(100, 0);
-
-    sashData.left = new FormAttachment(percent, 0);
-    sashData.right = null;
-    sashData.top = new FormAttachment(0, 0);
-    sashData.bottom = new FormAttachment(100, 0);
-
-    control2Data.left = new FormAttachment(sash, 0);
-    control2Data.right = new FormAttachment(100, 0);
-    control2Data.top = new FormAttachment(0, 0);
-    control2Data.bottom = new FormAttachment(100, 0);
-
-    if (!vertical)
-    {
-      swap();
-    }
-  }
-
-  protected void swap()
-  {
-    swap(control1Data);
-    swap(sashData);
-    swap(control2Data);
-  }
-
-  protected void swap(FormData formData)
-  {
-    FormAttachment tmp = formData.left;
-    formData.left = formData.top;
-    formData.top = tmp;
-
-    tmp = formData.right;
-    formData.right = formData.bottom;
-    formData.bottom = tmp;
-  }
-
-  protected Sash createSash(Composite parent)
-  {
-    Sash sash = new Sash(parent, vertical ? SWT.VERTICAL : SWT.HORIZONTAL);
-    sash.addListener(SWT.Selection, new SashListener());
-    return sash;
-  }
-
-  protected abstract Control createControl1(Composite parent);
-
-  protected abstract Control createControl2(Composite parent);
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class SashListener implements Listener
-  {
-    public SashListener()
-    {
-    }
-
-    public void handleEvent(Event e)
-    {
-      Rectangle sashRect = sash.getBounds();
-      Rectangle shellRect = SashComposite.this.getClientArea();
-      if (vertical)
-      {
-        int right = shellRect.width - sashRect.width - limit;
-        e.x = Math.max(Math.min(e.x, right), limit);
-        if (e.x != sashRect.x)
-        {
-          sashData.left = new FormAttachment(0, e.x);
-          SashComposite.this.layout();
-        }
-      }
-      else
-      {
-        int bottom = shellRect.height - sashRect.height - limit;
-        e.y = Math.max(Math.min(e.y, bottom), limit);
-        if (e.y != sashRect.y)
-        {
-          sashData.top = new FormAttachment(0, e.y);
-          SashComposite.this.layout();
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java
deleted file mode 100644
index 0d75ac8874..0000000000
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ui.widgets;
-
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.ui.UIUtil;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-
-public class TextAndDisable extends Composite implements SelectionListener, ModifyListener
-{
-  private Text text;
-
-  private Button disabled;
-
-  private String disabledValue;
-
-  public TextAndDisable(Composite parent, int textStyle, String disabledValue)
-  {
-    super(parent, SWT.NONE);
-    this.disabledValue = disabledValue;
-
-    GridLayout grid = new GridLayout(2, false);
-    grid.marginHeight = 0;
-    grid.marginWidth = 0;
-    setLayout(grid);
-
-    text = createText(textStyle);
-    text.setLayoutData(createTextLayoutData());
-    text.addModifyListener(this);
-
-    disabled = createButton();
-    disabled.setText("Disabled");
-    disabled.addSelectionListener(this);
-    disabled.setLayoutData(UIUtil.createGridData(false, false));
-  }
-
-  public Text getText()
-  {
-    return text;
-  }
-
-  public Button getButton()
-  {
-    return disabled;
-  }
-
-  public boolean isDisabled()
-  {
-    return disabled.getSelection();
-  }
-
-  public void setDisabled(boolean disabled)
-  {
-    this.disabled.setSelection(disabled);
-    widgetSelected(null);
-  }
-
-  public String getValue()
-  {
-    return text.getText();
-  }
-
-  public void setValue(String value)
-  {
-    text.setText(value);
-    setDisabled(ObjectUtil.equals(value, disabledValue));
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-    widgetSelected(e);
-  }
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (isDisabled())
-    {
-      text.setText(disabledValue);
-      text.setEnabled(false);
-    }
-    else
-    {
-      text.setEnabled(true);
-    }
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-  }
-
-  protected Text createText(int textStyle)
-  {
-    return new Text(this, textStyle);
-  }
-
-  protected GridData createTextLayoutData()
-  {
-    GridData gd = new GridData();
-    gd.widthHint = 32;
-    return gd;
-  }
-
-  protected Button createButton()
-  {
-    return new Button(this, SWT.CHECK);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/.classpath b/plugins/org.eclipse.net4j.util/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j.util/.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.util/.cvsignore b/plugins/org.eclipse.net4j.util/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/plugins/org.eclipse.net4j.util/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.net4j.util/.options b/plugins/org.eclipse.net4j.util/.options
deleted file mode 100644
index e9f60751c1..0000000000
--- a/plugins/org.eclipse.net4j.util/.options
+++ /dev/null
@@ -1,8 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j.util/debug = true
-org.eclipse.net4j.util/debug.lifecycle = true
-org.eclipse.net4j.util/debug.lifecycle.dump = true
-org.eclipse.net4j.util/debug.concurrency = true
-org.eclipse.net4j.util/debug.registry = true
-org.eclipse.net4j.util/debug.om = true
diff --git a/plugins/org.eclipse.net4j.util/.project b/plugins/org.eclipse.net4j.util/.project
deleted file mode 100644
index b52e9e4cf3..0000000000
--- a/plugins/org.eclipse.net4j.util/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j.util</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8cd72edec0..0000000000
--- a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,272 +0,0 @@
-#Sat Feb 23 10:44:51 CET 2008
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ee9f8ba771..0000000000
--- a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sat Feb 23 10:44:51 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
deleted file mode 100644
index 1dbb4473e8..0000000000
--- a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,53 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j.util;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.internal.util.bundle.OM$Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional
-Import-Package: org.eclipse.osgi.service.debug;version="1.0.0";resolution:=optional,
- org.osgi.framework;version="1.3.0";resolution:=optional,
- org.osgi.service.log;version="1.3.0";resolution:=optional,
- org.osgi.util.tracker;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.util.bundle;version="0.8.0";x-internal:=true,
- org.eclipse.net4j.internal.util.cache;version="0.8.0",
- org.eclipse.net4j.internal.util.collection;version="0.8.0",
- org.eclipse.net4j.internal.util.concurrent;version="0.8.0",
- org.eclipse.net4j.internal.util.container;version="0.8.0",
- org.eclipse.net4j.internal.util.container.delegate;version="0.8.0",
- org.eclipse.net4j.internal.util.event;version="0.8.0",
- org.eclipse.net4j.internal.util.factory;version="0.8.0",
- org.eclipse.net4j.internal.util.lifecycle;version="0.8.0",
- org.eclipse.net4j.internal.util.om;version="0.8.0",
- org.eclipse.net4j.internal.util.om.log;version="0.8.0",
- org.eclipse.net4j.internal.util.om.monitor;version="0.8.0",
- org.eclipse.net4j.internal.util.om.pref;version="0.8.0",
- org.eclipse.net4j.internal.util.om.trace;version="0.8.0",
- org.eclipse.net4j.internal.util.registry;version="0.8.0",
- org.eclipse.net4j.internal.util.security;version="0.8.0",
- org.eclipse.net4j.internal.util.transaction;version="0.8.0",
- org.eclipse.net4j.util;version="0.8.0",
- org.eclipse.net4j.util.cache;version="0.8.0",
- org.eclipse.net4j.util.collection;version="0.8.0",
- org.eclipse.net4j.util.concurrent;version="0.8.0",
- org.eclipse.net4j.util.container;version="0.8.0",
- org.eclipse.net4j.util.container.delegate;version="0.8.0",
- org.eclipse.net4j.util.event;version="0.8.0",
- org.eclipse.net4j.util.factory;version="0.8.0",
- org.eclipse.net4j.util.fsm;version="0.8.0",
- org.eclipse.net4j.util.io;version="0.8.0",
- org.eclipse.net4j.util.lifecycle;version="0.8.0",
- org.eclipse.net4j.util.om;version="0.8.0",
- org.eclipse.net4j.util.om.log;version="0.8.0",
- org.eclipse.net4j.util.om.monitor;version="0.8.0",
- org.eclipse.net4j.util.om.pref;version="0.8.0",
- org.eclipse.net4j.util.om.trace;version="0.8.0",
- org.eclipse.net4j.util.ref;version="0.8.0",
- org.eclipse.net4j.util.registry;version="0.8.0",
- org.eclipse.net4j.util.security;version="0.8.0",
- org.eclipse.net4j.util.transaction;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.util/about.html b/plugins/org.eclipse.net4j.util/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.net4j.util/about.html
+++ /dev/null
@@ -1,28 +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.util/build.properties b/plugins/org.eclipse.net4j.util/build.properties
deleted file mode 100644
index e87d00dfbb..0000000000
--- a/plugins/org.eclipse.net4j.util/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.properties,\
-               plugin.xml,\
-               schema/
diff --git a/plugins/org.eclipse.net4j.util/copyright.txt b/plugins/org.eclipse.net4j.util/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j.util/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/epl-v10.html b/plugins/org.eclipse.net4j.util/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.util/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/license.html b/plugins/org.eclipse.net4j.util/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j.util/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/plugin.properties b/plugins/org.eclipse.net4j.util/plugin.properties
deleted file mode 100644
index e872a4035d..0000000000
--- a/plugins/org.eclipse.net4j.util/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j Utilities (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j.util/plugin.xml b/plugins/org.eclipse.net4j.util/plugin.xml
deleted file mode 100644
index 93c3cf6119..0000000000
--- a/plugins/org.eclipse.net4j.util/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension-point id="factories" name="Factories" schema="schema/factories.exsd"/>
-   <extension-point id="elementProcessors" name="Element Processors" schema="schema/elementProcessors.exsd"/>
-   
-   <extension
-         point="org.eclipse.net4j.util.factories">
-      <factory
-            productGroup="org.eclipse.net4j.randomizers"
-            type="default"
-            class="org.eclipse.net4j.internal.util.security.RandomizerFactory"/>
-      <factory
-            productGroup="org.eclipse.net4j.userManagers"
-            type="file"
-            class="org.eclipse.net4j.internal.util.security.FileUserManagerFactory"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j.util/schema/elementProcessors.exsd b/plugins/org.eclipse.net4j.util/schema/elementProcessors.exsd
deleted file mode 100644
index 12f3cef7b1..0000000000
--- a/plugins/org.eclipse.net4j.util/schema/elementProcessors.exsd
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.net4j.util">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.net4j.util" id="elementProcessors" name="Element Processors"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="elementProcessor" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="elementProcessor">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.net4j.util/schema/factories.exsd b/plugins/org.eclipse.net4j.util/schema/factories.exsd
deleted file mode 100644
index 40fe74a3d2..0000000000
--- a/plugins/org.eclipse.net4j.util/schema/factories.exsd
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.net4j.util">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.net4j.util" id="factories" name="Factories"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="factory" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="factory">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="class"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="productGroup" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.net4j.util.factory.IFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
deleted file mode 100644
index 8cb775704a..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
-
-import org.eclipse.net4j.internal.util.om.log.Logger;
-import org.eclipse.net4j.internal.util.om.pref.Preferences;
-import org.eclipse.net4j.internal.util.om.trace.Tracer;
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractBundle implements OMBundle, OMBundle.DebugSupport, OMBundle.TranslationSupport
-{
-  private AbstractPlatform platform;
-
-  private String bundleID;
-
-  private Class<?> accessor;
-
-  private Object bundleContext;
-
-  private boolean debugging;
-
-  private boolean debuggingInitialized;
-
-  private Map<String, Tracer> tracers = new ConcurrentHashMap<String, Tracer>(0);
-
-  private OMLogger logger;
-
-  private Preferences preferences;
-
-  private ResourceBundle resourceBundle;
-
-  private ResourceBundle untranslatedResourceBundle;
-
-  private Map<String, String> strings = new HashMap<String, String>(0);
-
-  private Map<String, String> untranslatedStrings = new HashMap<String, String>(0);
-
-  private boolean shouldTranslate = true;
-
-  public AbstractBundle(AbstractPlatform platform, String bundleID, Class<?> accessor)
-  {
-    this.platform = platform;
-    this.bundleID = bundleID;
-    this.accessor = accessor;
-  }
-
-  public OMPlatform getPlatform()
-  {
-    return platform;
-  }
-
-  public String getBundleID()
-  {
-    return bundleID;
-  }
-
-  public Class<?> getAccessor()
-  {
-    return accessor;
-  }
-
-  public Object getBundleContext()
-  {
-    return bundleContext;
-  }
-
-  public void setBundleContext(Object bundleContext)
-  {
-    this.bundleContext = bundleContext;
-  }
-
-  public DebugSupport getDebugSupport()
-  {
-    return this;
-  }
-
-  public TranslationSupport getTranslationSupport()
-  {
-    return this;
-  }
-
-  public boolean isDebugging()
-  {
-    if (!platform.isDebugging())
-    {
-      return false;
-    }
-
-    if (!debuggingInitialized)
-    {
-      debugging = getDebugOption("debug", false); //$NON-NLS-1$
-      debuggingInitialized = true;
-    }
-
-    return debugging;
-  }
-
-  public void setDebugging(boolean debugging)
-  {
-    this.debugging = debugging;
-  }
-
-  public String getDebugOption(String option, String defaultValue)
-  {
-    String value = getDebugOption(option);
-    return value == null ? defaultValue : value;
-  }
-
-  public boolean getDebugOption(String option, boolean defaultValue)
-  {
-    String value = getDebugOption(option);
-    return value == null ? defaultValue : Boolean.parseBoolean(value);
-  }
-
-  public void setDebugOption(String option, boolean value)
-  {
-    setDebugOption(option, Boolean.toString(value));
-  }
-
-  public int getDebugOption(String option, int defaultValue)
-  {
-    try
-    {
-      String value = getDebugOption(option);
-      return value == null ? defaultValue : Integer.parseInt(value);
-    }
-    catch (NumberFormatException e)
-    {
-      return defaultValue;
-    }
-  }
-
-  public void setDebugOption(String option, int value)
-  {
-    setDebugOption(option, Integer.toString(value));
-  }
-
-  public String getDebugOption(String option)
-  {
-    return platform.getDebugOption(bundleID, option);
-  }
-
-  public void setDebugOption(String option, String value)
-  {
-    platform.setDebugOption(bundleID, option, value);
-  }
-
-  public synchronized OMTracer tracer(String name)
-  {
-    OMTracer tracer = tracers.get(name);
-    if (tracer == null)
-    {
-      tracer = createTracer(name);
-    }
-
-    return tracer;
-  }
-
-  public synchronized OMLogger logger()
-  {
-    if (logger == null)
-    {
-      logger = createLogger();
-    }
-
-    return logger;
-  }
-
-  public File getConfigFile()
-  {
-    return platform.getConfigFile(getConfigFileName());
-  }
-
-  public Properties getConfigProperties()
-  {
-    return platform.getConfigProperties(getConfigFileName());
-  }
-
-  public synchronized Preferences preferences()
-  {
-    if (preferences == null)
-    {
-      preferences = new Preferences(this);
-    }
-
-    return preferences;
-  }
-
-  public InputStream getInputStream(String path) throws IOException
-  {
-    String base = getBaseURL().toString();
-    if (!path.startsWith("/"))
-    {
-      base += "/";
-    }
-
-    URL url = new URL(base + path);
-    return url.openStream();
-  }
-
-  public boolean shouldTranslate()
-  {
-    return shouldTranslate;
-  }
-
-  public void setShouldTranslate(boolean shouldTranslate)
-  {
-    this.shouldTranslate = shouldTranslate;
-  }
-
-  public String getString(String key, boolean translate)
-  {
-    Map<String, String> stringMap = translate ? strings : untranslatedStrings;
-    String result = stringMap.get(key);
-    if (result == null)
-    {
-
-      ResourceBundle bundle = translate ? resourceBundle : untranslatedResourceBundle;
-      if (bundle == null)
-      {
-        String packageName = ReflectUtil.getPackageName(accessor);
-        if (translate)
-        {
-          try
-          {
-            bundle = resourceBundle = ResourceBundle.getBundle(packageName + ".plugin"); //$NON-NLS-1$
-          }
-          catch (MissingResourceException exception)
-          {
-            // If the bundle can't be found the normal way, try to find it as
-            // the base URL. If that also doesn't work, rethrow the original
-            // exception.
-            InputStream inputStream = null;
-            try
-            {
-              inputStream = getInputStream("plugin.properties"); //$NON-NLS-1$
-              bundle = new PropertyResourceBundle(inputStream);
-              untranslatedResourceBundle = resourceBundle = bundle;
-              inputStream.close();
-            }
-            catch (IOException ignore)
-            {
-              ;
-            }
-            finally
-            {
-              IOUtil.closeSilent(inputStream);
-            }
-
-            if (resourceBundle == null)
-            {
-              throw exception;
-            }
-          }
-        }
-        else
-        {
-          InputStream inputStream = null;
-
-          try
-          {
-            inputStream = getInputStream("plugin.properties"); //$NON-NLS-1$
-            bundle = untranslatedResourceBundle = new PropertyResourceBundle(inputStream);
-            inputStream.close();
-          }
-          catch (IOException ioException)
-          {
-            throw new MissingResourceException("Missing resource: plugin.properties", accessor //$NON-NLS-1$
-                .getName(), key);
-          }
-          finally
-          {
-            IOUtil.closeSilent(inputStream);
-          }
-        }
-      }
-
-      result = bundle.getString(key);
-      stringMap.put(key, result);
-    }
-
-    return result;
-  }
-
-  public String getString(String key)
-  {
-    return getString(key, shouldTranslate());
-  }
-
-  public String getString(String key, Object... args)
-  {
-    return getString(key, shouldTranslate(), args);
-  }
-
-  public String getString(String key, boolean translate, Object... args)
-  {
-    return MessageFormat.format(getString(key, translate), args);
-  }
-
-  @Override
-  public String toString()
-  {
-    return bundleID;
-  }
-
-  public void start() throws Exception
-  {
-    invokeMethod("start");
-  }
-
-  public void stop() throws Exception
-  {
-    try
-    {
-      if (preferences != null)
-      {
-        preferences.save();
-      }
-    }
-    catch (RuntimeException ex)
-    {
-      OM.LOG.error(ex);
-    }
-
-    invokeMethod("stop");
-  }
-
-  protected OMTracer createTracer(String name)
-  {
-    return new Tracer(this, name);
-  }
-
-  protected OMLogger createLogger()
-  {
-    return new Logger(this);
-  }
-
-  protected String getConfigFileName()
-  {
-    return bundleID + ".properties";
-  }
-
-  private void invokeMethod(String name) throws Exception
-  {
-    try
-    {
-      Method method = accessor.getDeclaredMethod(name, ReflectUtil.NO_PARAMETERS);
-      if (!method.isAccessible())
-      {
-        method.setAccessible(true);
-      }
-
-      method.invoke(null, ReflectUtil.NO_ARGUMENTS);
-    }
-    catch (NoSuchMethodException ignore)
-    {
-    }
-    catch (IllegalAccessException ignore)
-    {
-    }
-    catch (InvocationTargetException ex)
-    {
-      Throwable targetException = ex.getTargetException();
-      if (targetException instanceof Exception)
-      {
-        throw (Exception)targetException;
-      }
-      else if (targetException instanceof Error)
-      {
-        throw (Error)targetException;
-      }
-      else
-      {
-        OM.LOG.error(targetException);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
deleted file mode 100644
index 172927f6f8..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
-
-import org.eclipse.net4j.internal.util.om.LegacyPlatform;
-import org.eclipse.net4j.internal.util.om.OSGiPlatform;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.OMLogHandler;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.log.OMLogger.Level;
-import org.eclipse.net4j.util.om.trace.OMTraceHandler;
-import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractPlatform implements OMPlatform
-{
-  public static final String SYSTEM_PROPERTY_OSGI_STATE = "osgi.instance.area"; //$NON-NLS-1$
-
-  public static final String SYSTEM_PROPERTY_NET4J_STATE = "net4j.state"; //$NON-NLS-1$
-
-  public static final String SYSTEM_PROPERTY_NET4J_CONFIG = "net4j.config"; //$NON-NLS-1$
-
-  static Object systemContext;
-
-  private static ContextTracer __TRACER__;
-
-  private Map<String, AbstractBundle> bundles = new ConcurrentHashMap<String, AbstractBundle>(0);
-
-  private Queue<OMLogHandler> logHandlers = new ConcurrentLinkedQueue<OMLogHandler>();
-
-  private Queue<OMTraceHandler> traceHandlers = new ConcurrentLinkedQueue<OMTraceHandler>();
-
-  private boolean debugging;
-
-  protected AbstractPlatform()
-  {
-    debugging = Boolean.parseBoolean(System.getProperty("debug", "false")); //$NON-NLS-1$ //$NON-NLS-2$
-  }
-
-  public synchronized OMBundle bundle(String bundleID, Class<?> accessor)
-  {
-    OMBundle bundle = bundles.get(bundleID);
-    if (bundle == null)
-    {
-      bundle = createBundle(bundleID, accessor);
-    }
-
-    return bundle;
-  }
-
-  public void addLogHandler(OMLogHandler logHandler)
-  {
-    if (!logHandlers.contains(logHandler))
-    {
-      logHandlers.add(logHandler);
-    }
-  }
-
-  public void removeLogHandler(OMLogHandler logHandler)
-  {
-    logHandlers.remove(logHandler);
-  }
-
-  public void addTraceHandler(OMTraceHandler traceHandler)
-  {
-    if (!traceHandlers.contains(traceHandler))
-    {
-      traceHandlers.add(traceHandler);
-    }
-  }
-
-  public void removeTraceHandler(OMTraceHandler traceHandler)
-  {
-    traceHandlers.remove(traceHandler);
-  }
-
-  public boolean isDebugging()
-  {
-    return debugging;
-  }
-
-  public void setDebugging(boolean debugging)
-  {
-    this.debugging = debugging;
-  }
-
-  public File getStateFolder()
-  {
-    String state = System.getProperty(SYSTEM_PROPERTY_NET4J_STATE);
-    if (state == null)
-    {
-      state = System.getProperty(SYSTEM_PROPERTY_OSGI_STATE);
-      if (state == null)
-      {
-        state = "state";
-      }
-      else
-      {
-        state += ".metadata";
-      }
-    }
-
-    File stateFolder = new File(state);
-    if (!stateFolder.exists())
-    {
-      if (!stateFolder.mkdirs())
-      {
-        OM.LOG.error("State folder " + stateFolder.getAbsolutePath() + " could not be created");
-        return null;
-      }
-    }
-
-    if (!stateFolder.isDirectory())
-    {
-      OM.LOG.error("State folder " + stateFolder.getAbsolutePath() + " is not a directoy");
-      return null;
-    }
-
-    return stateFolder;
-  }
-
-  public File getConfigFolder()
-  {
-    String config = System.getProperty(SYSTEM_PROPERTY_NET4J_CONFIG, "config");
-    File configFolder = new File(config);
-    if (!configFolder.exists())
-    {
-      if (!configFolder.mkdirs())
-      {
-        OM.LOG.error("Config folder " + configFolder.getAbsolutePath() + " could not be created");
-        return null;
-      }
-    }
-
-    if (!configFolder.isDirectory())
-    {
-      OM.LOG.error("Config folder " + configFolder.getAbsolutePath() + " is not a directoy");
-      return null;
-    }
-
-    return configFolder;
-  }
-
-  public File getConfigFile(String name)
-  {
-    File configFolder = getConfigFolder();
-    if (configFolder == null)
-    {
-      return null;
-    }
-
-    return new File(configFolder, name);
-  }
-
-  public Properties getConfigProperties(String name)
-  {
-    File configFile = getConfigFile(name);
-    if (configFile == null)
-    {
-      return null;
-    }
-
-    FileInputStream fis = null;
-    try
-    {
-      fis = new FileInputStream(configFile);
-      Properties properties = new Properties();
-      properties.load(fis);
-      return properties;
-    }
-    catch (IOException ex)
-    {
-      OM.LOG.error("Config file " + configFile.getAbsolutePath() + " could not be read");
-      return null;
-    }
-    finally
-    {
-      IOUtil.closeSilent(fis);
-    }
-  }
-
-  public void log(OMLogger logger, Level level, String msg, Throwable t)
-  {
-    for (OMLogHandler logHandler : logHandlers)
-    {
-      try
-      {
-        logHandler.logged(logger, level, msg, t);
-      }
-      catch (Exception ex)
-      {
-        if (TRACER().isEnabled())
-        {
-          TRACER().trace(ex);
-        }
-      }
-    }
-  }
-
-  public void trace(OMTraceHandlerEvent event)
-  {
-    for (OMTraceHandler traceHandler : traceHandlers)
-    {
-      try
-      {
-        traceHandler.traced(event);
-      }
-      catch (Exception ex)
-      {
-        if (TRACER().isEnabled())
-        {
-          TRACER().trace(ex);
-        }
-      }
-    }
-  }
-
-  protected Map<String, AbstractBundle> getBundles()
-  {
-    return bundles;
-  }
-
-  protected abstract OMBundle createBundle(String bundleID, Class<?> accessor);
-
-  protected abstract String getDebugOption(String bundleID, String option);
-
-  protected abstract void setDebugOption(String bundleID, String option, String value);
-
-  /**
-   * TODO Make configurable via system property
-   */
-  public static synchronized OMPlatform createPlatform()
-  {
-    try
-    {
-      if (systemContext != null)
-      {
-        return new OSGiPlatform(systemContext);
-      }
-
-      return new LegacyPlatform();
-    }
-    catch (Exception ex)
-    {
-      if (TRACER().isEnabled())
-      {
-        TRACER().trace(ex);
-      }
-    }
-
-    return null;
-  }
-
-  private static ContextTracer TRACER()
-  {
-    if (__TRACER__ == null)
-    {
-      __TRACER__ = new ContextTracer(OM.DEBUG_OM, AbstractPlatform.class);
-    }
-
-    return __TRACER__;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
deleted file mode 100644
index 9aa054abcf..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
-
-import org.eclipse.net4j.internal.util.container.PluginContainer;
-import org.eclipse.net4j.internal.util.om.OSGiBundle;
-import org.eclipse.net4j.internal.util.om.log.EclipseLoggingBridge;
-import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j.util"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_LIFECYCLE = DEBUG.tracer("lifecycle"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_LIFECYCLE_DUMP = DEBUG_LIFECYCLE.tracer("dump"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_CONCURRENCY = DEBUG.tracer("concurrency"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_REGISTRY = DEBUG.tracer("registry"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_OM = DEBUG.tracer("om"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OM, OM.class);
-
-  static void stop() throws Exception
-  {
-    PluginContainer.dispose();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator implements BundleActivator
-  {
-    public void start(BundleContext context) throws Exception
-    {
-      AbstractPlatform.systemContext = context;
-      OM.BUNDLE.setBundleContext(context);
-      ((OSGiBundle)OM.BUNDLE).start();
-
-      // TODO Make configurable
-      PrintTraceHandler.CONSOLE.setPattern("{6} [{0}] {5}");
-      AbstractPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-      AbstractPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
-
-      try
-      {
-        AbstractPlatform.INSTANCE.addLogHandler(EclipseLoggingBridge.INSTANCE);
-      }
-      catch (Exception ignore)
-      {
-      }
-
-      traceStart(context);
-      IPluginContainer container = IPluginContainer.INSTANCE;
-      if (TRACER.isEnabled()) TRACER.format("Plugin container created: {0}", container);
-    }
-
-    public void stop(BundleContext context) throws Exception
-    {
-      traceStop(context);
-      ((OSGiBundle)OM.BUNDLE).stop();
-      OM.BUNDLE.setBundleContext(null);
-      AbstractPlatform.systemContext = null;
-    }
-
-    public static void traceStart(BundleContext context)
-    {
-      try
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.format("Starting bundle {0}", context.getBundle().getSymbolicName());
-        }
-      }
-      catch (RuntimeException ignore)
-      {
-      }
-    }
-
-    public static void traceStop(BundleContext context)
-    {
-      try
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.format("Stopping bundle {0}", context.getBundle().getSymbolicName());
-        }
-      }
-      catch (RuntimeException ignore)
-      {
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/Cache.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/Cache.java
deleted file mode 100644
index 5f8f84a93d..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/Cache.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.cache;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.lifecycle.Worker;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.cache.ICache;
-import org.eclipse.net4j.util.cache.ICacheMonitor;
-import org.eclipse.net4j.util.cache.ICacheProbe;
-
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Cache<E> extends Worker implements ICache
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, Cache.class);
-
-  private ICacheMonitor cacheMonitor;
-
-  private ICacheProbe cacheProbe;
-
-  private ReferenceQueue<E> referenceQueue = new ReferenceQueue<E>();
-
-  public Cache()
-  {
-  }
-
-  public ICacheMonitor getCacheMonitor()
-  {
-    return cacheMonitor;
-  }
-
-  public void setCacheMonitor(ICacheMonitor cacheMonitor)
-  {
-    this.cacheMonitor = cacheMonitor;
-  }
-
-  protected ICacheProbe getCacheProbe()
-  {
-    return cacheProbe;
-  }
-
-  protected ReferenceQueue<E> getReferenceQueue()
-  {
-    return referenceQueue;
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (cacheMonitor == null)
-    {
-      throw new IllegalStateException("cacheMonitor == null");
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    cacheProbe = cacheMonitor.registerCache(this);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    cacheMonitor.deregisterCache(this);
-    cacheProbe = null;
-    super.doDeactivate();
-  }
-
-  @Override
-  protected void work(WorkContext context) throws Exception
-  {
-    Reference<? extends E> reference = referenceQueue.remove(200);
-    if (reference != null)
-    {
-      unreachableElement(reference);
-    }
-  }
-
-  protected void unreachableElement(Reference<? extends E> reference)
-  {
-    E element = reference.get();
-    if (element != null)
-    {
-      unreachableElement(element);
-    }
-  }
-
-  protected void unreachableElement(E element)
-  {
-    if (TRACER.isEnabled()) TRACER.trace("Unreachable: " + element);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/CacheMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/CacheMonitor.java
deleted file mode 100644
index 36b6337fe2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/CacheMonitor.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.cache;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.event.Event;
-import org.eclipse.net4j.internal.util.lifecycle.Worker;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.ImplementationError;
-import org.eclipse.net4j.util.cache.ICache;
-import org.eclipse.net4j.util.cache.ICacheMonitor;
-import org.eclipse.net4j.util.cache.ICacheMonitorEvent;
-import org.eclipse.net4j.util.cache.ICacheRegistration;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class CacheMonitor extends Worker implements ICacheMonitor
-{
-  // percentFreeAllocated = Round((freeMemory / totalMemory) * 100);
-  // percentAllocated = Round((totalMemory / maxMemory ) * 100);
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, CacheMonitor.class);
-
-  private static final long DEFAULT_PAUSE_GREEN = 60L * 1000L; // 1 minute
-
-  private static final long DEFAULT_PAUSE_YELLOW = 5L * 1000L; // 5 seconds
-
-  private static final long DEFAULT_PAUSE_RED = 100L; // 100 milliseconds
-
-  private long pauseGREEN = DEFAULT_PAUSE_GREEN;
-
-  private long pauseYELLOW = DEFAULT_PAUSE_YELLOW;
-
-  private long pauseRED = DEFAULT_PAUSE_RED;
-
-  private ConditionPolicy conditionPolicy;
-
-  private Condition condition;
-
-  private Map<ICache, ICacheRegistration> registrations = new HashMap<ICache, ICacheRegistration>();
-
-  public CacheMonitor()
-  {
-  }
-
-  public long getPauseGREEN()
-  {
-    return pauseGREEN;
-  }
-
-  public void setPauseGREEN(long pauseGREEN)
-  {
-    this.pauseGREEN = pauseGREEN;
-  }
-
-  public long getPauseYELLOW()
-  {
-    return pauseYELLOW;
-  }
-
-  public void setPauseYELLOW(long pauseYELLOW)
-  {
-    this.pauseYELLOW = pauseYELLOW;
-  }
-
-  public long getPauseRED()
-  {
-    return pauseRED;
-  }
-
-  public void setPauseRED(long pauseRED)
-  {
-    this.pauseRED = pauseRED;
-  }
-
-  public ConditionPolicy getConditionPolicy()
-  {
-    return conditionPolicy;
-  }
-
-  public void setConditionPolicy(ConditionPolicy conditionPolicy)
-  {
-    this.conditionPolicy = conditionPolicy;
-  }
-
-  public Condition getCondition()
-  {
-    return condition;
-  }
-
-  public ICacheRegistration[] getRegistrations()
-  {
-    synchronized (registrations)
-    {
-      return registrations.values().toArray(new ICacheRegistration[registrations.size()]);
-    }
-  }
-
-  public ICacheRegistration registerCache(ICache cache)
-  {
-    if (TRACER.isEnabled()) TRACER.trace("Registering cache " + cache);
-    ICacheRegistration registration = new CacheRegistration(this, cache);
-    ICacheRegistration oldRegistration;
-    synchronized (registrations)
-    {
-      oldRegistration = registrations.put(cache, registration);
-    }
-
-    if (oldRegistration != null)
-    {
-      oldRegistration.dispose();
-    }
-
-    return registration;
-  }
-
-  public void deregisterCache(ICache cache)
-  {
-    ICacheRegistration registration;
-    synchronized (registrations)
-    {
-      registration = registrations.remove(cache);
-    }
-
-    if (registration != null)
-    {
-      registration.dispose();
-      if (TRACER.isEnabled()) TRACER.trace("Deregistered cache " + cache);
-    }
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (conditionPolicy == null)
-    {
-      throw new IllegalStateException("conditionPolicy == null");
-    }
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    for (ICacheRegistration registration : getRegistrations())
-    {
-      registration.dispose();
-    }
-
-    registrations.clear();
-    super.doDeactivate();
-  }
-
-  @Override
-  protected void work(WorkContext context) throws Exception
-  {
-    Condition newCondition = conditionPolicy.getNewCondition(condition);
-    setCondition(newCondition);
-
-    switch (newCondition)
-    {
-    case GREEN:
-      context.nextWork(pauseGREEN);
-      break;
-
-    case YELLOW:
-      context.nextWork(pauseYELLOW);
-      break;
-
-    case RED:
-      handleConditionRED();
-      context.nextWork(pauseRED);
-      break;
-    }
-  }
-
-  protected void setCondition(Condition newCondition)
-  {
-    if (newCondition == null)
-    {
-      throw new ImplementationError("newCondition == null");
-    }
-
-    Condition oldCondition = condition;
-    if (newCondition != oldCondition)
-    {
-      condition = newCondition;
-      fireEvent(new CacheMonitorEvent(oldCondition, newCondition));
-    }
-  }
-
-  protected void handleConditionRED()
-  {
-    System.err.println("CONDITION RED");
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class CacheMonitorEvent extends Event implements ICacheMonitorEvent
-  {
-    private static final long serialVersionUID = 1L;
-
-    private Condition oldCondition;
-
-    private Condition newCondition;
-
-    public CacheMonitorEvent(Condition oldCondition, Condition newCondition)
-    {
-      super(CacheMonitor.this);
-      this.oldCondition = oldCondition;
-      this.newCondition = newCondition;
-    }
-
-    public ICacheMonitor getCacheMonitor()
-    {
-      return CacheMonitor.this;
-    }
-
-    public Condition getOldCondition()
-    {
-      return oldCondition;
-    }
-
-    public Condition getNewCondition()
-    {
-      return newCondition;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/CacheRegistration.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/CacheRegistration.java
deleted file mode 100644
index 5323b42a28..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/CacheRegistration.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.cache;
-
-import org.eclipse.net4j.util.cache.ICache;
-import org.eclipse.net4j.util.cache.ICacheMonitor;
-import org.eclipse.net4j.util.cache.ICacheRegistration;
-
-/**
- * @author Eike Stepper
- */
-public class CacheRegistration implements ICacheRegistration
-{
-  public static final float DEFAULT_RECONSTRUCTION_COST_DECAY_FACTOR = 0.1f;
-
-  private ICacheMonitor cacheMonitor;
-
-  private ICache cache;
-
-  private int elementCount;
-
-  private long cacheSize;
-
-  private long reconstructionCost;
-
-  public CacheRegistration(ICacheMonitor cacheMonitor, ICache cache)
-  {
-    this.cacheMonitor = cacheMonitor;
-    this.cache = cache;
-  }
-
-  public void dispose()
-  {
-    cacheMonitor = null;
-    cache = null;
-  }
-
-  public boolean isDisposed()
-  {
-    return cacheMonitor == null || cache == null;
-  }
-
-  public ICacheMonitor getCacheMonitor()
-  {
-    return cacheMonitor;
-  }
-
-  public ICache getCache()
-  {
-    return cache;
-  }
-
-  public int getElementCount()
-  {
-    return elementCount;
-  }
-
-  public long getCacheSize()
-  {
-    return cacheSize;
-  }
-
-  public long getAverageElementSize()
-  {
-    return cacheSize / elementCount;
-  }
-
-  public long getReconstructionCost()
-  {
-    return reconstructionCost;
-  }
-
-  public void elementCached(int elementSize)
-  {
-    checkDisposal();
-    ++elementCount;
-    cacheSize += elementSize;
-  }
-
-  public void elementEvicted(int elementSize)
-  {
-    checkDisposal();
-    --elementCount;
-    cacheSize -= elementSize;
-  }
-
-  public void elementReconstructed(long reconstructionTime)
-  {
-    checkDisposal();
-    float decayFactor = getReconstructionCostDecayFactor();
-    this.reconstructionCost = (long)(decayFactor * this.reconstructionCost + (1 - decayFactor) * reconstructionTime);
-  }
-
-  protected float getReconstructionCostDecayFactor()
-  {
-    return DEFAULT_RECONSTRUCTION_COST_DECAY_FACTOR;
-  }
-
-  private void checkDisposal()
-  {
-    if (isDisposed())
-    {
-      throw new IllegalStateException("disposed");
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/HysteresisConditionPolicy.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/HysteresisConditionPolicy.java
deleted file mode 100644
index 3e420cc455..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/HysteresisConditionPolicy.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.cache;
-
-import org.eclipse.net4j.util.cache.ICacheMonitor.Condition;
-
-/**
- * @author Eike Stepper
- */
-public class HysteresisConditionPolicy extends ThresholdConditionPolicy
-{
-  private long thresholdYellowRed;
-
-  private long thresholdGreenYellow;
-
-  public HysteresisConditionPolicy(long thresholdYellowRed, long thresholdRedYellow, long thresholdGreenYellow,
-      long thresholdYellowGreen)
-  {
-    super(thresholdRedYellow, thresholdYellowGreen);
-    if (thresholdYellowRed > thresholdRedYellow)
-    {
-      throw new IllegalArgumentException("thresholdYellowRed > thresholdRedYellow");
-    }
-
-    if (thresholdRedYellow > thresholdGreenYellow)
-    {
-      throw new IllegalArgumentException("thresholdRedYellow > thresholdGreenYellow");
-    }
-
-    if (thresholdGreenYellow > thresholdYellowGreen)
-    {
-      throw new IllegalArgumentException("thresholdGreenYellow > thresholdYellowGreen");
-    }
-
-    this.thresholdGreenYellow = thresholdGreenYellow;
-    this.thresholdYellowRed = thresholdYellowRed;
-  }
-
-  public long getThresholdYellowRed()
-  {
-    return thresholdYellowRed;
-  }
-
-  public long getThresholdGreenYellow()
-  {
-    return thresholdGreenYellow;
-  }
-
-  @Override
-  protected Condition getNewCondition(Condition oldCondition, long freeMemory)
-  {
-    switch (oldCondition)
-    {
-    case GREEN:
-      if (freeMemory < thresholdYellowRed)
-      {
-        return Condition.RED;
-      }
-
-      if (freeMemory < thresholdGreenYellow)
-      {
-        return Condition.YELLOW;
-      }
-
-      return Condition.GREEN;
-
-    case YELLOW:
-      if (freeMemory < thresholdYellowRed)
-      {
-        return Condition.RED;
-      }
-
-      if (freeMemory > getThresholdYellowGreen())
-      {
-        return Condition.GREEN;
-      }
-
-      return Condition.YELLOW;
-
-    case RED:
-      if (freeMemory > getThresholdYellowGreen())
-      {
-        return Condition.GREEN;
-      }
-
-      if (freeMemory > getThresholdRedYellow())
-      {
-        return Condition.YELLOW;
-      }
-
-      return Condition.RED;
-
-    default:
-      throw new IllegalArgumentException("oldCondition == " + oldCondition);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/ThresholdConditionPolicy.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/ThresholdConditionPolicy.java
deleted file mode 100644
index 6342d7159b..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/cache/ThresholdConditionPolicy.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.cache;
-
-import org.eclipse.net4j.util.cache.ICacheMonitor;
-import org.eclipse.net4j.util.cache.ICacheMonitor.Condition;
-
-/**
- * @author Eike Stepper
- */
-public class ThresholdConditionPolicy implements ICacheMonitor.ConditionPolicy
-{
-  private long thresholdRedYellow;
-
-  private long thresholdYellowGreen;
-
-  public ThresholdConditionPolicy(long thresholdRedYellow, long thresholdYellowGreen)
-  {
-    if (thresholdRedYellow > thresholdYellowGreen)
-    {
-      throw new IllegalArgumentException("thresholdRedYellow > thresholdYellowGreen");
-    }
-
-    this.thresholdRedYellow = thresholdRedYellow;
-    this.thresholdYellowGreen = thresholdYellowGreen;
-  }
-
-  public long getThresholdRedYellow()
-  {
-    return thresholdRedYellow;
-  }
-
-  public long getThresholdYellowGreen()
-  {
-    return thresholdYellowGreen;
-  }
-
-  public Condition getNewCondition(Condition oldCondition)
-  {
-    return getNewCondition(oldCondition, Runtime.getRuntime().freeMemory());
-  }
-
-  protected Condition getNewCondition(Condition oldCondition, long freeMemory)
-  {
-    if (freeMemory > thresholdYellowGreen)
-    {
-      return Condition.GREEN;
-    }
-
-    if (freeMemory > thresholdRedYellow)
-    {
-      return Condition.YELLOW;
-    }
-
-    return Condition.RED;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HashBag.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HashBag.java
deleted file mode 100644
index f541ab5676..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HashBag.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.collection;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public final class HashBag<T> implements Set<T>
-{
-  private Map<T, HashBag.Counter> map;
-
-  public HashBag()
-  {
-    map = new HashMap<T, Counter>();
-  }
-
-  public HashBag(int initialCapacity, float loadFactor)
-  {
-    map = new HashMap<T, Counter>(initialCapacity, loadFactor);
-  }
-
-  public HashBag(int initialCapacity)
-  {
-    map = new HashMap<T, Counter>(initialCapacity);
-  }
-
-  public HashBag(Map<? extends T, ? extends HashBag.Counter> m)
-  {
-    map = new HashMap<T, Counter>(m);
-  }
-
-  public boolean add(T o)
-  {
-    HashBag.Counter counter = map.get(o);
-    if (counter == null)
-    {
-      counter = new Counter();
-      map.put(o, counter);
-      return true;
-    }
-
-    counter.incValue();
-    return false;
-  }
-
-  public boolean addAll(Collection<? extends T> c)
-  {
-    for (T t : c)
-    {
-      add(t);
-    }
-
-    return true;
-  }
-
-  public void clear()
-  {
-    map.clear();
-  }
-
-  public boolean contains(Object o)
-  {
-    return map.containsKey(o);
-  }
-
-  public boolean containsAll(Collection<?> c)
-  {
-    return map.keySet().containsAll(c);
-  }
-
-  public boolean isEmpty()
-  {
-    return map.isEmpty();
-  }
-
-  public Iterator<T> iterator()
-  {
-    return map.keySet().iterator();
-  }
-
-  public boolean remove(Object o)
-  {
-    HashBag.Counter counter = map.get(o);
-    if (counter == null)
-    {
-      return false;
-    }
-
-    if (counter.decValue() == 0)
-    {
-      map.remove(o);
-    }
-
-    return true;
-  }
-
-  public boolean removeAll(Collection<?> c)
-  {
-    boolean changed = false;
-    for (Object object : c)
-    {
-      if (remove(object))
-      {
-        changed = true;
-      }
-    }
-
-    return changed;
-  }
-
-  public boolean retainAll(Collection<?> c)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public int size()
-  {
-    return map.size();
-  }
-
-  public Object[] toArray()
-  {
-    return map.keySet().toArray();
-  }
-
-  @SuppressWarnings("hiding")
-  public <T> T[] toArray(T[] a)
-  {
-    return map.keySet().toArray(a);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class Counter
-  {
-    private int value = 1;
-
-    public Counter()
-    {
-    }
-
-    public int getValue()
-    {
-      return value;
-    }
-
-    public int incValue()
-    {
-      return ++value;
-    }
-
-    public int decValue()
-    {
-      return --value;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/History.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/History.java
deleted file mode 100644
index f6d3f61d9a..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/History.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.collection;
-
-import org.eclipse.net4j.internal.util.event.Notifier;
-import org.eclipse.net4j.util.collection.IHistory;
-import org.eclipse.net4j.util.collection.IHistoryChangeEvent;
-import org.eclipse.net4j.util.collection.IHistoryElement;
-import org.eclipse.net4j.util.event.INotifier;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class History<T> extends Notifier implements IHistory<T>
-{
-  protected List<IHistoryElement<T>> elements = new ArrayList<IHistoryElement<T>>(0);
-
-  private boolean loaded;
-
-  public History()
-  {
-  }
-
-  public List<IHistoryElement<T>> getElements()
-  {
-    lazyLoad();
-    return elements;
-  }
-
-  public void setElements(List<IHistoryElement<T>> newElements)
-  {
-    if (newElements == null)
-    {
-      newElements = new ArrayList<IHistoryElement<T>>(0);
-    }
-
-    if (!elements.equals(newElements))
-    {
-      elements = newElements;
-      changed();
-    }
-  }
-
-  public boolean isEmpty()
-  {
-    lazyLoad();
-    return elements.isEmpty();
-  }
-
-  public int size()
-  {
-    lazyLoad();
-    return elements.size();
-  }
-
-  public int indexOf(T data)
-  {
-    lazyLoad();
-    for (int i = 0; i < elements.size(); i++)
-    {
-      if (elements.get(i).getData().equals(data))
-      {
-        return i;
-      }
-    }
-
-    return -1;
-  }
-
-  public IHistoryElement<T> get(int index)
-  {
-    lazyLoad();
-    return elements.get(index);
-  }
-
-  public boolean add(T data)
-  {
-    lazyLoad();
-    int index = indexOf(data);
-    IHistoryElement<T> element = index != -1 ? elements.remove(index) : createElement(data);
-    elements.add(0, element);
-
-    boolean changed = index != 0;
-    if (changed)
-    {
-      changed();
-    }
-
-    return changed;
-  }
-
-  public IHistoryElement<T> remove(int index)
-  {
-    lazyLoad();
-    IHistoryElement<T> element = elements.remove(index);
-    if (element != null)
-    {
-      changed();
-    }
-
-    return element;
-  }
-
-  public boolean clear()
-  {
-    if (elements.isEmpty())
-    {
-      return false;
-    }
-
-    elements.clear();
-    changed();
-    return true;
-  }
-
-  public T getMostRecent()
-  {
-    lazyLoad();
-    if (isEmpty())
-    {
-      return null;
-    }
-
-    return elements.get(0).getData();
-  }
-
-  @SuppressWarnings("unchecked")
-  public <D> D[] getData(D[] a)
-  {
-    lazyLoad();
-    int size = elements.size();
-    if (a.length < size)
-    {
-      a = (D[])java.lang.reflect.Array.newInstance(a.getClass().getComponentType(), size);
-    }
-
-    for (int i = 0; i < size; i++)
-    {
-      a[i] = (D)elements.get(i).getData();
-    }
-
-    if (a.length > size)
-    {
-      a[size] = null;
-    }
-
-    return a;
-  }
-
-  @SuppressWarnings("unchecked")
-  public IHistoryElement<T>[] toArray()
-  {
-    lazyLoad();
-    return elements.toArray(new IHistoryElement[elements.size()]);
-  }
-
-  public Iterator<IHistoryElement<T>> iterator()
-  {
-    lazyLoad();
-    return elements.iterator();
-  }
-
-  @SuppressWarnings("unchecked")
-  protected IHistoryElement<T> createElement(T data)
-  {
-    return new HistoryElement(this, data);
-  }
-
-  protected void load()
-  {
-  }
-
-  protected void save()
-  {
-  }
-
-  protected final void changed()
-  {
-    save();
-    fireChangedEvent();
-  }
-
-  private void lazyLoad()
-  {
-    if (!loaded)
-    {
-      loaded = true;
-      load();
-    }
-  }
-
-  private void fireChangedEvent()
-  {
-    fireEvent(new IHistoryChangeEvent()
-    {
-      public INotifier getSource()
-      {
-        return History.this;
-      }
-    });
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HistoryElement.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HistoryElement.java
deleted file mode 100644
index d1759e4343..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HistoryElement.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.collection;
-
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.collection.IHistory;
-import org.eclipse.net4j.util.collection.IHistoryElement;
-
-/**
- * @author Eike Stepper
- */
-public class HistoryElement<T> implements IHistoryElement<T>
-{
-  private IHistory<IHistoryElement<T>> history;
-
-  private T data;
-
-  public HistoryElement(IHistory<IHistoryElement<T>> history, T data)
-  {
-    this.history = history;
-    this.data = data;
-  }
-
-  public IHistory<IHistoryElement<T>> getHistory()
-  {
-    return history;
-  }
-
-  public T getData()
-  {
-    return data;
-  }
-
-  public String getText()
-  {
-    return data.toString();
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public boolean equals(Object obj)
-  {
-    if (obj == this)
-    {
-      return true;
-    }
-
-    if (obj instanceof IHistoryElement)
-    {
-      IHistoryElement<T> that = (IHistoryElement<T>)obj;
-      return ObjectUtil.equals(history, that.getHistory()) && ObjectUtil.equals(data, that.getData());
-    }
-
-    return false;
-  }
-
-  @Override
-  public int hashCode()
-  {
-    return history.hashCode() ^ data.hashCode();
-  }
-
-  @Override
-  public String toString()
-  {
-    return getText();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/MoveableArrayList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/MoveableArrayList.java
deleted file mode 100644
index b17f949865..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/MoveableArrayList.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.net4j.internal.util.collection;
-
-import org.eclipse.net4j.util.collection.MoveableList;
-
-import java.util.ArrayList;
-
-/**
- * A list with O(1) effort for random access.
- * 
- * @author Eike Stepper
- */
-public final class MoveableArrayList<E> extends ArrayList<E> implements MoveableList<E>
-{
-  private static final long serialVersionUID = 1L;
-
-  public MoveableArrayList(int initialCapacity)
-  {
-    super(initialCapacity);
-
-  }
-
-  public E move(int targetIndex, int sourceIndex)
-  {
-    int size = size();
-    if (sourceIndex >= size)
-    {
-      throw new IndexOutOfBoundsException("sourceIndex=" + sourceIndex + ", size=" + size);
-    }
-
-    if (targetIndex >= size)
-    {
-      throw new IndexOutOfBoundsException("targetIndex=" + targetIndex + ", size=" + size);
-    }
-
-    E object = get(sourceIndex);
-    if (targetIndex == sourceIndex)
-    {
-      return object;
-    }
-
-    if (targetIndex < sourceIndex)
-    {
-      moveUp1(targetIndex, sourceIndex - targetIndex);
-    }
-    else
-    {
-      moveDown1(targetIndex, targetIndex - sourceIndex);
-    }
-
-    set(targetIndex, object);
-    return object;
-  }
-
-  private void moveUp1(int index, int count)
-  {
-    for (int i = count; i > 0; i--)
-    {
-      set(index + i, get(index + i - 1));
-    }
-  }
-
-  private void moveDown1(int index, int count)
-  {
-    for (int i = count; i > 0; i--)
-    {
-      set(index - i, get(index - i + 1));
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/PreferenceHistory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/PreferenceHistory.java
deleted file mode 100644
index 70676982c9..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/PreferenceHistory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.collection;
-
-import org.eclipse.net4j.util.collection.IHistoryElement;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public class PreferenceHistory extends History<String>
-{
-  private OMPreference<String[]> preference;
-
-  public PreferenceHistory(OMPreference<String[]> preference)
-  {
-    this.preference = preference;
-  }
-
-  public OMPreference<String[]> getPreference()
-  {
-    return preference;
-  }
-
-  @Override
-  protected void load()
-  {
-    String[] value = preference.getValue();
-    for (String data : value)
-    {
-      IHistoryElement<String> element = createElement(data);
-      elements.add(element);
-    }
-  }
-
-  @Override
-  protected void save()
-  {
-    String[] array = getData(new String[size()]);
-    preference.setValue(array);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java
deleted file mode 100644
index b75f513572..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.concurrent;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.concurrent.IWorkSerializer;
-
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorService;
-
-/**
- * @author Eike Stepper
- */
-public class AsynchronousWorkSerializer implements IWorkSerializer, Runnable
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CONCURRENCY, AsynchronousWorkSerializer.class);
-
-  private ExecutorService executorService;
-
-  private Queue<Runnable> workQueue;
-
-  private Occupation occupation = new Occupation();
-
-  // private Object newElementLock = new Object();
-
-  public AsynchronousWorkSerializer(ExecutorService executorService, Queue<Runnable> workQueue)
-  {
-    if (executorService == null)
-    {
-      throw new IllegalArgumentException("executorService == null"); //$NON-NLS-1$
-    }
-
-    this.executorService = executorService;
-    this.workQueue = workQueue;
-  }
-
-  public AsynchronousWorkSerializer(ExecutorService executorService)
-  {
-    this(executorService, new ConcurrentLinkedQueue<Runnable>());
-  }
-
-  public ExecutorService getExecutorService()
-  {
-    return executorService;
-  }
-
-  public boolean addWork(Runnable work)
-  {
-    // Need to be a block of execution. Cannot add when doing last check
-    // XXX synchronized (newElementLock)
-    {
-      workQueue.add(work);
-
-      // isOccupied can (and must) be called unsynchronized here
-      if (!occupation.isOccupied())
-      {
-        synchronized (occupation)
-        {
-          occupation.setOccupied(true);
-        }
-
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Notifying executor service"); //$NON-NLS-1$
-        }
-
-        executorService.execute(this);
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Executed in the context of the {@link #getExecutorService() executor service}.
-   * <p>
-   */
-  public void run()
-  {
-    // XXX synchronized (occupation)
-    {
-      Runnable work;
-      // for (;;)
-      {
-        while (occupation.isOccupied() && (work = workQueue.poll()) != null)
-        {
-          try
-          {
-            work.run();
-          }
-          catch (RuntimeException ex)
-          {
-            if (TRACER.isEnabled())
-            {
-              TRACER.trace(ex);
-            }
-          }
-        }
-
-        // ConcurrencyUtil.sleep(500);
-
-        // Could put the sync in the while loop... but not efficient.
-        // Doing a last check to make sure that no one added something in the
-        // queue
-        // synchronized (newElementLock)
-        // {
-        // if (!occupation.isOccupied() || (work = workQueue.peek()) == null)
-        // {
-        // occupation.setOccupied(false);
-        // break;
-        // }
-        // }
-      }
-    }
-  }
-
-  public void dispose()
-  {
-    if (occupation.isOccupied())
-    {
-      occupation.setOccupied(false);
-    }
-
-    workQueue.clear();
-    workQueue = null;
-    executorService = null;
-  }
-
-  @Override
-  public String toString()
-  {
-    return AsynchronousWorkSerializer.class.getSimpleName();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class Occupation
-  {
-    private boolean occupied = false;
-
-    public boolean isOccupied()
-    {
-      return occupied;
-    }
-
-    public void setOccupied(boolean occupied)
-    {
-      this.occupied = occupied;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/CompletionWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/CompletionWorkSerializer.java
deleted file mode 100644
index 4fa6541818..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/CompletionWorkSerializer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.concurrent;
-
-import org.eclipse.net4j.util.concurrent.IWorkSerializer;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.Future;
-
-/**
- * @author Eike Stepper
- */
-public class CompletionWorkSerializer implements IWorkSerializer
-{
-  private CompletionService<Object> completionService;
-
-  public CompletionWorkSerializer(CompletionService<Object> completionService)
-  {
-    this.completionService = completionService;
-  }
-
-  public CompletionWorkSerializer(Executor executor, BlockingQueue<Future<Object>> completionQueue)
-  {
-    this(new ExecutorCompletionService<Object>(executor, completionQueue));
-  }
-
-  public CompletionWorkSerializer(Executor executor)
-  {
-    this(new ExecutorCompletionService<Object>(executor));
-  }
-
-  public CompletionWorkSerializer()
-  {
-    this(new OnePendingExecutor());
-  }
-
-  public CompletionService<Object> getCompletionService()
-  {
-    return completionService;
-  }
-
-  public void dispose()
-  {
-  }
-
-  public boolean addWork(Runnable work)
-  {
-    completionService.submit(work, true);
-    return true;
-  }
-
-  @Override
-  public String toString()
-  {
-    return CompletionWorkSerializer.class.getSimpleName();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/OnePendingExecutor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/OnePendingExecutor.java
deleted file mode 100644
index 30be501195..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/OnePendingExecutor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.concurrent;
-
-import java.util.concurrent.Executor;
-
-public class OnePendingExecutor implements Executor
-{
-  private Runnable command;
-
-  private Thread thread;
-
-  public OnePendingExecutor()
-  {
-  }
-
-  public synchronized void execute(Runnable command)
-  {
-    if (this.command != null)
-    {
-      throw new IllegalStateException("One command already pending");
-    }
-
-    this.command = command;
-    if (thread == null)
-    {
-      thread = new Thread()
-      {
-        @Override
-        public void run()
-        {
-          for (;;)
-          {
-            Runnable command;
-            synchronized (OnePendingExecutor.this)
-            {
-              if (OnePendingExecutor.this.command == null)
-              {
-                thread = null;
-                return;
-              }
-
-              command = OnePendingExecutor.this.command;
-              OnePendingExecutor.this.command = null;
-            }
-
-            command.run();
-          }
-        }
-      };
-
-      thread.setDaemon(true);
-      thread.start();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/QueueWorkerWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/QueueWorkerWorkSerializer.java
deleted file mode 100644
index 6a1c2b6dc3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/QueueWorkerWorkSerializer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.concurrent;
-
-import org.eclipse.net4j.internal.util.lifecycle.QueueWorker;
-import org.eclipse.net4j.util.concurrent.IWorkSerializer;
-
-/**
- * @author Eike Stepper
- */
-public class QueueWorkerWorkSerializer extends QueueWorker<Runnable> implements IWorkSerializer
-{
-  public QueueWorkerWorkSerializer()
-  {
-    activate();
-  }
-
-  public void dispose()
-  {
-    deactivate();
-  }
-
-  @Override
-  protected void work(WorkContext context, Runnable element)
-  {
-    element.run();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/ResultSynchronizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/ResultSynchronizer.java
deleted file mode 100644
index 48e9010856..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/ResultSynchronizer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.concurrent;
-
-import org.eclipse.net4j.util.concurrent.ISynchronizer;
-import org.eclipse.net4j.util.om.monitor.MonitorUtil;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-public final class ResultSynchronizer<RESULT> implements ISynchronizer<RESULT>
-{
-  private RESULT result;
-
-  private Object consumerLock = new Object();
-
-  private CountDownLatch producerLatch = new CountDownLatch(1);
-
-  public ResultSynchronizer()
-  {
-  }
-
-  public RESULT get(long timeout)
-  {
-    try
-    {
-      final long stop = System.currentTimeMillis() + timeout;
-      synchronized (consumerLock)
-      {
-        while (result == null)
-        {
-          try
-          {
-            final long remaining = stop - System.currentTimeMillis();
-            if (remaining <= 0)
-            {
-              return null;
-            }
-
-            if (MonitorUtil.isCanceled())
-            {
-              return null;
-            }
-
-            consumerLock.wait(Math.min(remaining, 100L));
-          }
-          catch (InterruptedException ex)
-          {
-            return null;
-          }
-        }
-
-        return result;
-      }
-    }
-    finally
-    {
-      producerLatch.countDown();
-    }
-  }
-
-  public void put(RESULT result)
-  {
-    synchronized (consumerLock)
-    {
-      this.result = result;
-      consumerLock.notifyAll();
-    }
-  }
-
-  public boolean put(RESULT result, long timeout)
-  {
-    synchronized (consumerLock)
-    {
-      this.result = result;
-      consumerLock.notifyAll();
-    }
-
-    try
-    {
-      if (!producerLatch.await(timeout, TimeUnit.MILLISECONDS))
-      {
-        return false;
-      }
-    }
-    catch (InterruptedException ex)
-    {
-      return false;
-    }
-
-    return true;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java
deleted file mode 100644
index cdf7235904..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.concurrent;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-/**
- * @author Eike Stepper
- */
-public final class RoundRobinList<E> extends LinkedList<E>
-{
-  private static final long serialVersionUID = 1L;
-
-  private ReadWriteLock lock = new ReentrantReadWriteLock();
-
-  private Iterator<E> it;
-
-  public RoundRobinList()
-  {
-  }
-
-  public RoundRobinList(Collection<? extends E> c)
-  {
-    super(c);
-  }
-
-  public void executeReads(Runnable runnable)
-  {
-    try
-    {
-      lock.readLock().lock();
-      runnable.run();
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  public void executeWrites(Runnable runnable)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      runnable.run();
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public void add(int index, E element)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      super.add(index, element);
-      it = null;
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public boolean add(E o)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.add(o);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends E> c)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.addAll(c);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public boolean addAll(int index, Collection<? extends E> c)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.addAll(index, c);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public void addFirst(E o)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      super.addFirst(o);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public void addLast(E o)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      super.addLast(o);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public void clear()
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      super.clear();
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public Object clone()
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.clone();
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public boolean contains(Object o)
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.contains(o);
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public boolean containsAll(Collection<?> c)
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.containsAll(c);
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public E element()
-  {
-    try
-    {
-      lock.readLock().lock();
-      if (isEmpty())
-      {
-        return null;
-      }
-
-      if (it == null || !it.hasNext())
-      {
-        it = iterator();
-      }
-
-      return it.next();
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public E get(int index)
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.get(index);
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public E getFirst()
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.getFirst();
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public E getLast()
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.getLast();
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public int indexOf(Object o)
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.indexOf(o);
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public int lastIndexOf(Object o)
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.lastIndexOf(o);
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public boolean offer(E o)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.offer(o);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public E peek()
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.peek();
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public E poll()
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.poll();
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public E remove()
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.remove();
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public E remove(int index)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.remove(index);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public boolean remove(Object o)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.remove(o);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public boolean removeAll(Collection<?> c)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.removeAll(c);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public E removeFirst()
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.removeFirst();
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public E removeLast()
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.removeLast();
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public boolean retainAll(Collection<?> c)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.retainAll(c);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public E set(int index, E element)
-  {
-    try
-    {
-      lock.writeLock().lock();
-      it = null;
-      return super.set(index, element);
-    }
-    finally
-    {
-      lock.writeLock().unlock();
-    }
-  }
-
-  @Override
-  public List<E> subList(int fromIndex, int toIndex)
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.subList(fromIndex, toIndex);
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public Object[] toArray()
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.toArray();
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-
-  @Override
-  public <T> T[] toArray(T[] a)
-  {
-    try
-    {
-      lock.readLock().lock();
-      return super.toArray(a);
-    }
-    finally
-    {
-      lock.readLock().unlock();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java
deleted file mode 100644
index 31d26540d9..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.concurrent;
-
-import org.eclipse.net4j.util.concurrent.ICorrelator;
-import org.eclipse.net4j.util.concurrent.ISynchronizer;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * @author Eike Stepper
- */
-public class SynchronizingCorrelator<CORRELATION, RESULT> implements ICorrelator<CORRELATION, ISynchronizer<RESULT>>
-{
-  private ConcurrentMap<CORRELATION, ISynchronizer<RESULT>> map = new ConcurrentHashMap<CORRELATION, ISynchronizer<RESULT>>(
-      0);
-
-  public boolean isCorrelated(CORRELATION correlation)
-  {
-    return map.containsKey(correlation);
-  }
-
-  public ISynchronizer<RESULT> correlate(CORRELATION correlation)
-  {
-    ISynchronizer<RESULT> synchronizer = map.get(correlation);
-    if (synchronizer == null)
-    {
-      synchronizer = createSynchronizer(correlation);
-      map.put(correlation, synchronizer);
-    }
-
-    return synchronizer;
-  }
-
-  public ISynchronizer<RESULT> correlateUnique(CORRELATION correlation)
-  {
-    ISynchronizer<RESULT> synchronizer = createSynchronizer(correlation);
-    if (map.putIfAbsent(correlation, synchronizer) != null)
-    {
-      throw new IllegalStateException("Already correlated: " + correlation); //$NON-NLS-1$
-    }
-
-    return synchronizer;
-  }
-
-  public ISynchronizer<RESULT> uncorrelate(CORRELATION correlation)
-  {
-    return map.remove(correlation);
-  }
-
-  public RESULT get(CORRELATION correlation, long timeout)
-  {
-    return correlate(correlation).get(timeout);
-  }
-
-  public void put(CORRELATION correlation, RESULT result)
-  {
-    correlate(correlation).put(result);
-  }
-
-  public boolean put(CORRELATION correlation, RESULT result, long timeout)
-  {
-    return correlate(correlation).put(result, timeout);
-  }
-
-  protected ISynchronizer<RESULT> createSynchronizer(final CORRELATION correlation)
-  {
-    // TODO Make top level class
-    return new ISynchronizer<RESULT>()
-    {
-      private ISynchronizer<RESULT> delegate = new ResultSynchronizer<RESULT>();
-
-      public RESULT get(long timeout)
-      {
-        RESULT result = delegate.get(timeout);
-        uncorrelate(correlation);
-        return result;
-      }
-
-      public void put(RESULT result)
-      {
-        delegate.put(result);
-      }
-
-      public boolean put(RESULT result, long timeout)
-      {
-        return delegate.put(result, timeout);
-      }
-    };
-  }
-
-  @Override
-  public String toString()
-  {
-    return "SynchronizingCorrelator" + map;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronousWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronousWorkSerializer.java
deleted file mode 100644
index dbebe7bf8f..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronousWorkSerializer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.concurrent;
-
-import org.eclipse.net4j.util.concurrent.IWorkSerializer;
-
-/**
- * @author Eike Stepper
- */
-public class SynchronousWorkSerializer implements IWorkSerializer
-{
-  public SynchronousWorkSerializer()
-  {
-  }
-
-  public boolean addWork(Runnable work)
-  {
-    work.run();
-    return true;
-  }
-
-  public void dispose()
-  {
-  }
-
-  @Override
-  public String toString()
-  {
-    return SynchronousWorkSerializer.class.getSimpleName();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/Container.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/Container.java
deleted file mode 100644
index f94f5dfc0e..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/Container.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container;
-
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerDelta.Kind;
-
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Container<E> extends Lifecycle implements IContainer<E>
-{
-  public Container()
-  {
-  }
-
-  public boolean isEmpty()
-  {
-    E[] elements = getElements();
-    return elements == null || elements.length == 0;
-  }
-
-  public void fireElementAddedEvent(E element)
-  {
-    fireContainerEvent(element, IContainerDelta.Kind.ADDED);
-  }
-
-  public void fireElementRemovedEvent(E element)
-  {
-    fireContainerEvent(element, IContainerDelta.Kind.REMOVED);
-  }
-
-  public void fireContainerEvent(E element, Kind kind)
-  {
-    fireEvent(newContainerEvent(element, kind));
-  }
-
-  public void fireContainerEvent(List<IContainerDelta<E>> deltas)
-  {
-    fireEvent(new ContainerEvent<E>(this, deltas));
-  }
-
-  protected SingleDeltaContainerEvent<E> newContainerEvent(E element, Kind kind)
-  {
-    return new SingleDeltaContainerEvent<E>(this, element, kind);
-  }
-
-  protected ContainerEvent<E> newContainerEvent()
-  {
-    return new ContainerEvent<E>(this);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerDelta.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerDelta.java
deleted file mode 100644
index 4889bb8164..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerDelta.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container;
-
-import org.eclipse.net4j.util.container.IContainerDelta;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerDelta<E> implements IContainerDelta<E>
-{
-  private E element;
-
-  private Kind kind;
-
-  public ContainerDelta(E element, Kind kind)
-  {
-    this.element = element;
-    this.kind = kind;
-  }
-
-  public E getElement()
-  {
-    return element;
-  }
-
-  public E setValue(E value)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public Kind getKind()
-  {
-    return kind;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java
deleted file mode 100644
index af80c3f59e..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container;
-
-import org.eclipse.net4j.internal.util.event.Event;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IContainerEventVisitor;
-import org.eclipse.net4j.util.container.IContainerDelta.Kind;
-import org.eclipse.net4j.util.container.IContainerEventVisitor.Filtered;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerEvent<E> extends Event implements IContainerEvent<E>
-{
-  private static final long serialVersionUID = 1L;
-
-  private List<IContainerDelta<E>> deltas;
-
-  public ContainerEvent(IContainer<E> container)
-  {
-    super(container);
-    deltas = new ArrayList<IContainerDelta<E>>();
-  }
-
-  public ContainerEvent(IContainer<E> container, List<IContainerDelta<E>> deltas)
-  {
-    super(container);
-    this.deltas = deltas;
-  }
-
-  @SuppressWarnings("unchecked")
-  public IContainer<E> getContainer()
-  {
-    return (IContainer<E>)getSource();
-  }
-
-  public boolean isEmpty()
-  {
-    return deltas.isEmpty();
-  }
-
-  @SuppressWarnings("unchecked")
-  public IContainerDelta<E>[] getDeltas()
-  {
-    return deltas.toArray(new IContainerDelta[deltas.size()]);
-  }
-
-  public IContainerDelta<E> getDelta() throws IllegalStateException
-  {
-    if (deltas.size() != 1)
-    {
-      throw new IllegalStateException("deltas.size() != 1");
-    }
-
-    return deltas.get(0);
-  }
-
-  public E getDeltaElement() throws IllegalStateException
-  {
-    return getDelta().getElement();
-  }
-
-  public Kind getDeltaKind() throws IllegalStateException
-  {
-    return getDelta().getKind();
-  }
-
-  public void addDelta(E element, Kind kind)
-  {
-    addDelta(new ContainerDelta<E>(element, kind));
-  }
-
-  public void addDelta(IContainerDelta<E> delta)
-  {
-    deltas.add(delta);
-  }
-
-  public void accept(IContainerEventVisitor<E> visitor)
-  {
-    for (IContainerDelta<E> delta : deltas)
-    {
-      E element = delta.getElement();
-
-      boolean filtered = true;
-      if (visitor instanceof Filtered)
-      {
-        filtered = ((Filtered<E>)visitor).filter(element);
-      }
-
-      if (filtered)
-      {
-        switch (delta.getKind())
-        {
-        case ADDED:
-          visitor.added(element);
-          break;
-        case REMOVED:
-          visitor.removed(element);
-          break;
-        }
-      }
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    StringBuilder builder = new StringBuilder();
-    for (IContainerDelta<E> delta : getDeltas())
-    {
-      builder.append(", ");
-      builder.append(delta.getKind());
-      builder.append("=");
-      builder.append(delta.getElement());
-    }
-
-    return MessageFormat.format("ContainerEvent[source={0}{1}]", getSource(), builder.toString());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java
deleted file mode 100644
index cb2b42e3c8..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container;
-
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IContainerEventVisitor;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerEventAdapter<E> implements IListener
-{
-  public ContainerEventAdapter()
-  {
-  }
-
-  @SuppressWarnings("unchecked")
-  public final void notifyEvent(IEvent event)
-  {
-    if (event instanceof IContainerEvent)
-    {
-      IContainerEvent<E> e = (IContainerEvent<E>)event;
-      notifyContainerEvent(e);
-    }
-    else
-    {
-      notifyOtherEvent(event);
-    }
-  }
-
-  protected void notifyContainerEvent(IContainerEvent<E> event)
-  {
-    final IContainer<E> container = event.getContainer();
-    event.accept(new IContainerEventVisitor<E>()
-    {
-      public void added(E element)
-      {
-        onAdded(container, element);
-      }
-
-      public void removed(E element)
-      {
-        onRemoved(container, element);
-      }
-    });
-  }
-
-  protected void notifyOtherEvent(IEvent event)
-  {
-  }
-
-  protected void onAdded(IContainer<E> container, E element)
-  {
-  }
-
-  protected void onRemoved(IContainer<E> container, E element)
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/LifecycleEventConverter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/LifecycleEventConverter.java
deleted file mode 100644
index 0ae34b5c92..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/LifecycleEventConverter.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container;
-
-import org.eclipse.net4j.internal.util.event.Notifier;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IContainerDelta.Kind;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.event.INotifier;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-
-/**
- * Is registered with each {@link IChannel} of this {@link IConnector}.
- * <p>
- * 
- * @author Eike Stepper
- */
-public class LifecycleEventConverter<E> implements IListener
-{
-  private Notifier owner;
-
-  public LifecycleEventConverter(Notifier owner)
-  {
-    this.owner = owner;
-  }
-
-  public INotifier getOwner()
-  {
-    return owner;
-  }
-
-  public void notifyEvent(IEvent event)
-  {
-    if (event instanceof ILifecycleEvent)
-    {
-      ILifecycleEvent e = (ILifecycleEvent)event;
-      switch (e.getKind())
-      {
-      case ACTIVATED:
-        added(e);
-        break;
-
-      case DEACTIVATED:
-        removed(e);
-        break;
-      }
-    }
-  }
-
-  protected void added(ILifecycleEvent e)
-  {
-    fireContainerEvent(e, IContainerDelta.Kind.ADDED);
-  }
-
-  protected void removed(ILifecycleEvent e)
-  {
-    fireContainerEvent(e, IContainerDelta.Kind.REMOVED);
-  }
-
-  @SuppressWarnings("unchecked")
-  protected void fireContainerEvent(ILifecycleEvent e, IContainerDelta.Kind kind)
-  {
-    E element = (E)e.getLifecycle();
-    if (element != null)
-    {
-      IContainerEvent<E> event = createContainerEvent((IContainer<E>)owner, element, kind);
-      owner.fireEvent(event);
-    }
-  }
-
-  protected IContainerEvent<E> createContainerEvent(IContainer<E> container, E element, Kind kind)
-  {
-    ContainerEvent<E> event = new ContainerEvent<E>(container);
-    event.addDelta(new ContainerDelta<E>(element, kind));
-    return event;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java
deleted file mode 100644
index a83ab176a5..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.factory.FactoryKey;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter;
-import org.eclipse.net4j.internal.util.registry.HashMapRegistry;
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.container.FactoryNotFoundException;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.event.EventUtil;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.factory.IFactory;
-import org.eclipse.net4j.util.factory.IFactoryKey;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.Map.Entry;
-
-/**
- * @author Eike Stepper
- */
-public class ManagedContainer extends Lifecycle implements IManagedContainer
-{
-  private IRegistry<IFactoryKey, IFactory> factoryRegistry;
-
-  private List<IElementProcessor> postProcessors;
-
-  private IRegistry<ElementKey, Object> elementRegistry = new HashMapRegistry<ElementKey, Object>();
-
-  private long maxElementID;
-
-  private IListener elementListener = new LifecycleEventAdapter()
-  {
-    @Override
-    protected void onDeactivated(ILifecycle lifecycle)
-    {
-      for (Entry<ElementKey, Object> entry : elementRegistry.entrySet())
-      {
-        if (lifecycle == entry.getValue())
-        {
-          removeElement(entry.getKey());
-          return;
-        }
-      }
-    }
-  };
-
-  public ManagedContainer()
-  {
-  }
-
-  public synchronized IRegistry<IFactoryKey, IFactory> getFactoryRegistry()
-  {
-    if (factoryRegistry == null)
-    {
-      factoryRegistry = createFactoryRegistry();
-    }
-
-    return factoryRegistry;
-  }
-
-  public ManagedContainer registerFactory(IFactory factory)
-  {
-    getFactoryRegistry().put(factory.getKey(), factory);
-    return this;
-  }
-
-  public synchronized List<IElementProcessor> getPostProcessors()
-  {
-    if (postProcessors == null)
-    {
-      postProcessors = createPostProcessors();
-    }
-
-    return postProcessors;
-  }
-
-  public synchronized void addPostProcessor(IElementProcessor postProcessor, boolean processExistingElements)
-  {
-    if (processExistingElements)
-    {
-      ContainerEvent<Object> event = new ContainerEvent<Object>(this);
-      for (Entry<ElementKey, Object> entry : elementRegistry.entrySet())
-      {
-        ElementKey key = entry.getKey();
-        Object element = entry.getValue();
-
-        String productGroup = key.getProductGroup();
-        String factoryType = key.getFactoryType();
-        String description = key.getDescription();
-        Object newElement = postProcessor.process(this, productGroup, factoryType, description, element);
-        if (newElement != element)
-        {
-          elementRegistry.put(key, newElement);
-          event.addDelta(element, IContainerDelta.Kind.REMOVED);
-          event.addDelta(newElement, IContainerDelta.Kind.ADDED);
-        }
-      }
-
-      fireEvent(event);
-    }
-
-    getPostProcessors().add(postProcessor);
-  }
-
-  public void addPostProcessor(IElementProcessor postProcessor)
-  {
-    getPostProcessors().add(postProcessor);
-  }
-
-  public void removePostProcessor(IElementProcessor postProcessor)
-  {
-    getPostProcessors().remove(postProcessor);
-  }
-
-  public Set<String> getProductGroups()
-  {
-    Set<String> result = new HashSet<String>();
-    for (IFactoryKey key : factoryRegistry.keySet())
-    {
-      result.add(key.getProductGroup());
-    }
-
-    for (ElementKey key : elementRegistry.keySet())
-    {
-      result.add(key.getProductGroup());
-    }
-
-    return result;
-  }
-
-  public Set<String> getFactoryTypes(String productGroup)
-  {
-    Set<String> result = new HashSet<String>();
-    for (IFactoryKey key : factoryRegistry.keySet())
-    {
-      if (ObjectUtil.equals(key.getProductGroup(), productGroup))
-      {
-        result.add(key.getType());
-      }
-    }
-
-    for (ElementKey key : elementRegistry.keySet())
-    {
-      if (ObjectUtil.equals(key.getProductGroup(), productGroup))
-      {
-        result.add(key.getFactoryType());
-      }
-    }
-
-    return result;
-  }
-
-  public IFactory getFactory(String productGroup, String factoryType)
-  {
-    FactoryKey key = new FactoryKey(productGroup, factoryType);
-    IFactory factory = getFactoryRegistry().get(key);
-    if (factory == null)
-    {
-      throw new FactoryNotFoundException("Factory not found: " + key);
-    }
-
-    return factory;
-  }
-
-  public boolean isEmpty()
-  {
-    return elementRegistry.isEmpty();
-  }
-
-  public String[] getElementKey(Object element)
-  {
-    for (Entry<ElementKey, Object> entry : elementRegistry.entrySet())
-    {
-      if (entry.getValue() == element)
-      {
-        ElementKey key = entry.getKey();
-        String[] result = { key.getProductGroup(), key.getFactoryType(), key.getDescription() };
-        return result;
-      }
-    }
-
-    return null;
-  }
-
-  public Object[] getElements()
-  {
-    return elementRegistry.values().toArray();
-  }
-
-  public Object[] getElements(String productGroup)
-  {
-    List<Object> result = new ArrayList<Object>();
-    for (Entry<ElementKey, Object> entry : elementRegistry.entrySet())
-    {
-      ElementKey key = entry.getKey();
-      if (ObjectUtil.equals(key.getProductGroup(), productGroup))
-      {
-        result.add(entry.getValue());
-      }
-    }
-
-    return result.toArray();
-  }
-
-  public Object[] getElements(String productGroup, String factoryType)
-  {
-    List<Object> result = new ArrayList<Object>();
-    for (Entry<ElementKey, Object> entry : elementRegistry.entrySet())
-    {
-      ElementKey key = entry.getKey();
-      if (ObjectUtil.equals(key.getProductGroup(), productGroup)
-          && ObjectUtil.equals(key.getFactoryType(), factoryType))
-      {
-        result.add(entry.getValue());
-      }
-    }
-
-    return result.toArray();
-  }
-
-  public Object getElement(String productGroup, String factoryType, String description)
-  {
-    ElementKey key = new ElementKey(productGroup, factoryType, description);
-    Object element = elementRegistry.get(key);
-    if (element == null)
-    {
-      element = createElement(productGroup, factoryType, description);
-      element = postProcessElement(productGroup, factoryType, description, element);
-      LifecycleUtil.activate(element);
-      putElement(key, element);
-    }
-
-    return element;
-  }
-
-  public Object putElement(String productGroup, String factoryType, String description, Object element)
-  {
-    ElementKey key = new ElementKey(productGroup, factoryType, description);
-    return putElement(key, element);
-  }
-
-  protected Object putElement(ElementKey key, Object element)
-  {
-    ContainerEvent<Object> event = new ContainerEvent<Object>(this);
-    key.setID(++maxElementID);
-    Object oldElement = elementRegistry.put(key, element);
-    if (oldElement != null)
-    {
-      EventUtil.removeListener(oldElement, elementListener);
-      event.addDelta(oldElement, IContainerDelta.Kind.REMOVED);
-    }
-
-    event.addDelta(element, IContainerDelta.Kind.ADDED);
-    fireEvent(event);
-    EventUtil.addListener(element, elementListener);
-    return oldElement;
-  }
-
-  public Object removeElement(String productGroup, String factoryType, String description)
-  {
-    ElementKey key = new ElementKey(productGroup, factoryType, description);
-    return removeElement(key);
-  }
-
-  protected Object removeElement(ElementKey key)
-  {
-    Object element = elementRegistry.remove(key);
-    if (element != null)
-    {
-      EventUtil.removeListener(element, elementListener);
-      fireEvent(new SingleDeltaContainerEvent<Object>(this, element, IContainerDelta.Kind.REMOVED));
-    }
-
-    return element;
-  }
-
-  public void clearElements()
-  {
-    if (!elementRegistry.isEmpty())
-    {
-      ContainerEvent<Object> event = new ContainerEvent<Object>(this);
-      for (Object element : elementRegistry.values())
-      {
-        EventUtil.removeListener(element, elementListener);
-        event.addDelta(element, IContainerDelta.Kind.REMOVED);
-      }
-
-      elementRegistry.clear();
-      fireEvent(event);
-    }
-  }
-
-  public void loadElements(InputStream stream) throws IOException
-  {
-    clearElements();
-    ObjectInputStream ois = new ObjectInputStream(stream);
-    int size = ois.readInt();
-    for (int i = 0; i < size; i++)
-    {
-      try
-      {
-        ElementKey key = (ElementKey)ois.readObject();
-        Object element = getElement(key.getProductGroup(), key.getFactoryType(), key.getDescription());
-
-        boolean active = ois.readBoolean();
-        if (active)
-        {
-          // TODO Reconsider activation
-          LifecycleUtil.activate(element);
-        }
-      }
-      catch (ClassNotFoundException cannotHappen)
-      {
-      }
-    }
-
-    initMaxElementID();
-  }
-
-  public void saveElements(OutputStream stream) throws IOException
-  {
-    ObjectOutputStream oos = new ObjectOutputStream(stream);
-    List<Entry<ElementKey, Object>> entries = new ArrayList<Entry<ElementKey, Object>>(elementRegistry.entrySet());
-    Collections.sort(entries, new EntryComparator());
-
-    oos.writeInt(entries.size());
-    for (Entry<ElementKey, Object> entry : entries)
-    {
-      oos.writeObject(entry.getKey());
-      oos.writeBoolean(LifecycleUtil.isActive(entry.getValue()));
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public void fireEvent(IEvent event)
-  {
-    if (event instanceof IContainerEvent)
-    {
-      IContainerEvent<Object> containerEvent = (IContainerEvent<Object>)event;
-      if (containerEvent.isEmpty())
-      {
-        return;
-      }
-    }
-
-    super.fireEvent(event);
-  }
-
-  @Override
-  public String toString()
-  {
-    return "ManagedContainer";
-  }
-
-  protected IRegistry<IFactoryKey, IFactory> createFactoryRegistry()
-  {
-    return new HashMapRegistry<IFactoryKey, IFactory>();
-  }
-
-  protected List<IElementProcessor> createPostProcessors()
-  {
-    return new ArrayList<IElementProcessor>();
-  }
-
-  protected Object createElement(String productGroup, String factoryType, String description)
-  {
-    IFactory factory = getFactory(productGroup, factoryType);
-    return factory.create(description);
-  }
-
-  protected Object postProcessElement(String productGroup, String factoryType, String description, Object element)
-  {
-    for (IElementProcessor processor : getPostProcessors())
-    {
-      element = processor.process(this, productGroup, factoryType, description, element);
-    }
-
-    return element;
-  }
-
-  protected void initMaxElementID()
-  {
-    maxElementID = 0L;
-    for (ElementKey key : elementRegistry.keySet())
-    {
-      long id = key.getID();
-      if (maxElementID < id)
-      {
-        maxElementID = id;
-      }
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    LifecycleUtil.activate(getFactoryRegistry());
-    LifecycleUtil.activate(getPostProcessors());
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    Collection<Object> values = elementRegistry.values();
-    for (Object element : values.toArray())
-    {
-      try
-      {
-        LifecycleUtil.deactivateNoisy(element);
-        EventUtil.removeListener(element, elementListener);
-      }
-      catch (RuntimeException ex)
-      {
-        OM.LOG.warn(ex);
-      }
-    }
-
-    LifecycleUtil.deactivate(factoryRegistry);
-    LifecycleUtil.deactivate(postProcessors);
-    super.doDeactivate();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class ElementKey implements Serializable, Comparable<ElementKey>
-  {
-    private static final long serialVersionUID = 1L;
-
-    private long id;
-
-    private String productGroup;
-
-    private String factoryType;
-
-    private String description;
-
-    public ElementKey(String productGroup, String factoryType, String description)
-    {
-      this.productGroup = productGroup;
-      this.factoryType = factoryType;
-      this.description = description;
-    }
-
-    public long getID()
-    {
-      return id;
-    }
-
-    public void setID(long id)
-    {
-      this.id = id;
-    }
-
-    public String getProductGroup()
-    {
-      return productGroup;
-    }
-
-    public String getFactoryType()
-    {
-      return factoryType;
-    }
-
-    public String getDescription()
-    {
-      return description;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-      if (obj == this)
-      {
-        return true;
-      }
-
-      if (obj instanceof ElementKey)
-      {
-        ElementKey key = (ElementKey)obj;
-        return ObjectUtil.equals(productGroup, key.productGroup) && ObjectUtil.equals(factoryType, key.factoryType)
-            && ObjectUtil.equals(description, key.description);
-      }
-
-      return false;
-    }
-
-    @Override
-    public int hashCode()
-    {
-      return ObjectUtil.hashCode(productGroup) ^ ObjectUtil.hashCode(factoryType) ^ ObjectUtil.hashCode(description);
-    }
-
-    @Override
-    public String toString()
-    {
-      return MessageFormat.format("{0}[{1}, {2}]", productGroup, factoryType, description);
-    }
-
-    public int compareTo(ElementKey key)
-    {
-      if (id < key.id)
-      {
-        return -1;
-      }
-
-      if (id > key.id)
-      {
-        return 1;
-      }
-
-      return 0;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class EntryComparator implements Comparator<Entry<ElementKey, Object>>
-  {
-    public int compare(Entry<ElementKey, Object> entry1, Entry<ElementKey, Object> entry2)
-    {
-      return entry1.getKey().compareTo(entry2.getKey());
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginContainer.java
deleted file mode 100644
index 0fa7cb7756..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginContainer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.factory.PluginFactoryRegistry;
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.factory.IFactory;
-import org.eclipse.net4j.util.factory.IFactoryKey;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class PluginContainer extends ManagedContainer implements IPluginContainer
-{
-  private static PluginContainer instance;
-
-  private PluginContainer()
-  {
-  }
-
-  @Override
-  protected IRegistry<IFactoryKey, IFactory> createFactoryRegistry()
-  {
-    return new PluginFactoryRegistry();
-  }
-
-  @Override
-  protected List<IElementProcessor> createPostProcessors()
-  {
-    return new PluginElementProcessorList();
-  }
-
-  public static void dispose()
-  {
-    if (instance != null)
-    {
-      instance.deactivate();
-      instance = null;
-    }
-  }
-
-  public static synchronized PluginContainer getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new PluginContainer();
-
-      try
-      {
-        instance.activate();
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-        instance = null;
-      }
-    }
-
-    return instance;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
deleted file mode 100644
index 0ec19a7e94..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.container.IElementProcessor;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionDelta;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IRegistryChangeEvent;
-import org.eclipse.core.runtime.IRegistryChangeListener;
-import org.eclipse.core.runtime.Platform;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-/**
- * @author Eike Stepper
- */
-public class PluginElementProcessorList extends Lifecycle implements List<IElementProcessor>
-{
-  private static final String ATTR_CLASS = "class";
-
-  public static final String NAMESPACE = OM.BUNDLE_ID;
-
-  public static final String EXT_POINT = "elementProcessors";
-
-  private List<IElementProcessor> processors = new ArrayList<IElementProcessor>();
-
-  private IRegistryChangeListener extensionRegistryListener = new IRegistryChangeListener()
-  {
-    public void registryChanged(IRegistryChangeEvent event)
-    {
-      IExtensionDelta[] deltas = event.getExtensionDeltas(NAMESPACE, EXT_POINT);
-      for (IExtensionDelta delta : deltas)
-      {
-        // TODO Handle ExtensionDelta
-        OM.LOG.warn("ExtensionDelta not handled: " + delta);
-      }
-    }
-  };
-
-  public PluginElementProcessorList()
-  {
-  }
-
-  public boolean add(IElementProcessor o)
-  {
-    return processors.add(o);
-  }
-
-  public void add(int index, IElementProcessor element)
-  {
-    processors.add(index, element);
-  }
-
-  public boolean addAll(Collection<? extends IElementProcessor> c)
-  {
-    return processors.addAll(c);
-  }
-
-  public boolean addAll(int index, Collection<? extends IElementProcessor> c)
-  {
-    return processors.addAll(index, c);
-  }
-
-  public void clear()
-  {
-    processors.clear();
-  }
-
-  public boolean contains(Object o)
-  {
-    return processors.contains(o);
-  }
-
-  public boolean containsAll(Collection<?> c)
-  {
-    return processors.containsAll(c);
-  }
-
-  @Override
-  public boolean equals(Object o)
-  {
-    return processors.equals(o);
-  }
-
-  public IElementProcessor get(int index)
-  {
-    return processors.get(index);
-  }
-
-  @Override
-  public int hashCode()
-  {
-    return processors.hashCode();
-  }
-
-  public int indexOf(Object o)
-  {
-    return processors.indexOf(o);
-  }
-
-  public boolean isEmpty()
-  {
-    return processors.isEmpty();
-  }
-
-  public Iterator<IElementProcessor> iterator()
-  {
-    return processors.iterator();
-  }
-
-  public int lastIndexOf(Object o)
-  {
-    return processors.lastIndexOf(o);
-  }
-
-  public ListIterator<IElementProcessor> listIterator()
-  {
-    return processors.listIterator();
-  }
-
-  public ListIterator<IElementProcessor> listIterator(int index)
-  {
-    return processors.listIterator(index);
-  }
-
-  public IElementProcessor remove(int index)
-  {
-    return processors.remove(index);
-  }
-
-  public boolean remove(Object o)
-  {
-    return processors.remove(o);
-  }
-
-  public boolean removeAll(Collection<?> c)
-  {
-    return processors.removeAll(c);
-  }
-
-  public boolean retainAll(Collection<?> c)
-  {
-    return processors.retainAll(c);
-  }
-
-  public IElementProcessor set(int index, IElementProcessor element)
-  {
-    return processors.set(index, element);
-  }
-
-  public int size()
-  {
-    return processors.size();
-  }
-
-  public List<IElementProcessor> subList(int fromIndex, int toIndex)
-  {
-    return processors.subList(fromIndex, toIndex);
-  }
-
-  public Object[] toArray()
-  {
-    return processors.toArray();
-  }
-
-  public <T> T[] toArray(T[] a)
-  {
-    return processors.toArray(a);
-  }
-
-  @Override
-  public String toString()
-  {
-    return processors.toString();
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-    IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(NAMESPACE, EXT_POINT);
-    for (IConfigurationElement element : elements)
-    {
-      IElementProcessor processor = (IElementProcessor)element.createExecutableExtension(ATTR_CLASS);
-      processors.add(processor);
-    }
-
-    extensionRegistry.addRegistryChangeListener(extensionRegistryListener, NAMESPACE);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-    extensionRegistry.removeRegistryChangeListener(extensionRegistryListener);
-    processors.clear();
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java
deleted file mode 100644
index 0d8127afe7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container;
-
-import org.eclipse.net4j.internal.util.event.Event;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IContainerEventVisitor;
-import org.eclipse.net4j.util.container.IContainerDelta.Kind;
-import org.eclipse.net4j.util.container.IContainerEventVisitor.Filtered;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class SingleDeltaContainerEvent<E> extends Event implements IContainerEvent<E>
-{
-  private static final long serialVersionUID = 1L;
-
-  private IContainerDelta<E>[] deltas;
-
-  @SuppressWarnings("unchecked")
-  public SingleDeltaContainerEvent(IContainer<E> container, E element, Kind kind)
-  {
-    super(container);
-    deltas = new IContainerDelta[] { new ContainerDelta<E>(element, kind) };
-  }
-
-  @SuppressWarnings("unchecked")
-  public IContainer<E> getContainer()
-  {
-    return (IContainer<E>)getSource();
-  }
-
-  public boolean isEmpty()
-  {
-    return false;
-  }
-
-  public IContainerDelta<E>[] getDeltas()
-  {
-    return deltas;
-  }
-
-  public IContainerDelta<E> getDelta() throws IllegalStateException
-  {
-    return deltas[0];
-  }
-
-  public E getDeltaElement() throws IllegalStateException
-  {
-    return deltas[0].getElement();
-  }
-
-  public Kind getDeltaKind() throws IllegalStateException
-  {
-    return deltas[0].getKind();
-  }
-
-  public void accept(IContainerEventVisitor<E> visitor)
-  {
-    E element = deltas[0].getElement();
-
-    boolean filtered = true;
-    if (visitor instanceof Filtered)
-    {
-      filtered = ((Filtered<E>)visitor).filter(element);
-    }
-
-    if (filtered)
-    {
-      switch (deltas[0].getKind())
-      {
-      case ADDED:
-        visitor.added(element);
-        break;
-      case REMOVED:
-        visitor.removed(element);
-        break;
-      }
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("ContainerEvent[source={0}, {1}={2}]", getSource(), getDeltaElement(), getDeltaKind());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java
deleted file mode 100644
index 7be676af7c..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container.delegate;
-
-import org.eclipse.net4j.internal.util.container.ContainerEvent;
-import org.eclipse.net4j.internal.util.container.SingleDeltaContainerEvent;
-import org.eclipse.net4j.internal.util.event.Notifier;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerDelta.Kind;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractDelegator<E> extends Notifier implements IContainer<E>
-{
-  public AbstractDelegator()
-  {
-  }
-
-  protected void fireAddedEvent(E o)
-  {
-    fireEvent(new SingleDeltaContainerEvent<E>(this, o, IContainerDelta.Kind.ADDED));
-  }
-
-  @SuppressWarnings("unchecked")
-  protected void fireRemovedEvent(Object o)
-  {
-    fireEvent(new SingleDeltaContainerEvent<E>(this, (E)o, IContainerDelta.Kind.REMOVED));
-  }
-
-  @SuppressWarnings("unchecked")
-  protected ContainerEvent<E> createEvent(Collection<? super E> c, Kind kind)
-  {
-    ContainerEvent<E> event = new ContainerEvent<E>(this);
-    for (Object o : c)
-    {
-      event.addDelta((E)o, kind);
-    }
-
-    return event;
-  }
-
-  protected boolean dispatchEvent(ContainerEvent<E> event)
-  {
-    if (event.isEmpty())
-    {
-      return false;
-    }
-
-    fireEvent(event);
-    return true;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class DelegatingIterator implements Iterator<E>
-  {
-    private Iterator<E> delegate;
-
-    protected E last;
-
-    public DelegatingIterator(Iterator<E> delegate)
-    {
-      this.delegate = delegate;
-    }
-
-    public Iterator<E> getDelegate()
-    {
-      return delegate;
-    }
-
-    /**
-     * @category READ
-     */
-    public boolean hasNext()
-    {
-      return getDelegate().hasNext();
-    }
-
-    /**
-     * @category READ
-     */
-    public E next()
-    {
-      return last = getDelegate().next();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public void remove()
-    {
-      getDelegate().remove();
-      fireRemovedEvent(last);
-      last = null;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java
deleted file mode 100644
index f2571d25b3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container.delegate;
-
-import org.eclipse.net4j.internal.util.container.ContainerEvent;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.delegate.IContainerBlockingQueue;
-
-import java.util.Collection;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerBlockingQueue<E> extends ContainerQueue<E> implements IContainerBlockingQueue<E>
-{
-  public ContainerBlockingQueue(BlockingQueue<E> delegate)
-  {
-    super(delegate);
-  }
-
-  @Override
-  public BlockingQueue<E> getDelegate()
-  {
-    return (BlockingQueue<E>)super.getDelegate();
-  }
-
-  /**
-   * @category WRITE
-   */
-  public int drainTo(Collection<? super E> c)
-  {
-    int drainTo = getDelegate().drainTo(c);
-    ContainerEvent<E> event = createEvent(c, IContainerDelta.Kind.REMOVED);
-    fireEvent(event);
-    return drainTo;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public int drainTo(Collection<? super E> c, int maxElements)
-  {
-    int drainTo = getDelegate().drainTo(c, maxElements);
-    ContainerEvent<E> event = createEvent(c, IContainerDelta.Kind.REMOVED);
-    fireEvent(event);
-    return drainTo;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public boolean offer(E o, long timeout, TimeUnit unit) throws InterruptedException
-  {
-    boolean modified = getDelegate().offer(o, timeout, unit);
-    if (modified)
-    {
-      fireAddedEvent(o);
-    }
-
-    return modified;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public E poll(long timeout, TimeUnit unit) throws InterruptedException
-  {
-    E removed = getDelegate().poll(timeout, unit);
-    if (removed != null)
-    {
-      fireRemovedEvent(removed);
-    }
-
-    return removed;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public void put(E o) throws InterruptedException
-  {
-    getDelegate().put(o);
-    fireAddedEvent(o);
-  }
-
-  /**
-   * @category READ
-   */
-  public int remainingCapacity()
-  {
-    return getDelegate().remainingCapacity();
-  }
-
-  /**
-   * @category WRITE
-   */
-  public E take() throws InterruptedException
-  {
-    E element = getDelegate().take();
-    fireRemovedEvent(element);
-    return element;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java
deleted file mode 100644
index 20559fbf4c..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container.delegate;
-
-import org.eclipse.net4j.internal.util.container.ContainerEvent;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.delegate.IContainerCollection;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerCollection<E> extends AbstractDelegator<E> implements IContainerCollection<E>
-{
-  private Collection<E> delegate;
-
-  public ContainerCollection(Collection<E> delegate)
-  {
-    this.delegate = delegate;
-  }
-
-  public Collection<E> getDelegate()
-  {
-    return delegate;
-  }
-
-  @SuppressWarnings("unchecked")
-  public E[] getElements()
-  {
-    return (E[])toArray();
-  }
-
-  /**
-   * @category WRITE
-   */
-  public boolean add(E o)
-  {
-    boolean modified = getDelegate().add(o);
-    if (modified)
-    {
-      fireAddedEvent(o);
-    }
-
-    return modified;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public boolean addAll(Collection<? extends E> c)
-  {
-    ContainerEvent<E> event = new ContainerEvent<E>(this);
-    for (E e : c)
-    {
-      boolean modified = getDelegate().add(e);
-      if (modified)
-      {
-        event.addDelta(e, IContainerDelta.Kind.ADDED);
-      }
-    }
-
-    return dispatchEvent(event);
-  }
-
-  /**
-   * @category WRITE
-   */
-  public void clear()
-  {
-    if (!isEmpty())
-    {
-      ContainerEvent<E> event = createEvent(getDelegate(), IContainerDelta.Kind.REMOVED);
-      getDelegate().clear();
-      fireEvent(event);
-    }
-  }
-
-  /**
-   * @category WRITE
-   */
-  public boolean remove(Object o)
-  {
-    boolean modified = getDelegate().remove(o);
-    if (modified)
-    {
-      fireRemovedEvent(o);
-    }
-
-    return modified;
-  }
-
-  /**
-   * @category WRITE
-   */
-  @SuppressWarnings("unchecked")
-  public boolean removeAll(Collection<?> c)
-  {
-    ContainerEvent<E> event = new ContainerEvent<E>(this);
-    for (Object o : c)
-    {
-      boolean modified = getDelegate().remove(o);
-      if (modified)
-      {
-        event.addDelta((E)o, IContainerDelta.Kind.REMOVED);
-      }
-    }
-
-    return dispatchEvent(event);
-  }
-
-  /**
-   * @category WRITE
-   */
-  @SuppressWarnings("unchecked")
-  public boolean retainAll(Collection<?> c)
-  {
-    ContainerEvent<E> event = new ContainerEvent<E>(this);
-    for (Object o : getDelegate())
-    {
-      if (!c.contains(o))
-      {
-        getDelegate().remove(o);
-        event.addDelta((E)o, IContainerDelta.Kind.REMOVED);
-      }
-    }
-
-    return dispatchEvent(event);
-  }
-
-  /**
-   * @category READ
-   */
-  public boolean contains(Object o)
-  {
-    return getDelegate().contains(o);
-  }
-
-  /**
-   * @category READ
-   */
-  public boolean containsAll(Collection<?> c)
-  {
-    return getDelegate().containsAll(c);
-  }
-
-  /**
-   * @category READ
-   */
-  @Override
-  public boolean equals(Object o)
-  {
-    return getDelegate().equals(o);
-  }
-
-  /**
-   * @category READ
-   */
-  @Override
-  public int hashCode()
-  {
-    return getDelegate().hashCode();
-  }
-
-  /**
-   * @category READ
-   */
-  public boolean isEmpty()
-  {
-    return getDelegate().isEmpty();
-  }
-
-  /**
-   * @category READ
-   */
-  public Iterator<E> iterator()
-  {
-    return new DelegatingIterator(getDelegate().iterator());
-  }
-
-  /**
-   * @category READ
-   */
-  public int size()
-  {
-    return getDelegate().size();
-  }
-
-  /**
-   * @category READ
-   */
-  public Object[] toArray()
-  {
-    return getDelegate().toArray();
-  }
-
-  /**
-   * @category READ
-   */
-  public <T> T[] toArray(T[] a)
-  {
-    return getDelegate().toArray(a);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java
deleted file mode 100644
index 072da17153..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container.delegate;
-
-import org.eclipse.net4j.internal.util.container.ContainerEvent;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.delegate.IContainerList;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.ListIterator;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerList<E> extends ContainerCollection<E> implements IContainerList<E>
-{
-  public ContainerList(List<E> delegate)
-  {
-    super(delegate);
-  }
-
-  @Override
-  public List<E> getDelegate()
-  {
-    return (List<E>)super.getDelegate();
-  }
-
-  /**
-   * @category WRITE
-   */
-  public void add(int index, E element)
-  {
-    getDelegate().add(index, element);
-    fireAddedEvent(element);
-  }
-
-  /**
-   * @category WRITE
-   */
-  public boolean addAll(int index, Collection<? extends E> c)
-  {
-    ContainerEvent<E> event = createEvent(getDelegate(), IContainerDelta.Kind.ADDED);
-    getDelegate().addAll(index, c);
-    return dispatchEvent(event);
-  }
-
-  /**
-   * @category READ
-   */
-  public E get(int index)
-  {
-    return getDelegate().get(index);
-  }
-
-  /**
-   * @category READ
-   */
-  public int indexOf(Object o)
-  {
-    return getDelegate().indexOf(o);
-  }
-
-  /**
-   * @category READ
-   */
-  public int lastIndexOf(Object o)
-  {
-    return getDelegate().lastIndexOf(o);
-  }
-
-  /**
-   * @category READ
-   */
-  public ListIterator<E> listIterator()
-  {
-    return new DelegatingListIterator(getDelegate().listIterator());
-  }
-
-  /**
-   * @category READ
-   */
-  public ListIterator<E> listIterator(int index)
-  {
-    return new DelegatingListIterator(getDelegate().listIterator(index));
-  }
-
-  /**
-   * @category WRITE
-   */
-  public E remove(int index)
-  {
-    E removed = getDelegate().remove(index);
-    if (removed != null)
-    {
-      fireRemovedEvent(removed);
-    }
-
-    return removed;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public E set(int index, E element)
-  {
-    E removed = getDelegate().set(index, element);
-    ContainerEvent<E> event = new ContainerEvent<E>(ContainerList.this);
-    event.addDelta(removed, IContainerDelta.Kind.REMOVED);
-    event.addDelta(element, IContainerDelta.Kind.ADDED);
-    fireEvent(event);
-    return removed;
-  }
-
-  /**
-   * @category READ
-   */
-  public List<E> subList(int fromIndex, int toIndex)
-  {
-    return getDelegate().subList(fromIndex, toIndex);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class DelegatingListIterator extends DelegatingIterator implements ListIterator<E>
-  {
-    public DelegatingListIterator(ListIterator<E> delegate)
-    {
-      super(delegate);
-    }
-
-    @Override
-    public ListIterator<E> getDelegate()
-    {
-      return (ListIterator<E>)super.getDelegate();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public void add(E o)
-    {
-      getDelegate().add(o);
-      fireAddedEvent(o);
-      last = o;
-    }
-
-    /**
-     * @category WRITE
-     */
-    public void set(E o)
-    {
-      getDelegate().set(o);
-      ContainerEvent<E> event = new ContainerEvent<E>(ContainerList.this);
-      event.addDelta(last, IContainerDelta.Kind.REMOVED);
-      event.addDelta(o, IContainerDelta.Kind.ADDED);
-      fireEvent(event);
-      last = o;
-    }
-
-    /**
-     * @category READ
-     */
-    public boolean hasPrevious()
-    {
-      return getDelegate().hasPrevious();
-    }
-
-    /**
-     * @category READ
-     */
-    public int nextIndex()
-    {
-      return getDelegate().nextIndex();
-    }
-
-    /**
-     * @category READ
-     */
-    public E previous()
-    {
-      return getDelegate().previous();
-    }
-
-    /**
-     * @category READ
-     */
-    public int previousIndex()
-    {
-      return getDelegate().previousIndex();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java
deleted file mode 100644
index ea033de411..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container.delegate;
-
-import org.eclipse.net4j.internal.util.container.ContainerEvent;
-import org.eclipse.net4j.util.collection.MapEntry;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.delegate.IContainerMap;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> implements IContainerMap<K, V>
-{
-  private Map<K, V> delegate;
-
-  public ContainerMap(Map<K, V> delegate)
-  {
-    this.delegate = delegate;
-  }
-
-  public Map<K, V> getDelegate()
-  {
-    return delegate;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public void clear()
-  {
-    if (!isEmpty())
-    {
-      ContainerEvent<Map.Entry<K, V>> event = createEvent(getDelegate().entrySet(), IContainerDelta.Kind.REMOVED);
-      getDelegate().clear();
-      fireEvent(event);
-    }
-  }
-
-  /**
-   * @category WRITE
-   */
-  public V put(K key, V value)
-  {
-    ContainerEvent<Map.Entry<K, V>> event = new ContainerEvent<Map.Entry<K, V>>(this);
-    V removed = getDelegate().put(key, value);
-    if (removed != null)
-    {
-      event.addDelta(new ContainerMapEntry<K, V>(key, removed), IContainerDelta.Kind.REMOVED);
-    }
-
-    event.addDelta(new ContainerMapEntry<K, V>(key, value), IContainerDelta.Kind.ADDED);
-    fireEvent(event);
-    return removed;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public void putAll(Map<? extends K, ? extends V> t)
-  {
-    ContainerEvent<Map.Entry<K, V>> event = new ContainerEvent<Map.Entry<K, V>>(this);
-    Iterator<? extends Entry<? extends K, ? extends V>> i = t.entrySet().iterator();
-    while (i.hasNext())
-    {
-      Entry<? extends K, ? extends V> entry = i.next();
-      K key = entry.getKey();
-      V value = entry.getValue();
-      V removed = getDelegate().put(key, value);
-      if (removed != null)
-      {
-        event.addDelta(new ContainerMapEntry<K, V>(key, removed), IContainerDelta.Kind.REMOVED);
-      }
-
-      event.addDelta(new ContainerMapEntry<K, V>(key, value), IContainerDelta.Kind.ADDED);
-    }
-
-    dispatchEvent(event);
-  }
-
-  /**
-   * @category WRITE
-   */
-  public V remove(Object key)
-  {
-    V removed = getDelegate().remove(key);
-    if (removed != null)
-    {
-      fireRemovedEvent(new ContainerMapEntry<Object, V>(key, removed));
-    }
-
-    return removed;
-  }
-
-  /**
-   * @category READ
-   */
-  public boolean containsKey(Object key)
-  {
-    return getDelegate().containsKey(key);
-  }
-
-  /**
-   * @category READ
-   */
-  public boolean containsValue(Object value)
-  {
-    return getDelegate().containsValue(value);
-  }
-
-  /**
-   * @category READ
-   */
-  public V get(Object key)
-  {
-    return getDelegate().get(key);
-  }
-
-  /**
-   * @category READ
-   */
-  public int size()
-  {
-    return getDelegate().size();
-  }
-
-  /**
-   * @category READ
-   */
-  @SuppressWarnings("unchecked")
-  public Map.Entry<K, V>[] getElements()
-  {
-    return (Entry<K, V>[])getDelegate().entrySet().toArray();
-  }
-
-  /**
-   * @category READ
-   */
-  public boolean isEmpty()
-  {
-    return getDelegate().isEmpty();
-  }
-
-  /**
-   * @category READ
-   */
-  public Set<Map.Entry<K, V>> entrySet()
-  {
-    return new ContainerSet<Map.Entry<K, V>>(getDelegate().entrySet());
-  }
-
-  /**
-   * @category READ
-   */
-  public Set<K> keySet()
-  {
-    return new ContainerSet<K>(getDelegate().keySet());
-  }
-
-  /**
-   * @category READ
-   */
-  public Collection<V> values()
-  {
-    return new ContainerCollection<V>(getDelegate().values());
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class ContainerMapEntry<K, V> extends MapEntry<K, V>
-  {
-    public ContainerMapEntry(K key, V value)
-    {
-      super(key, value);
-    }
-
-    @Override
-    public V setValue(V value)
-    {
-      throw new UnsupportedOperationException();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerQueue.java
deleted file mode 100644
index bb9568afc1..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerQueue.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container.delegate;
-
-import org.eclipse.net4j.util.container.delegate.IContainerQueue;
-
-import java.util.Queue;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerQueue<E> extends ContainerCollection<E> implements IContainerQueue<E>
-{
-  public ContainerQueue(Queue<E> delegate)
-  {
-    super(delegate);
-  }
-
-  @Override
-  public Queue<E> getDelegate()
-  {
-    return (Queue<E>)super.getDelegate();
-  }
-
-  /**
-   * @category READ
-   */
-  public E element()
-  {
-    return getDelegate().element();
-  }
-
-  /**
-   * @category WRITE
-   */
-  public boolean offer(E o)
-  {
-    boolean modified = getDelegate().offer(o);
-    if (modified)
-    {
-      fireAddedEvent(o);
-    }
-
-    return modified;
-  }
-
-  /**
-   * @category READ
-   */
-  public E peek()
-  {
-    return getDelegate().element();
-  }
-
-  /**
-   * @category WRITE
-   */
-  public E poll()
-  {
-    E removed = getDelegate().poll();
-    if (removed != null)
-    {
-      fireRemovedEvent(removed);
-    }
-
-    return removed;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public E remove()
-  {
-    E removed = getDelegate().remove();
-    if (removed != null)
-    {
-      fireRemovedEvent(removed);
-    }
-
-    return removed;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSet.java
deleted file mode 100644
index 309ee30586..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSet.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container.delegate;
-
-import org.eclipse.net4j.util.container.delegate.IContainerSet;
-
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerSet<E> extends ContainerCollection<E> implements IContainerSet<E>
-{
-  public ContainerSet(Set<E> delegate)
-  {
-    super(delegate);
-  }
-
-  @Override
-  public Set<E> getDelegate()
-  {
-    return (Set<E>)super.getDelegate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSortedSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSortedSet.java
deleted file mode 100644
index 1e00c6c7dd..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSortedSet.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.container.delegate;
-
-import org.eclipse.net4j.util.container.delegate.IContainerSortedSet;
-
-import java.util.Comparator;
-import java.util.SortedSet;
-
-/**
- * @author Eike Stepper
- */
-public class ContainerSortedSet<E> extends ContainerSet<E> implements IContainerSortedSet<E>
-{
-  public ContainerSortedSet(SortedSet<E> delegate)
-  {
-    super(delegate);
-  }
-
-  @Override
-  public SortedSet<E> getDelegate()
-  {
-    return (SortedSet<E>)super.getDelegate();
-  }
-
-  /**
-   * @category READ
-   */
-  public Comparator<? super E> comparator()
-  {
-    return getDelegate().comparator();
-  }
-
-  /**
-   * @category READ
-   */
-  public E first()
-  {
-    return getDelegate().first();
-  }
-
-  /**
-   * @category READ
-   */
-  public E last()
-  {
-    return getDelegate().last();
-  }
-
-  /**
-   * @category READ
-   */
-  public SortedSet<E> headSet(E toElement)
-  {
-    return getDelegate().headSet(toElement);
-  }
-
-  /**
-   * @category READ
-   */
-  public SortedSet<E> subSet(E fromElement, E toElement)
-  {
-    return getDelegate().subSet(fromElement, toElement);
-  }
-
-  /**
-   * @category READ
-   */
-  public SortedSet<E> tailSet(E fromElement)
-  {
-    return getDelegate().tailSet(fromElement);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Event.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Event.java
deleted file mode 100644
index 9e70cbbdef..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Event.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.event;
-
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.INotifier;
-
-import java.util.EventObject;
-
-/**
- * @author Eike Stepper
- */
-public class Event extends EventObject implements IEvent
-{
-  private static final long serialVersionUID = 1L;
-
-  public Event(INotifier notifier)
-  {
-    super(notifier);
-  }
-
-  public INotifier getSource()
-  {
-    return (INotifier)source;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java
deleted file mode 100644
index c7df10f312..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.event;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.event.INotifier;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class Notifier implements INotifier.Introspection
-{
-  /**
-   * TODO Optimize by storing an array
-   */
-  private List<IListener> listeners = new ArrayList<IListener>(0);
-
-  public Notifier()
-  {
-  }
-
-  public void addListener(IListener listener)
-  {
-    synchronized (listeners)
-    {
-      listeners.add(listener);
-    }
-  }
-
-  public void removeListener(IListener listener)
-  {
-    synchronized (listeners)
-    {
-      listeners.remove(listener);
-    }
-  }
-
-  public boolean hasListeners()
-  {
-    return !listeners.isEmpty();
-  }
-
-  public IListener[] getListeners()
-  {
-    synchronized (listeners)
-    {
-      return listeners.toArray(new IListener[listeners.size()]);
-    }
-  }
-
-  public void fireEvent(IEvent event)
-  {
-    for (IListener listener : getListeners())
-    {
-      try
-      {
-        listener.notifyEvent(event);
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java
deleted file mode 100644
index a64ed8747a..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.factory;
-
-import org.eclipse.net4j.util.factory.IFactory;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Factory implements IFactory
-{
-  private FactoryKey key;
-
-  public Factory(FactoryKey key)
-  {
-    this.key = key;
-  }
-
-  public Factory(String productGroup, String type)
-  {
-    this(new FactoryKey(productGroup, type));
-  }
-
-  public FactoryKey getKey()
-  {
-    return key;
-  }
-
-  public String getProductGroup()
-  {
-    return key.getProductGroup();
-  }
-
-  public String getType()
-  {
-    return key.getType();
-  }
-
-  public String getDescriptionFor(Object product)
-  {
-    return null;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("Factory[{0}, {1}]", getProductGroup(), getType());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryCreationException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryCreationException.java
deleted file mode 100644
index 56369be7c4..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryCreationException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.factory;
-
-/**
- * @author Eike Stepper
- */
-public class FactoryCreationException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public FactoryCreationException()
-  {
-  }
-
-  public FactoryCreationException(String message)
-  {
-    super(message);
-  }
-
-  public FactoryCreationException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public FactoryCreationException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryDescriptor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryDescriptor.java
deleted file mode 100644
index 0e5d2e19c7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryDescriptor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.factory;
-
-import org.eclipse.net4j.util.factory.IFactory;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
- * @author Eike Stepper
- */
-public class FactoryDescriptor extends Factory
-{
-  private static final String ATTR_PRODUCT_GROUP = "productGroup";
-
-  private static final String ATTR_TYPE = "type";
-
-  private static final String ATTR_CLASS = "class";
-
-  private IConfigurationElement configurationElement;
-
-  public FactoryDescriptor(IConfigurationElement configurationElement)
-  {
-    super(createFactoryKey(configurationElement));
-    this.configurationElement = configurationElement;
-  }
-
-  public IConfigurationElement getConfigurationElement()
-  {
-    return configurationElement;
-  }
-
-  public IFactory createFactory()
-  {
-    try
-    {
-      return (IFactory)configurationElement.createExecutableExtension(ATTR_CLASS);
-    }
-    catch (CoreException ex)
-    {
-      throw new FactoryCreationException(ex);
-    }
-  }
-
-  public Object create(String description)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public String getDescriptionFor(Object product)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  private static FactoryKey createFactoryKey(IConfigurationElement element)
-  {
-    String productGroup = element.getAttribute(ATTR_PRODUCT_GROUP);
-    String type = element.getAttribute(ATTR_TYPE);
-    return new FactoryKey(productGroup, type);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java
deleted file mode 100644
index b6d9bc83f9..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.factory;
-
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.factory.IFactoryKey;
-
-import java.io.Serializable;
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public final class FactoryKey implements IFactoryKey, Serializable, Comparable<FactoryKey>
-{
-  private static final long serialVersionUID = 1L;
-
-  private String productGroup;
-
-  private String type;
-
-  public FactoryKey(String productGroup, String type)
-  {
-    this.productGroup = productGroup;
-    this.type = type;
-  }
-
-  public String getProductGroup()
-  {
-    return productGroup;
-  }
-
-  public void setProductGroup(String productGroup)
-  {
-    this.productGroup = productGroup;
-  }
-
-  public String getType()
-  {
-    return type;
-  }
-
-  public void setType(String type)
-  {
-    this.type = type;
-  }
-
-  @Override
-  public boolean equals(Object obj)
-  {
-    if (obj == this)
-    {
-      return true;
-    }
-
-    if (obj instanceof FactoryKey)
-    {
-      FactoryKey key = (FactoryKey)obj;
-      return ObjectUtil.equals(productGroup, key.productGroup) && ObjectUtil.equals(type, key.type);
-    }
-
-    return false;
-  }
-
-  @Override
-  public int hashCode()
-  {
-    return ObjectUtil.hashCode(productGroup) ^ ObjectUtil.hashCode(type);
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("{0}[{1}]", productGroup, type);
-  }
-
-  public int compareTo(FactoryKey key)
-  {
-    int result = StringUtil.compare(productGroup, key.productGroup);
-    if (result == 0)
-    {
-      result = StringUtil.compare(type, key.type);
-    }
-
-    return result;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
deleted file mode 100644
index bb3fd0ab4f..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.factory;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.registry.HashMapRegistry;
-import org.eclipse.net4j.util.factory.IFactory;
-import org.eclipse.net4j.util.factory.IFactoryKey;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionDelta;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IRegistryChangeEvent;
-import org.eclipse.core.runtime.IRegistryChangeListener;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * @author Eike Stepper
- */
-public class PluginFactoryRegistry extends HashMapRegistry<IFactoryKey, IFactory>
-{
-  public static final String NAMESPACE = OM.BUNDLE_ID;
-
-  public static final String EXT_POINT = "factories";
-
-  private IRegistryChangeListener extensionRegistryListener = new IRegistryChangeListener()
-  {
-    public void registryChanged(IRegistryChangeEvent event)
-    {
-      IExtensionDelta[] deltas = event.getExtensionDeltas(NAMESPACE, EXT_POINT);
-      for (IExtensionDelta delta : deltas)
-      {
-        // TODO Handle ExtensionDelta
-        OM.LOG.warn("ExtensionDelta not handled: " + delta);
-      }
-    }
-  };
-
-  public PluginFactoryRegistry()
-  {
-  }
-
-  @Override
-  public IFactory get(Object key)
-  {
-    IFactory factory = super.get(key);
-    if (factory instanceof FactoryDescriptor)
-    {
-      FactoryDescriptor descriptor = (FactoryDescriptor)factory;
-      factory = descriptor.createFactory();
-    }
-
-    return factory;
-  }
-
-  public void registerFactory(FactoryDescriptor factory)
-  {
-    put(factory.getKey(), factory);
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-    IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(NAMESPACE, EXT_POINT);
-    for (IConfigurationElement element : elements)
-    {
-      registerFactory(new FactoryDescriptor(element));
-    }
-
-    extensionRegistry.addRegistryChangeListener(extensionRegistryListener, NAMESPACE);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-    extensionRegistry.removeRegistryChangeListener(extensionRegistryListener);
-    clear();
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java
deleted file mode 100644
index 7d6409e8ac..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.lifecycle;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.event.Notifier;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.CheckUtil;
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-import org.eclipse.net4j.util.lifecycle.ILifecycleState;
-import org.eclipse.net4j.util.lifecycle.LifecycleException;
-
-/**
- * @author Eike Stepper
- */
-public class Lifecycle extends Notifier implements ILifecycle.Introspection
-{
-  public static boolean USE_LABEL = true;
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_LIFECYCLE, Lifecycle.class);
-
-  private static final ContextTracer DUMPER = new ContextTracer(OM.DEBUG_LIFECYCLE_DUMP, Lifecycle.class);
-
-  private static final boolean TRACE_IGNORING = false;
-
-  private ILifecycleState lifecycleState = ILifecycleState.INACTIVE;
-
-  protected Lifecycle()
-  {
-  }
-
-  public final void activate() throws LifecycleException
-  {
-    if (lifecycleState == ILifecycleState.INACTIVE)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Activating " + this);//$NON-NLS-1$
-      }
-
-      lifecycleState = ILifecycleState.ACTIVATING;
-      fireEvent(new LifecycleEvent(this, ILifecycleEvent.Kind.ABOUT_TO_ACTIVATE));
-
-      try
-      {
-        doBeforeActivate();
-        doActivate();
-      }
-      catch (RuntimeException ex)
-      {
-        throw ex;
-      }
-      catch (Exception ex)
-      {
-        throw new LifecycleException(ex);
-      }
-
-      if (!isDeferredActivation())
-      {
-        deferredActivate();
-      }
-    }
-    else
-    {
-      if (TRACE_IGNORING && TRACER.isEnabled())
-      {
-        TRACER.format("Ignoring activation in state {0} for {1}", lifecycleState, this);//$NON-NLS-1$
-      }
-    }
-  }
-
-  public final Exception deactivate()
-  {
-    if (lifecycleState == ILifecycleState.ACTIVE || lifecycleState == ILifecycleState.ACTIVATING)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Deactivating " + this);//$NON-NLS-1$
-      }
-
-      try
-      {
-        lifecycleState = ILifecycleState.DEACTIVATING;
-        doBeforeDeactivate();
-        fireEvent(new LifecycleEvent(this, ILifecycleEvent.Kind.ABOUT_TO_DEACTIVATE));
-
-        if (!isDeferredDeactivation())
-        {
-          deferredDeactivate();
-        }
-      }
-      catch (Exception ex)
-      {
-        OM.LOG.error(ex);
-        return ex;
-      }
-    }
-    else
-    {
-      if (TRACE_IGNORING && TRACER.isEnabled())
-      {
-        TRACER.format("Ignoring deactivation in state {0} for {1}", lifecycleState, this);//$NON-NLS-1$
-      }
-    }
-
-    return null;
-  }
-
-  public final ILifecycleState getLifecycleState()
-  {
-    return lifecycleState;
-  }
-
-  public final boolean isActive()
-  {
-    return lifecycleState == ILifecycleState.ACTIVE;
-  }
-
-  @Override
-  public String toString()
-  {
-    if (USE_LABEL)
-    {
-      return ReflectUtil.getLabel(this);
-    }
-
-    return super.toString();
-  }
-
-  protected final void dump()
-  {
-    if (DUMPER.isEnabled())
-    {
-      DUMPER.trace("DUMP" + ReflectUtil.toString(this)); //$NON-NLS-1$
-    }
-  }
-
-  protected final void checkActive()
-  {
-    if (lifecycleState != ILifecycleState.ACTIVE)
-    {
-      throw new IllegalStateException("Not active: " + this);
-    }
-  }
-
-  protected final void checkInactive()
-  {
-    if (lifecycleState != ILifecycleState.INACTIVE)
-    {
-      throw new IllegalStateException("Not inactive: " + this);
-    }
-  }
-
-  protected final void checkNull(Object handle, String msg) throws NullPointerException
-  {
-    CheckUtil.checkNull(handle, msg);
-  }
-
-  protected final void checkArg(boolean expr, String msg) throws IllegalArgumentException
-  {
-    CheckUtil.checkArg(expr, msg);
-  }
-
-  protected final void checkArg(Object handle, String handleName) throws IllegalArgumentException
-  {
-    CheckUtil.checkArg(handle, handleName);
-  }
-
-  protected final void checkState(boolean expr, String msg) throws IllegalStateException
-  {
-    CheckUtil.checkState(expr, msg);
-  }
-
-  protected final void checkState(Object handle, String handleName) throws IllegalStateException
-  {
-    CheckUtil.checkState(handle, handleName);
-  }
-
-  protected final void deferredActivate()
-  {
-    lifecycleState = ILifecycleState.ACTIVE;
-    fireEvent(new LifecycleEvent(this, ILifecycleEvent.Kind.ACTIVATED));
-    dump();
-  }
-
-  protected final void deferredDeactivate() throws Exception
-  {
-    doDeactivate();
-    lifecycleState = ILifecycleState.INACTIVE;
-    fireEvent(new LifecycleEvent(this, ILifecycleEvent.Kind.DEACTIVATED));
-  }
-
-  protected boolean isDeferredActivation()
-  {
-    return false;
-  }
-
-  protected boolean isDeferredDeactivation()
-  {
-    return false;
-  }
-
-  protected void doBeforeActivate() throws Exception
-  {
-  }
-
-  protected void doActivate() throws Exception
-  {
-  }
-
-  protected void doBeforeDeactivate() throws Exception
-  {
-  }
-
-  protected void doDeactivate() throws Exception
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEvent.java
deleted file mode 100644
index 98083141f6..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEvent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.lifecycle;
-
-import org.eclipse.net4j.internal.util.event.Event;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-
-/**
- * @author Eike Stepper
- */
-public class LifecycleEvent extends Event implements ILifecycleEvent
-{
-  private static final long serialVersionUID = 1L;
-
-  private Kind kind;
-
-  public LifecycleEvent(Lifecycle lifecycle, Kind kind)
-  {
-    super(lifecycle);
-    this.kind = kind;
-  }
-
-  public ILifecycle getLifecycle()
-  {
-    return (ILifecycle)getSource();
-  }
-
-  public Kind getKind()
-  {
-    return kind;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEventAdapter.java
deleted file mode 100644
index 05e8bd6a45..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEventAdapter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.lifecycle;
-
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-
-/**
- * @author Eike Stepper
- */
-public class LifecycleEventAdapter implements IListener
-{
-  public LifecycleEventAdapter()
-  {
-  }
-
-  public final void notifyEvent(IEvent event)
-  {
-    if (event instanceof ILifecycleEvent)
-    {
-      ILifecycleEvent e = (ILifecycleEvent)event;
-      notifyLifecycleEvent(e);
-    }
-    else
-    {
-      notifyOtherEvent(event);
-    }
-  }
-
-  protected void notifyLifecycleEvent(ILifecycleEvent event)
-  {
-    switch (event.getKind())
-    {
-    case ABOUT_TO_ACTIVATE:
-      onAboutToActivate(event.getLifecycle());
-      break;
-    case ACTIVATED:
-      onActivated(event.getLifecycle());
-      break;
-    case ABOUT_TO_DEACTIVATE:
-      onAboutToDeactivate(event.getLifecycle());
-      break;
-    case DEACTIVATED:
-      onDeactivated(event.getLifecycle());
-      break;
-    }
-  }
-
-  protected void notifyOtherEvent(IEvent event)
-  {
-  }
-
-  protected void onAboutToActivate(ILifecycle lifecycle)
-  {
-  }
-
-  protected void onActivated(ILifecycle lifecycle)
-  {
-  }
-
-  protected void onAboutToDeactivate(ILifecycle lifecycle)
-  {
-  }
-
-  protected void onDeactivated(ILifecycle lifecycle)
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java
deleted file mode 100644
index 6aea5c6bf4..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.lifecycle;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-public abstract class QueueWorker<E> extends Worker
-{
-  private BlockingQueue<E> queue;
-
-  private long pollMillis;
-
-  public QueueWorker()
-  {
-    setPollMillis(100);
-  }
-
-  public long getPollMillis()
-  {
-    return pollMillis;
-  }
-
-  public void setPollMillis(long pollMillis)
-  {
-    this.pollMillis = pollMillis;
-  }
-
-  public boolean addWork(E element)
-  {
-    if (queue != null)
-    {
-      return queue.offer(element);
-    }
-
-    return false;
-  }
-
-  @Override
-  protected final void work(WorkContext context) throws Exception
-  {
-    E element = queue.poll(pollMillis, TimeUnit.MILLISECONDS);
-    if (element != null)
-    {
-      work(context, element);
-    }
-  }
-
-  protected abstract void work(WorkContext context, E element);
-
-  protected BlockingQueue<E> createQueue()
-  {
-    return new LinkedBlockingQueue<E>();
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    queue = createQueue();
-    super.doActivate();
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    super.doDeactivate();
-    if (queue != null)
-    {
-      queue.clear();
-      queue = null;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Worker.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Worker.java
deleted file mode 100644
index be6d38efd8..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Worker.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.lifecycle;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Worker extends Lifecycle
-{
-  public static final int DEFAULT_TIMEOUT = 2000;
-
-  private boolean daemon;
-
-  private long activationTimeout = DEFAULT_TIMEOUT;
-
-  private long deactivationTimeout = DEFAULT_TIMEOUT;
-
-  private transient CountDownLatch activationLatch;
-
-  private transient WorkerThread workerThread;
-
-  public Worker()
-  {
-  }
-
-  public boolean isDaemon()
-  {
-    return daemon;
-  }
-
-  public void setDaemon(boolean daemon)
-  {
-    this.daemon = daemon;
-  }
-
-  public long getActivationTimeout()
-  {
-    return activationTimeout;
-  }
-
-  public void setActivationTimeout(long activationTimeout)
-  {
-    this.activationTimeout = activationTimeout;
-  }
-
-  public long getDeactivationTimeout()
-  {
-    return deactivationTimeout;
-  }
-
-  public void setDeactivationTimeout(long deactivationTimeout)
-  {
-    this.deactivationTimeout = deactivationTimeout;
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    activationLatch = new CountDownLatch(1);
-    String threadName = getThreadName();
-    workerThread = threadName == null ? new WorkerThread() : new WorkerThread(threadName);
-    workerThread.start();
-    if (!activationLatch.await(activationTimeout, TimeUnit.MILLISECONDS))
-    {
-      try
-      {
-        workerThread.stopRunning();
-        workerThread.interrupt();
-      }
-      catch (RuntimeException ignore)
-      {
-      }
-
-      throw new TimeoutException("Worker thread activation timed out after " + activationTimeout + " millis");
-    }
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    try
-    {
-      workerThread.stopRunning();
-      workerThread.interrupt();
-      workerThread.join(deactivationTimeout);
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-
-    super.doDeactivate();
-  }
-
-  protected String getThreadName()
-  {
-    return null;
-  }
-
-  protected abstract void work(WorkContext context) throws Exception;
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class WorkerThread extends Thread
-  {
-    private boolean running = true;
-
-    public WorkerThread()
-    {
-      setDaemon(daemon);
-    }
-
-    public WorkerThread(String threadName)
-    {
-      super(threadName);
-      setDaemon(daemon);
-    }
-
-    public void stopRunning()
-    {
-      running = false;
-    }
-
-    @Override
-    public void run()
-    {
-      WorkContext context = new WorkContext();
-      activationLatch.countDown();
-      while (running && !isInterrupted())
-      {
-        try
-        {
-          context.increaseCount();
-          work(context);
-        }
-        catch (NextWork nextWork)
-        {
-          nextWork.pause();
-        }
-        catch (Terminate terminate)
-        {
-          break;
-        }
-        catch (InterruptedException ex)
-        {
-          break;
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-          break;
-        }
-      }
-
-      deactivate();
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public final class WorkContext
-  {
-    private long count;
-
-    public WorkContext()
-    {
-    }
-
-    public long getCount()
-    {
-      return count;
-    }
-
-    public void nextWork()
-    {
-      throw new NextWork();
-    }
-
-    public void nextWork(long pauseMillis)
-    {
-      throw new NextWork(pauseMillis);
-    }
-
-    public void terminate()
-    {
-      throw new Terminate();
-    }
-
-    private void increaseCount()
-    {
-      ++count;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class NextWork extends RuntimeException
-  {
-    private static final long serialVersionUID = 1L;
-
-    private long pauseMillis;
-
-    public NextWork()
-    {
-    }
-
-    public NextWork(long pauseMillis)
-    {
-      this.pauseMillis = pauseMillis;
-    }
-
-    public void pause()
-    {
-      if (pauseMillis > 0)
-      {
-        ConcurrencyUtil.sleep(pauseMillis);
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class Terminate extends RuntimeException
-  {
-    private static final long serialVersionUID = 1L;
-
-    public Terminate()
-    {
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
deleted file mode 100644
index 5c5a6a06fb..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om;
-
-import org.eclipse.net4j.internal.util.bundle.AbstractBundle;
-import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.Map.Entry;
-
-/**
- * @author Eike Stepper
- */
-public class LegacyBundle extends AbstractBundle
-{
-  private URL baseURL;
-
-  public LegacyBundle(AbstractPlatform platform, String bundleID, Class<?> accessor)
-  {
-    super(platform, bundleID, accessor);
-
-    try
-    {
-      computeBaseURL(accessor);
-      loadOptions();
-    }
-    catch (Exception ex)
-    {
-      IOUtil.print(ex);
-    }
-  }
-
-  public String getStateLocation()
-  {
-    return new File(getPlatform().getStateFolder(), ".plugins/" + getBundleID()).getAbsolutePath();
-  }
-
-  public URL getBaseURL()
-  {
-    return baseURL;
-  }
-
-  private void loadOptions()
-  {
-    InputStream inputStream = null;
-    Properties properties = new Properties();
-
-    try
-    {
-      final String prefix = getBundleID() + "/"; //$NON-NLS-1$
-      final int length = prefix.length();
-
-      inputStream = getInputStream(".options"); //$NON-NLS-1$
-      properties.load(inputStream);
-
-      for (Entry<Object, Object> entry : properties.entrySet())
-      {
-        try
-        {
-          String key = (String)entry.getKey();
-          if (key.startsWith(prefix))
-          {
-            String value = (String)entry.getValue();
-            setDebugOption(key.substring(length), value);
-          }
-        }
-        catch (RuntimeException ignore)
-        {
-          ;
-        }
-      }
-    }
-    catch (IOException ignore)
-    {
-      ;
-    }
-    finally
-    {
-      IOUtil.closeSilent(inputStream);
-    }
-  }
-
-  private void computeBaseURL(Class<?> accessor) throws MalformedURLException
-  {
-    // Determine the URL for the class itself. The URL will be of one of the
-    // following forms, so there are a few good places to consider looking for
-    // the plugin.properties.
-    //
-    // For a plugin.xml with runtime="common.jar":
-    // jar:file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common/common.jar!/org/eclipse/common/CommonPlugin.class
-    //
-    // For a plugin.xml with runtime="runtime/common.jar":
-    // jar:file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common/runtime/common.jar!/org/eclipse/common/CommonPlugin.class
-    // 
-    // For a plugin.xml with runtime="." where the plugin is jarred:
-    // jar:file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common.jar!/org/eclipse/common/CommonPlugin.class
-    //
-    // For a plugin.xml with runtime="." where the plugin is not jarred.
-    // file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common/org/eclipse/emf/common/CommonPlugin.class
-    //
-    // Running in PDE with bin on classpath:
-    // file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common/bin/org/eclipse/emf/common/CommonPlugin.class
-
-    String className = accessor.getName();
-    URL url = accessor.getResource(ReflectUtil.getSimpleName(accessor) + ".class"); //$NON-NLS-1$
-
-    int segmentsToTrim = 1 + StringUtil.occurrences(className, '.');
-    url = trimSegments(url, segmentsToTrim);
-
-    // For an archive URI, check for the plugin.properties in the archive.
-    if (isArchiveProtocol(url.getProtocol()))
-    {
-      try
-      {
-        // If we can open an input stream, then the plugin.properties is there,
-        // and we have a good base URL.
-        InputStream inputStream = new URL(url.toString() + "plugin.properties").openStream(); //$NON-NLS-1$
-        inputStream.close();
-        baseURL = url;
-      }
-      catch (IOException exception)
-      {
-        // If the plugin.properties isn't within the root of the archive, create
-        // a new URI for the folder location of the archive, so we can look in
-        // the folder that contains it.
-        url = trimSegments(new URL(url.getFile()), 1);
-      }
-    }
-
-    // If we didn't find the plugin.properties in the usual place nor in the
-    // archive...
-    if (baseURL == null)
-    {
-      // Trim off the "bin" or "runtime" segment.
-      String lastSegment = lastSegment(url);
-      if ("bin".equals(lastSegment) || "runtime".equals(lastSegment)) //$NON-NLS-1$ //$NON-NLS-2$
-      {
-        url = trimSegments(url, 1);
-      }
-
-      try
-      {
-        // If we can open an input stream, then the plugin.properties is in the
-        // folder, and we have a good base URL.
-        InputStream inputStream = new URL(url.toString() + "plugin.properties").openStream(); //$NON-NLS-1$
-        inputStream.close();
-        baseURL = url;
-      }
-      catch (IOException exception)
-      {
-      }
-    }
-
-    // If we still don't have a good base URL, complain about it.
-    if (baseURL == null)
-    {
-      String resourceName = ReflectUtil.getPackageName(className).replace('.', '/') + "/plugin.properties"; //$NON-NLS-1$
-      throw new MissingResourceException("Missing properties: " + resourceName, accessor.getName(), //$NON-NLS-1$
-          "plugin.properties"); //$NON-NLS-1$
-    }
-  }
-
-  private static String lastSegment(URL url)
-  {
-    String path = url.getPath();
-    if (path.endsWith("/")) //$NON-NLS-1$
-    {
-      path = path.substring(0, path.length() - 1);
-    }
-
-    int pos = path.lastIndexOf('/');
-    return pos == -1 ? path : path.substring(pos + 1);
-  }
-
-  private static URL trimSegments(URL url, int count) throws MalformedURLException
-  {
-    String path = url.getPath();
-    if (path.endsWith("/")) //$NON-NLS-1$
-    {
-      ++count;
-    }
-
-    for (int i = 0; i < count; i++)
-    {
-      int pos = path.lastIndexOf('/');
-      if (pos == -1)
-      {
-        break;
-      }
-
-      // TODO Optimize
-      path = path.substring(0, pos);
-    }
-
-    return new URL(url.getProtocol() + ":" + path + "/"); //$NON-NLS-1$ //$NON-NLS-2$
-  }
-
-  /**
-   * TODO Make configurable
-   * 
-   * @see org.eclipse.emf.common.util.URI#isArchiveScheme(String)
-   */
-  private static boolean isArchiveProtocol(String scheme)
-  {
-    return "jar".equalsIgnoreCase(scheme); //$NON-NLS-1$
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
deleted file mode 100644
index c05bef1fda..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om;
-
-import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
-import org.eclipse.net4j.util.om.OMBundle;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author Eike Stepper
- */
-public class LegacyPlatform extends AbstractPlatform
-{
-  private Map<String, String> debugOptions = new ConcurrentHashMap<String, String>(0);
-
-  public LegacyPlatform()
-  {
-  }
-
-  public boolean isOSGiRunning()
-  {
-    return false;
-  }
-
-  @Override
-  protected OMBundle createBundle(String bundleID, Class<?> accessor)
-  {
-    return new LegacyBundle(this, bundleID, accessor);
-  }
-
-  @Override
-  protected String getDebugOption(String bundleID, String option)
-  {
-    return debugOptions.get(bundleID + "/" + option); //$NON-NLS-1$
-  }
-
-  @Override
-  protected void setDebugOption(String bundleID, String option, String value)
-  {
-    debugOptions.put(bundleID + "/" + option, value); //$NON-NLS-1$
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java
deleted file mode 100644
index 1d0ba0ab42..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om;
-
-import org.eclipse.net4j.internal.util.bundle.AbstractBundle;
-import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * @author Eike Stepper
- */
-public class OSGiBundle extends AbstractBundle
-{
-  public OSGiBundle(AbstractPlatform platform, String bundleID, Class<?> accessor)
-  {
-    super(platform, bundleID, accessor);
-  }
-
-  @Override
-  public BundleContext getBundleContext()
-  {
-    return (BundleContext)super.getBundleContext();
-  }
-
-  public URL getBaseURL()
-  {
-    try
-    {
-      URL entry = getBundleContext().getBundle().getEntry("."); //$NON-NLS-1$
-      return FileLocator.resolve(entry);
-    }
-    catch (IOException ex)
-    {
-      IOUtil.print(ex);
-      return null;
-    }
-  }
-
-  public String getStateLocation()
-  {
-    Bundle bundle = getBundleContext().getBundle();
-    return Platform.getStateLocation(bundle).toString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
deleted file mode 100644
index a83c568d69..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om;
-
-import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
-import org.eclipse.net4j.util.om.OMBundle;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.debug.DebugOptions;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/**
- * @author Eike Stepper
- */
-public class OSGiPlatform extends AbstractPlatform
-{
-  BundleContext systemContext;
-
-  public OSGiPlatform(Object systemContext)
-  {
-    this.systemContext = (BundleContext)systemContext;
-
-    try
-    {
-      setDebugging(Platform.inDebugMode());
-    }
-    catch (Throwable ignore)
-    {
-      ;
-    }
-  }
-
-  public boolean isOSGiRunning()
-  {
-    return true;
-  }
-
-  @Override
-  protected OMBundle createBundle(String bundleID, Class<?> accessor)
-  {
-    return new OSGiBundle(this, bundleID, accessor);
-  }
-
-  @Override
-  protected String getDebugOption(String bundleID, String option)
-  {
-    try
-    {
-      DebugOptions debugOptions = getDebugOptions();
-      return debugOptions.getOption(bundleID + "/" + option); //$NON-NLS-1$
-    }
-    catch (Exception ex)
-    {
-      return null;
-    }
-  }
-
-  @Override
-  protected void setDebugOption(String bundleID, String option, String value)
-  {
-    try
-    {
-      DebugOptions debugOptions = getDebugOptions();
-      debugOptions.setOption(bundleID + "/" + option, value); //$NON-NLS-1$
-    }
-    catch (Exception ex)
-    {
-    }
-  }
-
-  protected DebugOptions getDebugOptions() throws NoClassDefFoundError, NullPointerException
-  {
-    ServiceReference ref = systemContext.getServiceReference(DebugOptions.class.getName());
-    return (DebugOptions)systemContext.getService(ref);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java
deleted file mode 100644
index e9b36517a3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.log;
-
-import org.eclipse.net4j.internal.util.om.OSGiBundle;
-import org.eclipse.net4j.util.om.log.OMLogHandler;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.log.OMLogger.Level;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-
-/**
- * @author Eike Stepper
- */
-public class EclipseLoggingBridge implements OMLogHandler
-{
-  /**
-   * @Singleton
-   */
-  public static final EclipseLoggingBridge INSTANCE = new EclipseLoggingBridge();
-
-  protected EclipseLoggingBridge()
-  {
-  }
-
-  public void logged(OMLogger logger, Level level, String msg, Throwable t)
-  {
-    try
-    {
-      OSGiBundle bundle = (OSGiBundle)logger.getBundle();
-      ILog log = Platform.getLog(bundle.getBundleContext().getBundle());
-      log.log(new Status(toEclipse(level), bundle.getBundleID(), IStatus.OK, msg, t));
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  public static int toEclipse(Level level)
-  {
-    switch (level)
-    {
-    case ERROR:
-      return IStatus.ERROR;
-    case WARN:
-      return IStatus.WARNING;
-    case INFO:
-      return IStatus.INFO;
-    case DEBUG:
-      return IStatus.OK;
-    default:
-      throw new IllegalArgumentException("Illegal log level: " + level); //$NON-NLS-1$
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java
deleted file mode 100644
index 72737ceebb..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.log;
-
-import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.log.OMLogger;
-
-/**
- * @author Eike Stepper
- */
-public class Logger implements OMLogger
-{
-  private OMBundle bundle;
-
-  public Logger(OMBundle bundle)
-  {
-    this.bundle = bundle;
-  }
-
-  public OMBundle getBundle()
-  {
-    return bundle;
-  }
-
-  public void log(Level level, String msg, Throwable t)
-  {
-    ((AbstractPlatform)bundle.getPlatform()).log(this, level, msg, t);
-  }
-
-  public void error(String msg, Throwable t)
-  {
-    log(Level.ERROR, msg, t);
-  }
-
-  public void warn(String msg, Throwable t)
-  {
-    log(Level.WARN, msg, t);
-  }
-
-  public void info(String msg, Throwable t)
-  {
-    log(Level.INFO, msg, t);
-  }
-
-  public void debug(String msg, Throwable t)
-  {
-    log(Level.DEBUG, msg, t);
-  }
-
-  public void log(Level level, String msg)
-  {
-    log(level, msg, null);
-  }
-
-  public void error(String msg)
-  {
-    log(Level.ERROR, msg);
-  }
-
-  public void warn(String msg)
-  {
-    log(Level.WARN, msg);
-  }
-
-  public void info(String msg)
-  {
-    log(Level.INFO, msg);
-  }
-
-  public void debug(String msg)
-  {
-    log(Level.DEBUG, msg);
-  }
-
-  public void log(Level level, Throwable t)
-  {
-    String msg = t.getMessage();
-    if (msg == null)
-    {
-      msg = t.getClass().getSimpleName();
-    }
-
-    log(level, msg, t);
-  }
-
-  public void error(Throwable t)
-  {
-    log(Level.ERROR, t);
-  }
-
-  public void warn(Throwable t)
-  {
-    log(Level.WARN, t);
-  }
-
-  public void info(Throwable t)
-  {
-    log(Level.INFO, t);
-  }
-
-  public void debug(Throwable t)
-  {
-    log(Level.DEBUG, t);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java
deleted file mode 100644
index e84a649328..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.log;
-
-import org.eclipse.net4j.internal.util.om.OSGiBundle;
-import org.eclipse.net4j.util.om.log.OMLogHandler;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.log.OMLogger.Level;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogService;
-
-/**
- * @author Eike Stepper
- */
-public class OSGiLoggingBridge implements OMLogHandler
-{
-  // @Singleton
-  public static final OSGiLoggingBridge INSTANCE = new OSGiLoggingBridge();
-
-  protected OSGiLoggingBridge()
-  {
-  }
-
-  public void logged(OMLogger logger, Level level, String msg, Throwable t)
-  {
-    try
-    {
-      BundleContext bundleContext = ((OSGiBundle)logger.getBundle()).getBundleContext();
-      logged(bundleContext, level, msg, t);
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  public void logged(BundleContext bundleContext, Level level, String msg, Throwable t)
-  {
-    LogService logService = getLogService(bundleContext);
-    logService.log(toOSGi(level), msg, t);
-  }
-
-  protected LogService getLogService(BundleContext bundleContext)
-  {
-    try
-    {
-      ServiceReference ref = bundleContext.getServiceReference(LogService.class.getName());
-      LogService logService = (LogService)bundleContext.getService(ref);
-      return logService;
-    }
-    catch (RuntimeException ex)
-    {
-      throw new IllegalStateException("Log service not found", ex); //$NON-NLS-1$
-    }
-  }
-
-  public static int toOSGi(Level level)
-  {
-    switch (level)
-    {
-    case ERROR:
-      return LogService.LOG_ERROR;
-    case WARN:
-      return LogService.LOG_WARNING;
-    case INFO:
-      return LogService.LOG_INFO;
-    case DEBUG:
-      return LogService.LOG_DEBUG;
-    default:
-      throw new IllegalArgumentException("Illegal log level: " + level); //$NON-NLS-1$
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/PrintLogHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/PrintLogHandler.java
deleted file mode 100644
index 753494a628..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/PrintLogHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.log;
-
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.om.log.OMLogHandler;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.log.OMLogger.Level;
-
-import java.io.PrintStream;
-
-/**
- * @author Eike Stepper
- */
-public class PrintLogHandler implements OMLogHandler
-{
-  public static final PrintLogHandler CONSOLE = new PrintLogHandler();
-
-  private PrintStream out;
-
-  private PrintStream err;
-
-  public PrintLogHandler(PrintStream out, PrintStream err)
-  {
-    this.out = out;
-    this.err = err;
-  }
-
-  protected PrintLogHandler()
-  {
-    this(IOUtil.OUT(), IOUtil.ERR());
-  }
-
-  public void logged(OMLogger logger, Level level, String msg, Throwable t)
-  {
-    try
-    {
-      PrintStream stream = level == Level.ERROR ? err : out;
-      stream.println(toString(level) + " " + msg); //$NON-NLS-1$
-      if (t != null)
-      {
-        IOUtil.print(t, stream);
-      }
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  public static String toString(Level level)
-  {
-    switch (level)
-    {
-    case ERROR:
-      return "[ERROR]"; //$NON-NLS-1$
-    case WARN:
-      return "[WARN]"; //$NON-NLS-1$
-    case INFO:
-      return "[INFO]"; //$NON-NLS-1$
-    case DEBUG:
-      return "[DEBUG]"; //$NON-NLS-1$
-    default:
-      throw new IllegalArgumentException("Illegal log level: " + level); //$NON-NLS-1$
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/EclipseMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/EclipseMonitor.java
deleted file mode 100644
index 03f8cafb62..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/EclipseMonitor.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.monitor;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-/**
- * @author Eike Stepper
- */
-public class EclipseMonitor extends Monitor
-{
-  private IProgressMonitor progressMonitor;
-
-  public EclipseMonitor(IProgressMonitor progressMonitor)
-  {
-    super(null, 0);
-    if (progressMonitor == null)
-    {
-      throw new IllegalArgumentException("progressMonitor == null");
-    }
-
-    this.progressMonitor = new DelegatingProgressMonitor(progressMonitor);
-  }
-
-  private EclipseMonitor(EclipseMonitor parent, int workFromParent)
-  {
-    super(parent, workFromParent);
-    progressMonitor = new SubProgressMonitor(new SubProgressMonitor(parent.getProgressMonitor(), workFromParent),
-        workFromParent);
-  }
-
-  public IProgressMonitor getProgressMonitor()
-  {
-    return progressMonitor;
-  }
-
-  @Override
-  public void setTask(String task)
-  {
-    super.setTask(task);
-    progressMonitor.setTaskName(task);
-  }
-
-  @Override
-  public void worked(int work, String msg)
-  {
-    super.worked(work, msg);
-    progressMonitor.worked(work);
-    if (msg != null)
-    {
-      progressMonitor.subTask(msg);
-    }
-  }
-
-  @Override
-  protected void begin(int totalWork, String task)
-  {
-    super.begin(totalWork, task);
-    progressMonitor.beginTask(task == null ? "" : task, totalWork);
-  }
-
-  @Override
-  protected void done()
-  {
-    super.done();
-    progressMonitor.done();
-  }
-
-  @Override
-  protected void message(String msg, int level)
-  {
-    super.message(msg, level);
-    progressMonitor.subTask(msg);
-  }
-
-  @Override
-  protected EclipseMonitor subMonitor(int workFromParent)
-  {
-    return new EclipseMonitor(this, workFromParent);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class DelegatingProgressMonitor implements IProgressMonitor
-  {
-    private IProgressMonitor delegate;
-
-    public DelegatingProgressMonitor(IProgressMonitor delegate)
-    {
-      this.delegate = delegate;
-    }
-
-    public IProgressMonitor getDelegate()
-    {
-      return delegate;
-    }
-
-    public void beginTask(String name, int totalWork)
-    {
-      delegate.beginTask(name, totalWork);
-    }
-
-    public void done()
-    {
-      delegate.done();
-    }
-
-    public void internalWorked(double work)
-    {
-      delegate.internalWorked(work);
-    }
-
-    public boolean isCanceled()
-    {
-      return delegate.isCanceled();
-    }
-
-    public void setCanceled(boolean value)
-    {
-      EclipseMonitor.this.setCanceled(value);
-      delegate.setCanceled(value);
-    }
-
-    public void setTaskName(String name)
-    {
-      delegate.setTaskName(name);
-    }
-
-    public void subTask(String name)
-    {
-      delegate.subTask(name);
-    }
-
-    public void worked(int work)
-    {
-      delegate.worked(work);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/LegacyMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/LegacyMonitor.java
deleted file mode 100644
index cb5e8ddb18..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/LegacyMonitor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public class LegacyMonitor extends Monitor
-{
-  public LegacyMonitor()
-  {
-    super(null, 0);
-  }
-
-  private LegacyMonitor(LegacyMonitor parent, int workFromParent)
-  {
-    super(parent, workFromParent);
-  }
-
-  @Override
-  public LegacyMonitor subMonitor(int workFromParent)
-  {
-    return new LegacyMonitor(this, workFromParent);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java
deleted file mode 100644
index 430a74572e..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.monitor;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.util.om.monitor.IllegalMonitorNestingException;
-import org.eclipse.net4j.util.om.monitor.MonitorAlreadyBegunException;
-import org.eclipse.net4j.util.om.monitor.MonitorException;
-import org.eclipse.net4j.util.om.monitor.OMMonitor;
-
-/**
- * @author Eike Stepper
- */
-public final class MON
-{
-  public static final int UNKNOWN = -1;
-
-  private static final ThreadLocal<Monitor> CURRENT = new ThreadLocal<Monitor>();
-
-  private MON()
-  {
-  }
-
-  public static boolean isCanceled()
-  {
-    Monitor current = CURRENT.get();
-    if (current == null)
-    {
-      return false;
-    }
-
-    return current.isCanceled();
-  }
-
-  public static void setCanceled(boolean canceled)
-  {
-    Monitor current = CURRENT.get();
-    if (current != null)
-    {
-      current.setCanceled(canceled);
-    }
-  }
-
-  public static void startMonitoring(Monitor rootMonitor)
-  {
-    Monitor current = CURRENT.get();
-    if (current != null)
-    {
-      throw new IllegalMonitorNestingException("Monitoring has already been started");
-    }
-
-    CURRENT.set(rootMonitor);
-  }
-
-  public static void stopMonitoring()
-  {
-    try
-    {
-      Monitor current = CURRENT.get();
-      if (current == null)
-      {
-        OM.LOG.warn("Monitoring has not been started");
-      }
-      else
-      {
-        if (current.getParent() != null)
-        {
-          OM.LOG.warn("Illegal monitor nesting");
-        }
-
-        current.done();
-      }
-    }
-    finally
-    {
-      CURRENT.set(null);
-    }
-  }
-
-  public static OMMonitor begin(int totalWork, String task)
-  {
-    Monitor current = CURRENT.get();
-    if (current == null)
-    {
-      return NullMonitor.INSTANCE;
-    }
-
-    if (current.hasBegun())
-    {
-      throw new MonitorAlreadyBegunException("Monitor has already begun");
-    }
-
-    current.begin(totalWork, task);
-    return current;
-  }
-
-  static void checkMonitor(Monitor monitor) throws MonitorException
-  {
-    Monitor current = CURRENT.get();
-    if (current != monitor)
-    {
-      throw new IllegalMonitorNestingException("Illegal monitor nesting\n" + // 
-          "Current monitor stack:\n" + current.dump() + //
-          "Used monitor stack:\n" + monitor.dump());
-    }
-
-    monitor.checkCanceled();
-  }
-
-  static void setMonitor(Monitor monitor)
-  {
-    CURRENT.set(monitor);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java
deleted file mode 100644
index f83d3d0564..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.monitor;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.om.monitor.MonitorCanceledException;
-import org.eclipse.net4j.util.om.monitor.MonitorNotBegunException;
-import org.eclipse.net4j.util.om.monitor.OMMonitor;
-import org.eclipse.net4j.util.om.monitor.OMSubMonitor;
-import org.eclipse.net4j.util.om.monitor.TotalWorkExceededException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Monitor implements OMMonitor, OMSubMonitor
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, Monitor.class);
-
-  private static final int UNINITIALIZED = 0;
-
-  private Monitor parent;
-
-  private int workFromParent;
-
-  private int totalWork = UNINITIALIZED;
-
-  private int work;
-
-  private String task;
-
-  private Monitor child;
-
-  private boolean canceled;
-
-  public Monitor(Monitor parent, int workFromParent)
-  {
-    this.parent = parent;
-    this.workFromParent = workFromParent;
-  }
-
-  public boolean isCanceled()
-  {
-    return canceled;
-  }
-
-  public void checkCanceled() throws MonitorCanceledException
-  {
-    if (canceled)
-    {
-      throw new MonitorCanceledException();
-    }
-  }
-
-  public String getTask()
-  {
-    return task;
-  }
-
-  public void setTask(String task)
-  {
-    this.task = task;
-    taskChanged(task, 0);
-  }
-
-  public int getTotalWork()
-  {
-    return totalWork;
-  }
-
-  public boolean hasBegun()
-  {
-    return totalWork != UNINITIALIZED;
-  }
-
-  public void message(String msg)
-  {
-    if (msg != null)
-    {
-      message(msg, 0);
-    }
-  }
-
-  public void worked(int work, String msg) throws MonitorCanceledException
-  {
-    MON.checkMonitor(this);
-    checkWork(work);
-
-    this.work += work;
-    message(msg);
-  }
-
-  public void worked(int work) throws MonitorCanceledException
-  {
-    worked(work, null);
-  }
-
-  public void worked(String msg) throws MonitorCanceledException
-  {
-    worked(1, msg);
-  }
-
-  public void worked() throws MonitorCanceledException
-  {
-    worked(1, null);
-  }
-
-  public void fork(int workFromParent, Runnable runnable, String msg) throws MonitorCanceledException
-  {
-    MON.checkMonitor(this);
-    checkWork(workFromParent);
-
-    child = subMonitor(workFromParent);
-    MON.setMonitor(child);
-
-    try
-    {
-      runnable.run();
-    }
-    finally
-    {
-      MON.checkMonitor(child);
-      MON.setMonitor(this);
-      child.done();
-      child = null;
-    }
-
-    work += workFromParent;
-    message(msg);
-  }
-
-  public void fork(int workFromParent, Runnable runnable) throws MonitorCanceledException
-  {
-    fork(workFromParent, runnable, null);
-  }
-
-  public void fork(Runnable runnable, String msg) throws MonitorCanceledException
-  {
-    fork(1, runnable, msg);
-  }
-
-  public void fork(Runnable runnable) throws MonitorCanceledException
-  {
-    fork(1, runnable, null);
-  }
-
-  public OMSubMonitor fork(int workFromParent) throws MonitorCanceledException
-  {
-    MON.checkMonitor(this);
-    checkWork(workFromParent);
-
-    child = subMonitor(workFromParent);
-    MON.setMonitor(child);
-    return child;
-  }
-
-  public OMSubMonitor fork() throws MonitorCanceledException
-  {
-    return fork(1);
-  }
-
-  public void join(String msg) throws MonitorCanceledException
-  {
-    MON.checkMonitor(this);
-    MON.setMonitor(parent);
-    parent.setChild(null);
-    parent.message(msg);
-    done();
-  }
-
-  public void join() throws MonitorCanceledException
-  {
-    join(null);
-  }
-
-  protected Monitor getChild()
-  {
-    return child;
-  }
-
-  protected void setChild(Monitor child)
-  {
-    this.child = child;
-  }
-
-  protected void setCanceled(boolean canceled)
-  {
-    this.canceled = canceled;
-    if (child != null)
-    {
-      child.setCanceled(canceled);
-    }
-  }
-
-  protected Monitor getParent()
-  {
-    return parent;
-  }
-
-  protected int getWorkFromParent()
-  {
-    return workFromParent;
-  }
-
-  protected String dump()
-  {
-    StringBuilder builder = new StringBuilder();
-    dump(builder);
-    return builder.toString();
-  }
-
-  protected void begin(int totalWork, String task) throws MonitorCanceledException
-  {
-    checkCanceled();
-    this.totalWork = totalWork;
-    if (task != null)
-    {
-      setTask(task);
-    }
-  }
-
-  protected void done()
-  {
-  }
-
-  protected void taskChanged(String task, int level)
-  {
-    if (parent != null)
-    {
-      parent.taskChanged(task, level + 1);
-    }
-    else
-    {
-      trace(task, level, true);
-    }
-  }
-
-  protected void message(String msg, int level)
-  {
-    if (parent != null)
-    {
-      parent.message(msg, level + 1);
-    }
-    else
-    {
-      trace(msg, level, false);
-    }
-  }
-
-  protected void trace(String msg, int level, boolean isTask)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace(msg);
-    }
-  }
-
-  protected void checkWork(int work)
-  {
-    if (!hasBegun())
-    {
-      throw new MonitorNotBegunException("Monitor has not begun");
-    }
-
-    if (totalWork != UNKNOWN && this.work + work > totalWork)
-    {
-      throw new TotalWorkExceededException(("Work of " + work + " exceeded total work of " + totalWork));
-    }
-  }
-
-  protected void dump(StringBuilder builder)
-  {
-    builder.append("  ");
-    builder.append(task);
-    builder.append("\n");
-    if (parent != null)
-    {
-      parent.dump(builder);
-    }
-  }
-
-  protected abstract Monitor subMonitor(int workFromParent);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/NullMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/NullMonitor.java
deleted file mode 100644
index fe19bf1f9c..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/NullMonitor.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.monitor;
-
-import org.eclipse.net4j.util.om.monitor.OMMonitor;
-import org.eclipse.net4j.util.om.monitor.OMSubMonitor;
-
-/**
- * @author Eike Stepper
- */
-public class NullMonitor implements OMMonitor, OMSubMonitor
-{
-  public static final NullMonitor INSTANCE = new NullMonitor();
-
-  private NullMonitor()
-  {
-  }
-
-  public void join()
-  {
-  }
-
-  public void join(String msg)
-  {
-  }
-
-  public OMSubMonitor fork()
-  {
-    return this;
-  }
-
-  public void fork(int workFromParent, Runnable runnable, String msg)
-  {
-  }
-
-  public void fork(int workFromParent, Runnable runnable)
-  {
-  }
-
-  public OMSubMonitor fork(int workFromParent)
-  {
-    return this;
-  }
-
-  public void fork(Runnable runnable, String msg)
-  {
-  }
-
-  public void fork(Runnable runnable)
-  {
-  }
-
-  public String getTask()
-  {
-    return null;
-  }
-
-  public int getTotalWork()
-  {
-    return 0;
-  }
-
-  public boolean hasBegun()
-  {
-    return true;
-  }
-
-  public void message(String msg)
-  {
-  }
-
-  public void setTask(String task)
-  {
-  }
-
-  public void worked()
-  {
-  }
-
-  public void worked(int work, String msg)
-  {
-  }
-
-  public void worked(int work)
-  {
-  }
-
-  public void worked(String msg)
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/ArrayPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/ArrayPreference.java
deleted file mode 100644
index 0bbf155a94..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/ArrayPreference.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
-/**
- * @author Eike Stepper
- */
-public final class ArrayPreference extends Preference<String[]> implements OMPreference<String[]>
-{
-  private static final String SEPARATOR = ",";
-
-  private static final String UTF_8 = "UTF-8";
-
-  public ArrayPreference(Preferences preferences, String name, String[] defaultValue)
-  {
-    super(preferences, name, defaultValue);
-  }
-
-  @Override
-  protected String getString()
-  {
-    String[] array = getValue();
-    if (array.length == 0)
-    {
-      return null;
-    }
-
-    StringBuilder builder = new StringBuilder();
-    for (String element : array)
-    {
-      if (builder.length() != 0)
-      {
-        builder.append(SEPARATOR);
-        builder.append(" ");
-      }
-
-      try
-      {
-        String encoded = URLEncoder.encode(element, UTF_8);
-        builder.append(encoded);
-      }
-      catch (UnsupportedEncodingException ex)
-      {
-        OM.LOG.error(ex);
-        return null;
-      }
-    }
-
-    return builder.toString();
-  }
-
-  @Override
-  protected String[] convert(String value)
-  {
-    String[] array = value.split(SEPARATOR);
-    if (array.length == 0)
-    {
-      return Preferences.DEFAULT_ARRAY;
-    }
-
-    for (int i = 0; i < array.length; i++)
-    {
-      try
-      {
-        array[i] = URLDecoder.decode(array[i].trim(), UTF_8);
-      }
-      catch (UnsupportedEncodingException ex)
-      {
-        OM.LOG.error(ex);
-        return null;
-      }
-    }
-
-    return array;
-  }
-
-  public Type getType()
-  {
-    return Type.ARRAY;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BooleanPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BooleanPreference.java
deleted file mode 100644
index 4e6f605c40..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BooleanPreference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public final class BooleanPreference extends Preference<Boolean> implements OMPreference<Boolean>
-{
-  public BooleanPreference(Preferences preferences, String name, Boolean defaultValue)
-  {
-    super(preferences, name, defaultValue);
-  }
-
-  @Override
-  protected String getString()
-  {
-    return Boolean.toString(getValue());
-  }
-
-  @Override
-  protected Boolean convert(String value)
-  {
-    return Boolean.parseBoolean(value);
-  }
-
-  public Type getType()
-  {
-    return Type.BOOLEAN;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BytesPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BytesPreference.java
deleted file mode 100644
index 6274af3797..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BytesPreference.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.util.HexUtil;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public final class BytesPreference extends Preference<byte[]> implements OMPreference<byte[]>
-{
-  public BytesPreference(Preferences preferences, String name, byte[] defaultValue)
-  {
-    super(preferences, name, defaultValue);
-  }
-
-  @Override
-  protected String getString()
-  {
-    return HexUtil.bytesToHex(getValue());
-  }
-
-  @Override
-  protected byte[] convert(String value)
-  {
-    return HexUtil.hexToBytes(value);
-  }
-
-  public Type getType()
-  {
-    return Type.BYTES;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/DoublePreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/DoublePreference.java
deleted file mode 100644
index 4627a6d25c..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/DoublePreference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public final class DoublePreference extends Preference<Double> implements OMPreference<Double>
-{
-  public DoublePreference(Preferences preferences, String name, Double defaultValue)
-  {
-    super(preferences, name, defaultValue);
-  }
-
-  @Override
-  protected String getString()
-  {
-    return Double.toString(getValue());
-  }
-
-  @Override
-  protected Double convert(String value)
-  {
-    return Double.parseDouble(value);
-  }
-
-  public Type getType()
-  {
-    return Type.DOUBLE;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/FloatPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/FloatPreference.java
deleted file mode 100644
index 87358297b1..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/FloatPreference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public final class FloatPreference extends Preference<Float> implements OMPreference<Float>
-{
-  public FloatPreference(Preferences preferences, String name, Float defaultValue)
-  {
-    super(preferences, name, defaultValue);
-  }
-
-  @Override
-  protected String getString()
-  {
-    return Float.toString(getValue());
-  }
-
-  @Override
-  protected Float convert(String value)
-  {
-    return Float.parseFloat(value);
-  }
-
-  public Type getType()
-  {
-    return Type.FLOAT;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/IntegerPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/IntegerPreference.java
deleted file mode 100644
index b6df91c48c..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/IntegerPreference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public final class IntegerPreference extends Preference<Integer> implements OMPreference<Integer>
-{
-  public IntegerPreference(Preferences preferences, String name, Integer defaultValue)
-  {
-    super(preferences, name, defaultValue);
-  }
-
-  @Override
-  protected String getString()
-  {
-    return Integer.toString(getValue());
-  }
-
-  @Override
-  protected Integer convert(String value)
-  {
-    return Integer.parseInt(value);
-  }
-
-  public Type getType()
-  {
-    return Type.INTEGER;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/LongPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/LongPreference.java
deleted file mode 100644
index 6cbad27c33..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/LongPreference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public final class LongPreference extends Preference<Long> implements OMPreference<Long>
-{
-  public LongPreference(Preferences preferences, String name, Long defaultValue)
-  {
-    super(preferences, name, defaultValue);
-  }
-
-  @Override
-  protected String getString()
-  {
-    return Long.toString(getValue());
-  }
-
-  @Override
-  protected Long convert(String value)
-  {
-    return Long.parseLong(value);
-  }
-
-  public Type getType()
-  {
-    return Type.LONG;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java
deleted file mode 100644
index a1ea18c378..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Preference<T> implements OMPreference<T>
-{
-  private Preferences preferences;
-
-  private String name;
-
-  private T defaultValue;
-
-  private T value;
-
-  public Preference(Preferences preferences, String name, T defaultValue)
-  {
-    if (defaultValue == null)
-    {
-      throw new IllegalArgumentException("defaultValue == null");
-    }
-
-    this.preferences = preferences;
-    this.name = name;
-    this.defaultValue = defaultValue;
-  }
-
-  public Preferences getPreferences()
-  {
-    return preferences;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public T getDefaultValue()
-  {
-    return defaultValue;
-  }
-
-  public T getValue()
-  {
-    load();
-    return value;
-  }
-
-  public T setValue(T value)
-  {
-    if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    load();
-    T oldValue = this.value;
-    if (!equals(oldValue, value))
-    {
-      if (equals(defaultValue, value))
-      {
-        value = defaultValue;
-      }
-
-      this.value = value;
-      preferences.fireChangeEvent(this, oldValue, value);
-      return oldValue;
-    }
-
-    return null;
-  }
-
-  public boolean isSet()
-  {
-    return !equals(defaultValue, value);
-  }
-
-  public T unSet()
-  {
-    return setValue(defaultValue);
-  }
-
-  protected boolean equals(T v1, T v2)
-  {
-    return ObjectUtil.equals(v1, v2);
-  }
-
-  protected void init(String value)
-  {
-    if (value == null)
-    {
-      this.value = defaultValue;
-    }
-    else
-    {
-      this.value = convert(value);
-    }
-  }
-
-  protected abstract T convert(String value);
-
-  protected abstract String getString();
-
-  private void load()
-  {
-    preferences.load();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
deleted file mode 100644
index ab8910c4e7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.internal.util.bundle.AbstractBundle;
-import org.eclipse.net4j.internal.util.event.Notifier;
-import org.eclipse.net4j.util.io.IORunnable;
-import org.eclipse.net4j.util.io.IORuntimeException;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-import org.eclipse.net4j.util.om.pref.OMPreferences;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * @author Eike Stepper
- */
-public class Preferences extends Notifier implements OMPreferences
-{
-  private AbstractBundle bundle;
-
-  private Map<String, Preference<?>> prefs = new HashMap<String, Preference<?>>();
-
-  private boolean loaded;
-
-  private boolean dirty;
-
-  public Preferences(AbstractBundle bundle)
-  {
-    this.bundle = bundle;
-  }
-
-  public AbstractBundle getBundle()
-  {
-    return bundle;
-  }
-
-  public synchronized void load()
-  {
-    if (!loaded)
-    {
-      loaded = true;
-      final Properties properties = new Properties();
-
-      File file = getFile();
-      if (file.exists())
-      {
-        IOUtil.safeInput(file, new IORunnable<FileInputStream>()
-        {
-          public void run(FileInputStream io) throws IOException
-          {
-            properties.load(io);
-          }
-        });
-      }
-
-      for (Preference<?> preference : prefs.values())
-      {
-        String name = preference.getName();
-        String value = properties.getProperty(name);
-        preference.init(value);
-      }
-    }
-  }
-
-  public synchronized void save()
-  {
-    if (dirty)
-    {
-      final Properties properties = new Properties();
-      for (Preference<?> preference : prefs.values())
-      {
-        if (preference.isSet())
-        {
-          String name = preference.getName();
-          String value = preference.getString();
-          if (value != null)
-          {
-            properties.put(name, value);
-          }
-        }
-      }
-
-      File file = getFile();
-      if (properties.isEmpty())
-      {
-        if (file.exists())
-        {
-          file.delete();
-        }
-      }
-      else
-      {
-        IOUtil.safeOutput(file, new IORunnable<FileOutputStream>()
-        {
-          public void run(FileOutputStream io) throws IOException
-          {
-            properties.store(io, "Preferences of " + bundle.getBundleID());
-          }
-        });
-      }
-
-      dirty = false;
-    }
-  }
-
-  public boolean isDirty()
-  {
-    return dirty;
-  }
-
-  public OMPreference<Boolean> init(String name, boolean defaultValue)
-  {
-    return init(new BooleanPreference(this, name, defaultValue));
-  }
-
-  public OMPreference<Integer> init(String name, int defaultValue)
-  {
-    return init(new IntegerPreference(this, name, defaultValue));
-  }
-
-  public OMPreference<Long> init(String name, long defaultValue)
-  {
-    return init(new LongPreference(this, name, defaultValue));
-  }
-
-  public OMPreference<Float> init(String name, float defaultValue)
-  {
-    return init(new FloatPreference(this, name, defaultValue));
-  }
-
-  public OMPreference<Double> init(String name, double defaultValue)
-  {
-    return init(new DoublePreference(this, name, defaultValue));
-  }
-
-  public OMPreference<String> init(String name, String defaultValue)
-  {
-    return init(new StringPreference(this, name, defaultValue));
-  }
-
-  public OMPreference<String[]> init(String name, String[] defaultValue)
-  {
-    return init(new ArrayPreference(this, name, defaultValue));
-  }
-
-  public OMPreference<byte[]> init(String name, byte[] defaultValue)
-  {
-    return init(new BytesPreference(this, name, defaultValue));
-  }
-
-  public OMPreference<Boolean> initBoolean(String name)
-  {
-    return init(name, DEFAULT_BOOLEAN);
-  }
-
-  public OMPreference<Integer> initInteger(String name)
-  {
-    return init(name, DEFAULT_INTEGER);
-  }
-
-  public OMPreference<Long> initLong(String name)
-  {
-    return init(name, DEFAULT_LONG);
-  }
-
-  public OMPreference<Float> initFloat(String name)
-  {
-    return init(name, DEFAULT_FLOAT);
-  }
-
-  public OMPreference<Double> initDouble(String name)
-  {
-    return init(name, DEFAULT_DOUBLE);
-  }
-
-  public OMPreference<String> initString(String name)
-  {
-    return init(name, DEFAULT_STRING);
-  }
-
-  public OMPreference<String[]> initArray(String name)
-  {
-    return init(name, DEFAULT_ARRAY);
-  }
-
-  public OMPreference<byte[]> initBytes(String name)
-  {
-    return init(name, DEFAULT_BYTES);
-  }
-
-  public boolean contains(String name)
-  {
-    return prefs.containsKey(name);
-  }
-
-  public OMPreference<?> get(String name)
-  {
-    return prefs.get(name);
-  }
-
-  @SuppressWarnings("unchecked")
-  public OMPreference<Boolean> getBoolean(String name)
-  {
-    return (OMPreference<Boolean>)get(name);
-  }
-
-  @SuppressWarnings("unchecked")
-  public OMPreference<Integer> getInteger(String name)
-  {
-    return (OMPreference<Integer>)get(name);
-  }
-
-  @SuppressWarnings("unchecked")
-  public OMPreference<Long> getLong(String name)
-  {
-    return (OMPreference<Long>)get(name);
-  }
-
-  @SuppressWarnings("unchecked")
-  public OMPreference<Float> getFloat(String name)
-  {
-    return (OMPreference<Float>)get(name);
-  }
-
-  @SuppressWarnings("unchecked")
-  public OMPreference<Double> getDouble(String name)
-  {
-    return (OMPreference<Double>)get(name);
-  }
-
-  @SuppressWarnings("unchecked")
-  public OMPreference<String> getString(String name)
-  {
-    return (OMPreference<String>)get(name);
-  }
-
-  @SuppressWarnings("unchecked")
-  public OMPreference<String[]> getArray(String name)
-  {
-    return (OMPreference<String[]>)get(name);
-  }
-
-  @SuppressWarnings("unchecked")
-  public OMPreference<byte[]> getBytes(String name)
-  {
-    return (OMPreference<byte[]>)get(name);
-  }
-
-  public <T> void fireChangeEvent(Preference<T> preference, T oldValue, T newValue)
-  {
-    dirty = true;
-    fireEvent(new PreferencesChangeEvent<T>(preference, oldValue, newValue));
-  }
-
-  private <T> OMPreference<T> init(Preference<T> preference)
-  {
-    String name = preference.getName();
-    if (prefs.containsKey(name))
-    {
-      throw new IllegalArgumentException("Duplicate name: " + name);
-    }
-
-    prefs.put(name, preference);
-    return preference;
-  }
-
-  private File getFile()
-  {
-    File file = new File(bundle.getStateLocation(), ".prefs");
-    if (file.exists() && !file.isFile())
-    {
-      throw new IORuntimeException("Not a file: " + file.getAbsolutePath());
-    }
-
-    return file;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java
deleted file mode 100644
index d2ae7da465..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.internal.util.event.Event;
-import org.eclipse.net4j.util.om.pref.OMPreferencesChangeEvent;
-
-/**
- * @author Eike Stepper
- */
-public final class PreferencesChangeEvent<T> extends Event implements OMPreferencesChangeEvent<T>
-{
-  private static final long serialVersionUID = 1L;
-
-  private Preference<T> preference;
-
-  private T oldValue;
-
-  private T newValue;
-
-  public PreferencesChangeEvent(Preference<T> preference, T oldValue, T newValue)
-  {
-    super(preference.getPreferences());
-    this.preference = preference;
-    this.oldValue = oldValue;
-    this.newValue = newValue;
-  }
-
-  @Override
-  public Preferences getSource()
-  {
-    return (Preferences)super.getSource();
-  }
-
-  public Preference<T> getPreference()
-  {
-    return preference;
-  }
-
-  public T getOldValue()
-  {
-    return oldValue;
-  }
-
-  public T getNewValue()
-  {
-    return newValue;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/StringPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/StringPreference.java
deleted file mode 100644
index 7a9e9dc07e..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/StringPreference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.pref;
-
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public final class StringPreference extends Preference<String> implements OMPreference<String>
-{
-  public StringPreference(Preferences preferences, String name, String defaultValue)
-  {
-    super(preferences, name, defaultValue);
-  }
-
-  @Override
-  protected String getString()
-  {
-    return getValue();
-  }
-
-  @Override
-  protected String convert(String value)
-  {
-    return value;
-  }
-
-  public Type getType()
-  {
-    return Type.STRING;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java
deleted file mode 100644
index 838ccb63a7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.trace;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * @author Eike Stepper
- */
-public class ContextTracer
-{
-  private OMTracer delegate;
-
-  private Class<?> context;
-
-  public ContextTracer(OMTracer delegate, Class<?> context)
-  {
-    this.delegate = delegate;
-    this.context = context;
-  }
-
-  public OMBundle getBundle()
-  {
-    return delegate.getBundle();
-  }
-
-  public String getFullName()
-  {
-    return delegate.getFullName();
-  }
-
-  public String getName()
-  {
-    return delegate.getName();
-  }
-
-  public OMTracer getDelegate()
-  {
-    return delegate;
-  }
-
-  public OMTracer getParent()
-  {
-    return delegate.getParent();
-  }
-
-  public boolean isEnabled()
-  {
-    return delegate.isEnabled();
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-    delegate.setEnabled(enabled);
-  }
-
-  public void format(String pattern, Object... args)
-  {
-    delegate.format(context, pattern, args);
-  }
-
-  public void format(String pattern, Throwable t, Object... args)
-  {
-    delegate.format(context, pattern, t, args);
-  }
-
-  public void trace(String msg, Throwable t)
-  {
-    delegate.trace(context, msg, t);
-  }
-
-  public void trace(String msg)
-  {
-    delegate.trace(context, msg);
-  }
-
-  public void trace(Throwable t)
-  {
-    delegate.trace(context, t);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PerfTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PerfTracer.java
deleted file mode 100644
index 2fd536bb74..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PerfTracer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.trace;
-
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * @author Eike Stepper
- */
-public class PerfTracer extends ContextTracer
-{
-  public static final long NOT_STARTED = 0L;
-
-  private ConcurrentMap<Object, Long> timers = new ConcurrentHashMap<Object, Long>();
-
-  public PerfTracer(OMTracer delegate, Class<?> context)
-  {
-    super(delegate, context);
-  }
-
-  public void start(Object object)
-  {
-    if (isEnabled())
-    {
-      timers.put(object, System.currentTimeMillis());
-    }
-  }
-
-  public long stop(Object object)
-  {
-    long duration = NOT_STARTED;
-    if (isEnabled())
-    {
-      Long timer = timers.remove(object);
-      if (timer != null)
-      {
-        duration = System.currentTimeMillis() - timer;
-        format("{0} = {1} millis", object, duration);
-      }
-    }
-
-    return duration;
-  }
-
-  public long getDuration(Object object)
-  {
-    long duration = NOT_STARTED;
-    if (isEnabled())
-    {
-      Long timer = timers.get(object);
-      if (timer != null)
-      {
-        duration = System.currentTimeMillis() - timer;
-      }
-    }
-
-    return duration;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java
deleted file mode 100644
index 0696770351..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.trace;
-
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.om.trace.OMTraceHandler;
-import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-import java.io.PrintStream;
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class PrintTraceHandler implements OMTraceHandler
-{
-  public static final PrintTraceHandler CONSOLE = new PrintTraceHandler();
-
-  private PrintStream stream;
-
-  private String pattern;
-
-  private boolean shortContext;
-
-  public PrintTraceHandler(PrintStream stream)
-  {
-    this.stream = stream;
-  }
-
-  protected PrintTraceHandler()
-  {
-    this(IOUtil.OUT());
-  }
-
-  public String getPattern()
-  {
-    return pattern;
-  }
-
-  /**
-   * Pattern arguments:
-   * <p>
-   * <ul>
-   * <li>{0} --> String <b>tracerName</b><br>
-   * <li>{1} --> String <b>tracerShort</b><br>
-   * <li>{2} --> String <b>contextName</b><br>
-   * <li>{3} --> String <b>contextShort</b><br>
-   * <li>{4} --> long <b>timeStamp</b><br>
-   * <li>{5} --> String <b>message</b><br>
-   * <li>{6} --> String <b>threadName</b><br>
-   * <li>{7} --> long <b>threadID</b><br>
-   * <li>{8} --> int <b>threadPriority</b><br>
-   * <li>{9} --> Thread.State <b>threadState</b><br>
-   * </ul>
-   */
-  public void setPattern(String pattern)
-  {
-    this.pattern = pattern;
-  }
-
-  public boolean isShortContext()
-  {
-    return shortContext;
-  }
-
-  public void setShortContext(boolean shortContext)
-  {
-    this.shortContext = shortContext;
-  }
-
-  public void traced(OMTraceHandlerEvent event)
-  {
-    String line = pattern == null ? format(shortContext, event) : format(pattern, event);
-    stream.println(line);
-    if (event.getThrowable() != null)
-    {
-      IOUtil.print(event.getThrowable(), stream);
-    }
-  }
-
-  public static String format(boolean shortContext, OMTraceHandlerEvent event)
-  {
-    Class<?> context = event.getContext();
-    String contextName = shortContext ? context.getSimpleName() : context.getName();
-    return Thread.currentThread().getName() + " [" + contextName + "] " + event.getMessage();
-  }
-
-  /**
-   * Pattern arguments:
-   * <p>
-   * <ul>
-   * <li>{0} --> String <b>tracerName</b><br>
-   * <li>{1} --> String <b>tracerShort</b><br>
-   * <li>{2} --> String <b>contextName</b><br>
-   * <li>{3} --> String <b>contextShort</b><br>
-   * <li>{4} --> long <b>timeStamp</b><br>
-   * <li>{5} --> String <b>message</b><br>
-   * <li>{6} --> String <b>threadName</b><br>
-   * <li>{7} --> long <b>threadID</b><br>
-   * <li>{8} --> int <b>threadPriority</b><br>
-   * <li>{9} --> Thread.State <b>threadState</b><br>
-   * </ul>
-   */
-  public static String format(String pattern, OMTraceHandlerEvent event)
-  {
-    final OMTracer tracer = event.getTracer();
-    final String tracerName = tracer.getFullName();
-    final String tracerShort = tracer.getName();
-
-    final Class<?> context = event.getContext();
-    final String contextName = context.getName();
-    final String contextShort = context.getName();
-
-    final long timeStamp = event.getTimeStamp();
-    final String message = event.getMessage();
-
-    final Thread thread = Thread.currentThread();
-    final String threadName = thread.getName();
-    final long threadID = thread.getId();
-    final int threadPriority = thread.getPriority();
-    final Thread.State threadState = thread.getState();
-
-    return MessageFormat.format(pattern, tracerName, tracerShort, contextName, contextShort, timeStamp, message,
-        threadName, threadID, threadPriority, threadState);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceHandler.java
deleted file mode 100644
index 50f0299e23..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceHandler.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.trace;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.om.trace.OMTraceHandler;
-import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.UUID;
-
-/**
- * @author Eike Stepper
- */
-public class RemoteTraceHandler implements OMTraceHandler
-{
-  public static final String DEFAULT_HOST = "localhost"; //$NON-NLS-1$
-
-  public static final int DEFAULT_PORT = RemoteTraceServer.DEFAULT_PORT;
-
-  private static int uniqueCounter;
-
-  private String agentID;
-
-  private String host;
-
-  private int port;
-
-  private Socket socket;
-
-  public RemoteTraceHandler() throws IOException
-  {
-    this(uniqueAgentID());
-  }
-
-  public RemoteTraceHandler(String agentID) throws IOException
-  {
-    this(agentID, DEFAULT_HOST);
-  }
-
-  public RemoteTraceHandler(String agentID, String host) throws IOException
-  {
-    this(agentID, host, DEFAULT_PORT);
-  }
-
-  public RemoteTraceHandler(String agentID, String host, int port) throws IOException
-  {
-    this.agentID = agentID;
-    this.host = host;
-    this.port = port;
-    socket = connect();
-  }
-
-  public Exception close()
-  {
-    try
-    {
-      socket.close();
-      return null;
-    }
-    catch (IOException ex)
-    {
-      OM.LOG.error(ex);
-      return ex;
-    }
-  }
-
-  public void traced(OMTraceHandlerEvent event)
-  {
-    try
-    {
-      OutputStream outputStream = socket.getOutputStream();
-      DataOutputStream out = new DataOutputStream(outputStream);
-
-      out.writeLong(event.getTimeStamp());
-      writeUTF(out, agentID);
-      writeUTF(out, event.getTracer().getBundle().getBundleID());
-      writeUTF(out, event.getTracer().getFullName());
-      writeUTF(out, event.getContext() == null ? "" : event.getContext().getName());
-      writeUTF(out, event.getMessage());
-      if (event.getThrowable() == null)
-      {
-        out.writeBoolean(false);
-      }
-      else
-      {
-        out.writeBoolean(true);
-        String message = event.getThrowable().getMessage();
-        writeUTF(out, message);
-
-        StackTraceElement[] stackTrace = event.getThrowable().getStackTrace();
-        int size = stackTrace == null ? 0 : stackTrace.length;
-        out.writeInt(size);
-
-        for (int i = 0; i < size; i++)
-        {
-          StackTraceElement element = stackTrace[i];
-          writeUTF(out, element.getClassName());
-          writeUTF(out, element.getMethodName());
-          writeUTF(out, element.getFileName());
-          out.writeInt(element.getLineNumber());
-        }
-      }
-
-      out.flush();
-    }
-    catch (IOException ex)
-    {
-      IOUtil.print(ex);
-    }
-  }
-
-  protected Socket connect() throws IOException
-  {
-    return new Socket(host, port);
-  }
-
-  protected void writeUTF(DataOutputStream out, String str) throws IOException
-  {
-    out.writeUTF(str == null ? "" : str);
-  }
-
-  public static String uniqueAgentID()
-  {
-    try
-    {
-      InetAddress localMachine = InetAddress.getLocalHost();
-      return localMachine.getHostName() + "#" + ++uniqueCounter;
-    }
-    catch (Exception ex)
-    {
-      UUID uuid = UUID.randomUUID();
-      return uuid.toString();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
deleted file mode 100644
index 953aba0854..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.trace;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Date;
-import java.util.EventObject;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-/**
- * @author Eike Stepper
- */
-public class RemoteTraceServer
-{
-  public static final String DEFAULT_ADDRESS = "0.0.0.0"; //$NON-NLS-1$
-
-  public static final int DEFAULT_PORT = 2035;
-
-  public static final int ANY_PORT = 0;
-
-  private static long lastEventID = 0;
-
-  private int port;
-
-  private String address;
-
-  private ServerSocket serverSocket;
-
-  private Queue<Listener> listeners = new ConcurrentLinkedQueue<Listener>();
-
-  public RemoteTraceServer() throws IOException
-  {
-    this(DEFAULT_PORT);
-  }
-
-  public RemoteTraceServer(int port) throws IOException
-  {
-    this(port, DEFAULT_ADDRESS);
-  }
-
-  public RemoteTraceServer(int port, String address) throws IOException
-  {
-    this.port = port;
-    this.address = address;
-    serverSocket = bind();
-    new Thread("RemoteTraceServer")
-    {
-      @Override
-      public void run()
-      {
-        handleConnections();
-      }
-    }.start();
-  }
-
-  public void addListener(Listener listener)
-  {
-    if (!listeners.contains(listener))
-    {
-      listeners.add(listener);
-    }
-  }
-
-  public void removeListener(Listener listener)
-  {
-    listeners.remove(listener);
-  }
-
-  public Exception close()
-  {
-    try
-    {
-      serverSocket.close();
-      return null;
-    }
-    catch (IOException ex)
-    {
-      OM.LOG.error(ex);
-      return ex;
-    }
-  }
-
-  protected ServerSocket bind() throws IOException
-  {
-    InetAddress addr = InetAddress.getByName(this.address);
-    return new ServerSocket(port, 5, addr);
-  }
-
-  protected void handleConnections()
-  {
-    for (;;)
-    {
-      try
-      {
-        final Socket socket = serverSocket.accept();
-        new Thread()
-        {
-          @Override
-          public void run()
-          {
-            handleSession(socket);
-          }
-        }.start();
-      }
-      catch (IOException ex)
-      {
-        if (!serverSocket.isClosed())
-        {
-          IOUtil.print(ex);
-        }
-
-        break;
-      }
-    }
-  }
-
-  protected void handleSession(Socket socket)
-  {
-    try
-    {
-      InputStream inputStream = socket.getInputStream();
-      DataInputStream in = new DataInputStream(inputStream);
-
-      for (;;)
-      {
-        handleTrace(in);
-      }
-    }
-    catch (IOException ex)
-    {
-      IOUtil.print(ex);
-    }
-  }
-
-  protected void handleTrace(DataInputStream in) throws IOException
-  {
-    Event event = new Event();
-    event.timeStamp = in.readLong();
-    event.agentID = in.readUTF();
-    event.bundleID = in.readUTF();
-    event.tracerName = in.readUTF();
-    event.context = in.readUTF();
-    event.message = in.readUTF();
-    if (in.readBoolean())
-    {
-      event.throwable = in.readUTF();
-      int size = in.readInt();
-      event.stackTrace = new StackTraceElement[size];
-      for (int i = 0; i < size; i++)
-      {
-        String className = in.readUTF();
-        String methodName = in.readUTF();
-        String fileName = in.readUTF();
-        int lineNumber = in.readInt();
-        event.stackTrace[i] = new StackTraceElement(className, methodName, fileName, lineNumber);
-      }
-    }
-
-    fireEvent(event);
-  }
-
-  protected void fireEvent(Event event)
-  {
-    for (Listener listener : listeners)
-    {
-      try
-      {
-        listener.notifyRemoteTrace(event);
-      }
-      catch (RuntimeException ex)
-      {
-        IOUtil.print(ex);
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class Event extends EventObject
-  {
-    private static final long serialVersionUID = 1L;
-
-    private long id;
-
-    long timeStamp;
-
-    String agentID;
-
-    String bundleID;
-
-    String tracerName;
-
-    String context;
-
-    String message;
-
-    String throwable;
-
-    StackTraceElement[] stackTrace;
-
-    Event()
-    {
-      super(RemoteTraceServer.this);
-      id = ++lastEventID;
-    }
-
-    public RemoteTraceServer getRemoteTraceServer()
-    {
-      return (RemoteTraceServer)source;
-    }
-
-    public long getID()
-    {
-      return id;
-    }
-
-    public long getTimeStamp()
-    {
-      return timeStamp;
-    }
-
-    public String getAgentID()
-    {
-      return agentID;
-    }
-
-    public String getBundleID()
-    {
-      return bundleID;
-    }
-
-    public String getContext()
-    {
-      return context;
-    }
-
-    public String getMessage()
-    {
-      return message;
-    }
-
-    public StackTraceElement[] getStackTrace()
-    {
-      return stackTrace;
-    }
-
-    public String getThrowable()
-    {
-      return throwable;
-    }
-
-    public String getTracerName()
-    {
-      return tracerName;
-    }
-
-    @Override
-    public String toString()
-    {
-      StringBuilder builder = new StringBuilder();
-      builder.append("TraceEvent[agentID=");
-      builder.append(agentID);
-
-      builder.append(", bundleID=");
-      builder.append(bundleID);
-
-      builder.append(", tracerName=");
-      builder.append(tracerName);
-
-      builder.append(", context=");
-      builder.append(context);
-
-      builder.append(", message=");
-      builder.append(message);
-
-      builder.append(", throwable=");
-      builder.append(throwable);
-
-      builder.append(", stackTrace=");
-      builder.append(stackTrace);
-
-      builder.append("]");
-      return builder.toString();
-    }
-
-    public String getText(int index)
-    {
-      switch (index)
-      {
-      case 0:
-        return Long.toString(id);
-      case 1:
-        return new Date(timeStamp).toString();
-      case 2:
-        return agentID;
-      case 3:
-        return bundleID;
-      case 4:
-        return tracerName;
-      case 5:
-        return context;
-      case 6:
-        return message;
-      case 7:
-        return throwable;
-      }
-
-      throw new IllegalArgumentException("Invalid index: " + index);
-    }
-
-    public boolean hasError()
-    {
-      return throwable != null && throwable.length() != 0 //
-          || stackTrace != null && stackTrace.length != 0;
-    }
-
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface Listener
-  {
-    public void notifyRemoteTrace(Event event);
-  }
-
-  public static class PrintListener implements Listener
-  {
-    public static final PrintListener CONSOLE = new PrintListener();
-
-    private PrintStream stream;
-
-    public PrintListener(PrintStream stream)
-    {
-      this.stream = stream;
-    }
-
-    protected PrintListener()
-    {
-      this(IOUtil.OUT());
-    }
-
-    public void notifyRemoteTrace(Event event)
-    {
-      stream.println("[TRACE] " + event.getAgentID());
-      stream.println(event.getBundleID());
-      stream.println(event.getTracerName());
-      stream.println(event.getContext());
-      stream.println(event.getMessage());
-
-      String throwable = event.getThrowable();
-      if (throwable != null && throwable.length() != 0)
-      {
-        stream.println(throwable);
-      }
-
-      StackTraceElement[] stackTrace = event.getStackTrace();
-      if (stackTrace != null) for (StackTraceElement element : stackTrace)
-      {
-        stream.print(element.getClassName());
-        stream.print("." + element.getMethodName());
-        stream.print("(" + element.getFileName());
-        stream.print(":" + element.getLineNumber());
-        stream.println(")");
-      }
-
-      stream.println();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java
deleted file mode 100644
index 30253d1f10..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.trace;
-
-import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-import java.io.Serializable;
-
-/**
- * @author Eike Stepper
- */
-public class TraceHandlerEvent implements OMTraceHandlerEvent, Serializable
-{
-  private static final long serialVersionUID = 1L;
-
-  protected long timeStamp;
-
-  protected OMTracer tracer;
-
-  protected Class<?> context;
-
-  protected String message;
-
-  protected Throwable throwable;
-
-  public TraceHandlerEvent(OMTracer tracer, Class<?> context, String message, Throwable throwable)
-  {
-    if (tracer == null)
-    {
-      throw new IllegalArgumentException("tracer == null");
-    }
-
-    if (context == null)
-    {
-      throw new IllegalArgumentException("context == null");
-    }
-
-    timeStamp = System.currentTimeMillis();
-    this.tracer = tracer;
-    this.context = context;
-    this.message = message;
-    this.throwable = throwable;
-  }
-
-  public long getTimeStamp()
-  {
-    return timeStamp;
-  }
-
-  public OMTracer getTracer()
-  {
-    return tracer;
-  }
-
-  public Class<?> getContext()
-  {
-    return context;
-  }
-
-  public String getMessage()
-  {
-    return message;
-  }
-
-  public Throwable getThrowable()
-  {
-    return throwable;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
deleted file mode 100644
index a491d8caf0..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.om.trace;
-
-import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMBundle.DebugSupport;
-import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class Tracer implements OMTracer
-{
-  private OMBundle bundle;
-
-  private Tracer parent;
-
-  private String name;
-
-  private String fullName;
-
-  public Tracer(OMBundle bundle, String name)
-  {
-    this.bundle = bundle;
-    this.name = name;
-    fullName = name;
-  }
-
-  private Tracer(Tracer parent, String name)
-  {
-    bundle = parent.getBundle();
-    this.parent = parent;
-    this.name = name;
-    fullName = parent.getFullName() + "." + name; //$NON-NLS-1$
-  }
-
-  public OMBundle getBundle()
-  {
-    return bundle;
-  }
-
-  public OMTracer getParent()
-  {
-    return parent;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public String getFullName()
-  {
-    return fullName;
-  }
-
-  public boolean isEnabled()
-  {
-    DebugSupport debugSupport = bundle.getDebugSupport();
-    return debugSupport.isDebugging() && debugSupport.getDebugOption(fullName, false);
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-    DebugSupport debugSupport = bundle.getDebugSupport();
-    debugSupport.setDebugOption(fullName, enabled);
-  }
-
-  public void trace(OMTraceHandlerEvent event)
-  {
-    ((AbstractPlatform)bundle.getPlatform()).trace(event);
-  }
-
-  public OMTraceHandlerEvent trace(Class<?> context, String msg, Throwable t)
-  {
-    OMTraceHandlerEvent event = new TraceHandlerEvent(this, context, msg, t);
-    trace(event);
-    return event;
-  }
-
-  public OMTraceHandlerEvent format(Class<?> context, String pattern, Throwable t, Object... args)
-  {
-    String msg = MessageFormat.format(pattern, args);
-    return trace(context, msg, t);
-  }
-
-  public OMTraceHandlerEvent format(Class<?> context, String pattern, Object... args)
-  {
-    return format(context, pattern, (Throwable)null, args);
-  }
-
-  public OMTraceHandlerEvent trace(Class<?> context, String msg)
-  {
-    return trace(context, msg, (Throwable)null);
-  }
-
-  public OMTraceHandlerEvent trace(Class<?> context, Throwable t)
-  {
-    return trace(context, (String)null, t);
-  }
-
-  public OMTracer tracer(String name)
-  {
-    return new Tracer(this, name);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/DelegatingRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/DelegatingRegistry.java
deleted file mode 100644
index 46b7f91f12..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/DelegatingRegistry.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.registry;
-
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Implementation note: AbstractDelegatingRegistry does not preserve the "modifyable view" contract of
- * {@link Map#entrySet()} as well as of {@link Map#keySet()}, i.e. they are disconnected sets and modifications applied
- * to them are not applied to their underlying AbstractDelegatingRegistry.
- * <p>
- * 
- * @author Eike Stepper
- */
-public abstract class DelegatingRegistry<K, V> extends Registry<K, V>
-{
-  private IRegistry<K, V> delegate;
-
-  public DelegatingRegistry(IRegistry<K, V> delegate)
-  {
-    this.delegate = delegate;
-  }
-
-  public DelegatingRegistry(IRegistry<K, V> delegate, boolean autoCommit)
-  {
-    super(autoCommit);
-    this.delegate = delegate;
-  }
-
-  @Override
-  public V get(Object key)
-  {
-    V result = getMap().get(key);
-    if (result == null && delegate != null)
-    {
-      result = delegate.get(key);
-    }
-
-    return result;
-  }
-
-  @Override
-  public Set<Entry<K, V>> entrySet()
-  {
-    return mergedEntrySet();
-  }
-
-  @Override
-  public Set<K> keySet()
-  {
-    return mergedKeySet();
-  }
-
-  @Override
-  public Collection<V> values()
-  {
-    return mergedValues();
-  }
-
-  @Override
-  protected V register(K key, V value)
-  {
-    V delegated = delegate != null ? delegate.get(key) : null;
-    V old = getMap().put(key, value);
-    if (old == null)
-    {
-      if (delegated != null)
-      {
-        // Unhidden delegated element now becomes hidden
-        getTransaction().rememberDeregistered(key, delegated);
-      }
-
-      getTransaction().rememberRegistered(key, value);
-      return delegated;
-    }
-
-    getTransaction().rememberDeregistered(key, old);
-    getTransaction().rememberRegistered(key, value);
-    return old;
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  protected V deregister(Object key)
-  {
-    V delegated = delegate != null ? delegate.get(key) : null;
-    V old = getMap().remove(key);
-    if (old != null)
-    {
-      getTransaction().rememberDeregistered((K)key, old);
-      if (delegated != null)
-      {
-        // Hidden delegated element now becomes unhidden
-        getTransaction().rememberRegistered((K)key, delegated);
-      }
-    }
-
-    return old;
-  }
-
-  protected Set<Entry<K, V>> mergedEntrySet()
-  {
-    final Map<K, V> merged = new HashMap<K, V>();
-    if (delegate != null)
-    {
-      merged.putAll(delegate);
-    }
-
-    merged.putAll(getMap());
-    return merged.entrySet();
-  }
-
-  protected Set<K> mergedKeySet()
-  {
-    final Set<K> merged = new HashSet<K>();
-    if (delegate != null)
-    {
-      merged.addAll(delegate.keySet());
-    }
-
-    merged.addAll(getMap().keySet());
-    return merged;
-  }
-
-  protected Collection<V> mergedValues()
-  {
-    final List<V> result = new ArrayList<V>();
-    for (K key : keySet())
-    {
-      result.add(get(key));
-    }
-
-    return result;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java
deleted file mode 100644
index b7ccd2e3f6..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.registry;
-
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class HashMapDelegatingRegistry<K, V> extends DelegatingRegistry<K, V>
-{
-  private Map<K, V> map;
-
-  public HashMapDelegatingRegistry(IRegistry<K, V> delegate)
-  {
-    super(delegate);
-    map = new HashMap<K, V>();
-  }
-
-  public HashMapDelegatingRegistry(IRegistry<K, V> delegate, int initialCapacity)
-  {
-    super(delegate);
-    map = new HashMap<K, V>(initialCapacity);
-  }
-
-  public HashMapDelegatingRegistry(IRegistry<K, V> delegate, int initialCapacity, float loadFactor)
-  {
-    super(delegate);
-    map = new HashMap<K, V>(initialCapacity, loadFactor);
-  }
-
-  public HashMapDelegatingRegistry(IRegistry<K, V> delegate, Map<? extends K, ? extends V> m)
-  {
-    super(delegate);
-    map = new HashMap<K, V>(m);
-  }
-
-  @Override
-  protected Map<K, V> getMap()
-  {
-    return map;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java
deleted file mode 100644
index 9515fe0f6b..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.registry;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class HashMapRegistry<K, V> extends Registry<K, V>
-{
-  private Map<K, V> map;
-
-  public HashMapRegistry()
-  {
-    map = new HashMap<K, V>();
-  }
-
-  public HashMapRegistry(int initialCapacity)
-  {
-    map = new HashMap<K, V>(initialCapacity);
-  }
-
-  public HashMapRegistry(int initialCapacity, float loadFactor)
-  {
-    map = new HashMap<K, V>(initialCapacity, loadFactor);
-  }
-
-  public HashMapRegistry(Map<? extends K, ? extends V> m)
-  {
-    map = new HashMap<K, V>(m);
-  }
-
-  @Override
-  protected Map<K, V> getMap()
-  {
-    return map;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/Registry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/Registry.java
deleted file mode 100644
index 9b692dc1e3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/Registry.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.registry;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.container.Container;
-import org.eclipse.net4j.internal.util.container.ContainerEvent;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implements IRegistry<K, V>
-{
-  private boolean autoCommit;
-
-  private Transaction transaction;
-
-  protected Registry(boolean autoCommit)
-  {
-    this.autoCommit = autoCommit;
-  }
-
-  protected Registry()
-  {
-    this(true);
-  }
-
-  @Override
-  public boolean isEmpty()
-  {
-    return keySet().isEmpty();
-  }
-
-  public int size()
-  {
-    return keySet().size();
-  }
-
-  public Set<Entry<K, V>> entrySet()
-  {
-    return getMap().entrySet();
-  }
-
-  public Set<K> keySet()
-  {
-    return getMap().keySet();
-  }
-
-  public Collection<V> values()
-  {
-    return getMap().values();
-  }
-
-  public boolean containsKey(Object key)
-  {
-    return keySet().contains(key);
-  }
-
-  public boolean containsValue(Object value)
-  {
-    return values().contains(value);
-  }
-
-  public V get(Object key)
-  {
-    return getMap().get(key);
-  }
-
-  /**
-   * Requires {@link #commit()} to be called later if not {@link #isAutoCommit()}.
-   */
-  public synchronized V put(K key, V value)
-  {
-    V result = register(key, value);
-    autoCommit();
-    return result;
-  }
-
-  /**
-   * Requires {@link #commit()} to be called later if not {@link #isAutoCommit()}.
-   */
-  public synchronized void putAll(Map<? extends K, ? extends V> t)
-  {
-    if (!t.isEmpty())
-    {
-      Iterator<? extends Entry<? extends K, ? extends V>> i = t.entrySet().iterator();
-      while (i.hasNext())
-      {
-        Entry<? extends K, ? extends V> e = i.next();
-        register(e.getKey(), e.getValue());
-      }
-
-      autoCommit();
-    }
-  }
-
-  /**
-   * Requires {@link #commit()} to be called later if not {@link #isAutoCommit()}.
-   */
-  public synchronized V remove(Object key)
-  {
-    V result = deregister(key);
-    autoCommit();
-    return result;
-  }
-
-  /**
-   * Requires {@link #commit()} to be called later if not {@link #isAutoCommit()}.
-   */
-  public synchronized void clear()
-  {
-    if (!isEmpty())
-    {
-      for (Object key : keySet().toArray())
-      {
-        deregister(key);
-      }
-
-      autoCommit();
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public Entry<K, V>[] getElements()
-  {
-    return entrySet().toArray(new Entry[size()]);
-  }
-
-  public boolean isAutoCommit()
-  {
-    return autoCommit;
-  }
-
-  public void setAutoCommit(boolean autoCommit)
-  {
-    this.autoCommit = autoCommit;
-  }
-
-  public synchronized void commit(boolean notifications)
-  {
-    if (transaction != null)
-    {
-      if (!transaction.isOwned())
-      {
-        OM.LOG.warn("Committing thread is not owner of transaction: " + Thread.currentThread());
-      }
-
-      transaction.commit(notifications);
-      transaction = null;
-      notifyAll();
-    }
-  }
-
-  public void commit()
-  {
-    commit(true);
-  }
-
-  @Override
-  public String toString()
-  {
-    return getMap().toString();
-  }
-
-  protected V register(K key, V value)
-  {
-    Transaction transaction = getTransaction();
-    V oldValue = getMap().put(key, value);
-    if (oldValue != null)
-    {
-      transaction.rememberDeregistered(key, oldValue);
-    }
-
-    transaction.rememberRegistered(key, value);
-    return oldValue;
-  }
-
-  @SuppressWarnings("unchecked")
-  protected V deregister(Object key)
-  {
-    V value = getMap().remove(key);
-    if (value != null)
-    {
-      getTransaction().rememberDeregistered((K)key, value);
-    }
-
-    return value;
-  }
-
-  protected Transaction getTransaction()
-  {
-    for (;;)
-    {
-      if (transaction == null)
-      {
-        transaction = new Transaction();
-        return transaction;
-      }
-
-      if (transaction.isOwned())
-      {
-        transaction.increaseNesting();
-        return transaction;
-      }
-
-      try
-      {
-        wait();
-      }
-      catch (InterruptedException ex)
-      {
-        return null;
-      }
-    }
-  }
-
-  protected void autoCommit()
-  {
-    if (autoCommit)
-    {
-      commit();
-    }
-  }
-
-  protected abstract Map<K, V> getMap();
-
-  /**
-   * @author Eike Stepper
-   */
-  protected class Transaction
-  {
-    private int nesting = 1;
-
-    private ContainerEvent<Map.Entry<K, V>> event;
-
-    private Thread owner;
-
-    public Transaction()
-    {
-      owner = Thread.currentThread();
-      initEvent();
-    }
-
-    private void initEvent()
-    {
-      event = newContainerEvent();
-    }
-
-    public boolean isOwned()
-    {
-      return owner == Thread.currentThread();
-    }
-
-    public void increaseNesting()
-    {
-      ++nesting;
-    }
-
-    public void commit(boolean notifications)
-    {
-      if (--nesting == 0)
-      {
-        if (notifications && !event.isEmpty())
-        {
-          fireEvent(event);
-        }
-
-        initEvent();
-      }
-    }
-
-    public void rememberRegistered(K key, V value)
-    {
-      event.addDelta(new Element<K, V>(key, value), IContainerDelta.Kind.ADDED);
-    }
-
-    public void rememberDeregistered(K key, V value)
-    {
-      event.addDelta(new Element<K, V>(key, value), IContainerDelta.Kind.REMOVED);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private static final class Element<K, V> implements Map.Entry<K, V>
-  {
-    private final K key;
-
-    private final V value;
-
-    private Element(K key, V value)
-    {
-      this.key = key;
-      this.value = value;
-    }
-
-    public K getKey()
-    {
-      return key;
-    }
-
-    public V getValue()
-    {
-      return value;
-    }
-
-    public V setValue(V value)
-    {
-      throw new UnsupportedOperationException();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/UnmodifiableRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/UnmodifiableRegistry.java
deleted file mode 100644
index 84fb9a4576..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/UnmodifiableRegistry.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.registry;
-
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-public class UnmodifiableRegistry<K, V> implements IRegistry<K, V>
-{
-  private IRegistry<K, V> delegate;
-
-  public UnmodifiableRegistry(IRegistry<K, V> delegate)
-  {
-    this.delegate = delegate;
-  }
-
-  public void addListener(IListener listener)
-  {
-    delegate.addListener(listener);
-  }
-
-  public void removeListener(IListener listener)
-  {
-    delegate.removeListener(listener);
-  }
-
-  public V put(K key, V value)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void putAll(Map<? extends K, ? extends V> t)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public V remove(Object key)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void clear()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void commit()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void commit(boolean notifications)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void setAutoCommit(boolean on)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public boolean isAutoCommit()
-  {
-    return delegate.isAutoCommit();
-  }
-
-  public boolean isEmpty()
-  {
-    return delegate.isEmpty();
-  }
-
-  public int size()
-  {
-    return delegate.size();
-  }
-
-  public Entry<K, V>[] getElements()
-  {
-    return delegate.getElements();
-  }
-
-  public V get(Object key)
-  {
-    return delegate.get(key);
-  }
-
-  public boolean containsKey(Object key)
-  {
-    return delegate.containsKey(key);
-  }
-
-  public boolean containsValue(Object value)
-  {
-    return delegate.containsValue(value);
-  }
-
-  public Set<Entry<K, V>> entrySet()
-  {
-    return delegate.entrySet();
-  }
-
-  public Set<K> keySet()
-  {
-    return delegate.keySet();
-  }
-
-  public Collection<V> values()
-  {
-    return delegate.values();
-  }
-
-  public boolean equals(Object o)
-  {
-    return delegate.equals(o);
-  }
-
-  public int hashCode()
-  {
-    return delegate.hashCode();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeNegotiator.java
deleted file mode 100644
index adad8a793c..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeNegotiator.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.security.INegotiationContext;
-import org.eclipse.net4j.util.security.IRandomizer;
-import org.eclipse.net4j.util.security.IUserManager;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-/**
- * @author Eike Stepper
- */
-public class ChallengeNegotiator extends ChallengeResponseNegotiator
-{
-  public static final int DEFAULT_TOKEN_LENGTH = 1024;
-
-  private int tokenLength = DEFAULT_TOKEN_LENGTH;
-
-  private IRandomizer randomizer;
-
-  private IUserManager userManager;
-
-  public ChallengeNegotiator()
-  {
-    super(true);
-  }
-
-  public int getTokenLength()
-  {
-    return tokenLength;
-  }
-
-  public void setTokenLength(int tokenLength)
-  {
-    this.tokenLength = tokenLength;
-  }
-
-  public IRandomizer getRandomizer()
-  {
-    return randomizer;
-  }
-
-  public void setRandomizer(IRandomizer randomizer)
-  {
-    this.randomizer = randomizer;
-  }
-
-  public IUserManager getUserManager()
-  {
-    return userManager;
-  }
-
-  public void setUserManager(IUserManager userManager)
-  {
-    this.userManager = userManager;
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (tokenLength <= 0)
-    {
-      throw new IllegalStateException("tokenLength must be positive");
-    }
-
-    if (randomizer == null)
-    {
-      throw new IllegalStateException("randomizer == null");
-    }
-
-    if (userManager == null)
-    {
-      throw new IllegalStateException("userManager == null");
-    }
-  }
-
-  protected byte[] createRandomToken()
-  {
-    byte[] token = new byte[tokenLength];
-    randomizer.nextBytes(token);
-    return token;
-  }
-
-  protected byte[] encryptToken(String userID, byte[] token) throws SecurityException
-  {
-    return userManager.encrypt(userID, token, getAlgorithmName());
-  }
-
-  @Override
-  protected void createChallenge(INegotiationContext context, ByteBuffer challenge)
-  {
-    // Create and remember a random token
-    byte[] randomToken = createRandomToken();
-    context.setInfo(randomToken);
-
-    // Set the token into challenge
-    challenge.putInt(randomToken.length);
-    challenge.put(randomToken);
-  }
-
-  @Override
-  protected void handleChallenge(INegotiationContext context, ByteBuffer challenge, ByteBuffer response)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  protected boolean handleResponse(INegotiationContext context, ByteBuffer response)
-  {
-    // Get remembered random token
-    byte[] randomToken = (byte[])context.getInfo();
-
-    // Get userID from response
-    int size = response.getInt();
-    byte[] userIDBytes = new byte[size];
-    response.get(userIDBytes);
-    String userID = new String(userIDBytes);
-
-    // Get crypted token from response
-    size = response.getInt();
-    byte[] responseToken = new byte[size];
-    response.get(responseToken);
-
-    // Encrypt the remembered token and compare to crypted token from response
-    byte[] cryptedToken = encryptToken(userID, randomToken);
-    boolean success = Arrays.equals(responseToken, cryptedToken);
-    if (success)
-    {
-      context.setUserID(userID);
-    }
-
-    return success;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeNegotiatorConfigurer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeNegotiatorConfigurer.java
deleted file mode 100644
index 234091d592..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeNegotiatorConfigurer.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.security.IRandomizer;
-import org.eclipse.net4j.util.security.IUserManager;
-
-/**
- * @author Eike Stepper
- */
-public class ChallengeNegotiatorConfigurer implements IElementProcessor
-{
-  public ChallengeNegotiatorConfigurer()
-  {
-  }
-
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
-  {
-    if (element instanceof ChallengeNegotiator)
-    {
-      ChallengeNegotiator negotiator = (ChallengeNegotiator)element;
-      if (negotiator.getRandomizer() == null)
-      {
-        IRandomizer randomizer = getRandomizer(container, description);
-        negotiator.setRandomizer(randomizer);
-      }
-
-      if (negotiator.getUserManager() == null)
-      {
-        IUserManager userManager = getUserManager(container, description);
-        negotiator.setUserManager(userManager);
-      }
-    }
-
-    return element;
-  }
-
-  protected IRandomizer getRandomizer(IManagedContainer container, String description)
-  {
-    String productGroup = RandomizerFactory.PRODUCT_GROUP;
-    String type = getRandomizerType(description);
-    return (IRandomizer)container.getElement(productGroup, type, getRandomizerDescription(description));
-  }
-
-  protected String getRandomizerType(String description)
-  {
-    return RandomizerFactory.TYPE;
-  }
-
-  protected String getRandomizerDescription(String description)
-  {
-    return null;
-  }
-
-  protected IUserManager getUserManager(IManagedContainer container, String description)
-  {
-    String productGroup = FileUserManagerFactory.PRODUCT_GROUP;
-    String type = getUserManagerType(description);
-    return (IUserManager)container.getElement(productGroup, type, getUserManagerDescription(description));
-  }
-
-  protected String getUserManagerType(String description)
-  {
-    return FileUserManagerFactory.TYPE;
-  }
-
-  protected String getUserManagerDescription(String description)
-  {
-    return description;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeNegotiatorFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeNegotiatorFactory.java
deleted file mode 100644
index 7e48893eb2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeNegotiatorFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-/**
- * @author Eike Stepper
- */
-public class ChallengeNegotiatorFactory extends NegotiatorFactory
-{
-  public static final String TYPE = "challenge";
-
-  public ChallengeNegotiatorFactory()
-  {
-    super(TYPE);
-  }
-
-  public ChallengeNegotiator create(String description)
-  {
-    return new ChallengeNegotiator();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeResponseNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeResponseNegotiator.java
deleted file mode 100644
index df841c5e4d..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ChallengeResponseNegotiator.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.fsm.ITransition;
-import org.eclipse.net4j.util.security.IChallengeResponse;
-import org.eclipse.net4j.util.security.INegotiationContext;
-import org.eclipse.net4j.util.security.SecurityUtil;
-
-import java.nio.ByteBuffer;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ChallengeResponseNegotiator extends
-    Negotiator<IChallengeResponse.State, IChallengeResponse.Event> implements IChallengeResponse
-{
-  public static final String DEFAULT_ALGORITHM_NAME = SecurityUtil.PBE_WITH_MD5_AND_DES;
-
-  private String algorithmName = DEFAULT_ALGORITHM_NAME;
-
-  public ChallengeResponseNegotiator(boolean initiator)
-  {
-    super(State.class, Event.class, State.INITIAL, State.SUCCESS, State.FAILURE, Event.START, Event.BUFFER, initiator);
-
-    init(State.INITIAL, Event.START, new Transition()
-    {
-      @Override
-      protected void execute(INegotiationContext context, ByteBuffer NULL)
-      {
-        // Create and transmit challenge
-        ByteBuffer challenge = context.getBuffer();
-        createChallenge(context, challenge);
-        context.transmitBuffer(challenge);
-
-        // Set context state
-        changeState(context, State.CHALLENGE);
-      }
-    });
-
-    init(State.INITIAL, Event.BUFFER, new Transition()
-    {
-      @Override
-      protected void execute(INegotiationContext context, ByteBuffer challenge)
-      {
-        // Handle challenge and transmit response
-        ByteBuffer response = context.getBuffer();
-        handleChallenge(context, challenge, response);
-        context.transmitBuffer(response);
-
-        // Set context state
-        changeState(context, State.RESPONSE);
-      }
-    });
-
-    init(State.CHALLENGE, Event.BUFFER, new Transition()
-    {
-      @Override
-      protected void execute(INegotiationContext context, ByteBuffer response)
-      {
-        // Handle response
-        boolean success = handleResponse(context, response);
-
-        // Transmit acknowledgement
-        ByteBuffer acknowledgement = context.getBuffer();
-        acknowledgement.put(success ? ACKNOWLEDGE_SUCCESS : ACKNOWLEDGE_FAILURE);
-        context.transmitBuffer(acknowledgement);
-
-        // Set context state
-        changeState(context, success ? State.SUCCESS : State.FAILURE);
-      }
-    });
-
-    init(State.RESPONSE, Event.BUFFER, new Transition()
-    {
-      @Override
-      protected void execute(INegotiationContext context, ByteBuffer acknowledgement)
-      {
-        // Handle acknowledgement
-        boolean success = acknowledgement.get() == ACKNOWLEDGE_SUCCESS;
-
-        // Set context state
-        changeState(context, success ? State.SUCCESS : State.FAILURE);
-      }
-    });
-  }
-
-  public String getAlgorithmName()
-  {
-    return algorithmName;
-  }
-
-  public void setAlgorithmName(String algorithmName)
-  {
-    this.algorithmName = algorithmName;
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (algorithmName == null)
-    {
-      throw new IllegalStateException("algorithmName == null");
-    }
-  }
-
-  @Override
-  protected State getState(INegotiationContext subject)
-  {
-    return (State)subject.getState();
-  }
-
-  @Override
-  protected void setState(INegotiationContext subject, State state)
-  {
-    subject.setState(state);
-  }
-
-  protected abstract void createChallenge(INegotiationContext context, ByteBuffer challenge);
-
-  protected abstract void handleChallenge(INegotiationContext context, ByteBuffer challenge, ByteBuffer response);
-
-  protected abstract boolean handleResponse(INegotiationContext context, ByteBuffer response);
-
-  /**
-   * @author Eike Stepper
-   */
-  protected abstract class Transition implements ITransition<State, Event, INegotiationContext, ByteBuffer>
-  {
-    public final void execute(INegotiationContext context, State state, Event event, ByteBuffer buffer)
-    {
-      execute(context, buffer);
-    }
-
-    protected abstract void execute(INegotiationContext context, ByteBuffer buffer);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Credentials.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Credentials.java
deleted file mode 100644
index 01ed0852ae..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Credentials.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.security.ICredentials;
-
-/**
- * @author Eike Stepper
- */
-public class Credentials implements ICredentials
-{
-  private String userID;
-
-  public Credentials(String userID)
-  {
-    this.userID = userID;
-  }
-
-  public String getUserID()
-  {
-    return userID;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/FileUserManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/FileUserManager.java
deleted file mode 100644
index 9007fbb682..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/FileUserManager.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.io.IORuntimeException;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Map.Entry;
-
-/**
- * @author Eike Stepper
- */
-public class FileUserManager extends UserManager
-{
-  protected String fileName;
-
-  public FileUserManager()
-  {
-  }
-
-  public String getFileName()
-  {
-    return fileName;
-  }
-
-  public void setFileName(String fileName)
-  {
-    this.fileName = fileName;
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (fileName == null)
-    {
-      throw new IllegalStateException("fileName == null");
-    }
-
-    File file = new File(fileName);
-    if (file.exists() && !file.isFile())
-    {
-      throw new IllegalStateException("Not a file: " + fileName);
-    }
-  }
-
-  @Override
-  protected void load(Map<String, char[]> users) throws IORuntimeException
-  {
-    File file = new File(fileName);
-    if (!file.exists())
-    {
-      return;
-    }
-
-    FileInputStream stream = IOUtil.openInputStream(new File(fileName));
-    try
-    {
-      load(users, stream);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-    finally
-    {
-      IOUtil.closeSilent(stream);
-    }
-  }
-
-  protected void load(Map<String, char[]> users, InputStream stream) throws IOException
-  {
-    Properties properties = new Properties();
-    properties.load(stream);
-    for (Entry<Object, Object> entry : properties.entrySet())
-    {
-      String userID = (String)entry.getKey();
-      char[] password = ((String)entry.getValue()).toCharArray();
-      users.put(userID, password);
-    }
-  }
-
-  @Override
-  protected void save(Map<String, char[]> users) throws IORuntimeException
-  {
-    File file = new File(fileName);
-    if (!file.exists())
-    {
-      return;
-    }
-
-    FileOutputStream stream = IOUtil.openOutputStream(new File(fileName));
-    try
-    {
-      save(users, stream);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-    finally
-    {
-      IOUtil.closeSilent(stream);
-    }
-  }
-
-  protected void save(Map<String, char[]> users, FileOutputStream stream) throws IOException
-  {
-    Properties properties = new Properties();
-    for (Entry<String, char[]> entry : users.entrySet())
-    {
-      properties.put(entry.getKey(), new String(entry.getValue()));
-    }
-
-    String comment = MessageFormat.format("User database {0,date} {0,time}", System.currentTimeMillis());
-    properties.store(stream, comment);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/FileUserManagerFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/FileUserManagerFactory.java
deleted file mode 100644
index 99c244e5a5..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/FileUserManagerFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-/**
- * TODO Consider file attributes when creating initially empty file
- * 
- * @author Eike Stepper
- */
-public class FileUserManagerFactory extends UserManagerFactory
-{
-  public static final String TYPE = "file";
-
-  public FileUserManagerFactory()
-  {
-    super(TYPE);
-  }
-
-  public FileUserManager create(String description)
-  {
-    FileUserManager userManager = new FileUserManager();
-    userManager.setFileName(description);
-    return userManager;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/NegotiationContext.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/NegotiationContext.java
deleted file mode 100644
index a5e8c6b621..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/NegotiationContext.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.security.INegotiationContext;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-public abstract class NegotiationContext implements INegotiationContext
-{
-  private Receiver receiver;
-
-  private Enum<?> state;
-
-  private Object info;
-
-  private CountDownLatch finishedLatch = new CountDownLatch(1);
-
-  public NegotiationContext()
-  {
-  }
-
-  public Receiver getReceiver()
-  {
-    return receiver;
-  }
-
-  public void setReceiver(Receiver receiver)
-  {
-    this.receiver = receiver;
-  }
-
-  public Enum<?> getState()
-  {
-    return state;
-  }
-
-  public void setState(Enum<?> state)
-  {
-    this.state = state;
-  }
-
-  public Object getInfo()
-  {
-    return info;
-  }
-
-  public void setInfo(Object info)
-  {
-    this.info = info;
-  }
-
-  public void setFinished(boolean success)
-  {
-    if (finishedLatch != null)
-    {
-      finishedLatch.countDown();
-    }
-  }
-
-  public Enum<?> waitUntilFinished(long timeout)
-  {
-    if (finishedLatch == null)
-    {
-      throw new IllegalStateException("finishedLatch == null");
-    }
-
-    try
-    {
-      if (timeout == -1)
-      {
-        finishedLatch.await();
-      }
-      else
-      {
-        finishedLatch.await(timeout, TimeUnit.MILLISECONDS);
-      }
-    }
-    catch (InterruptedException ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-    finally
-    {
-      finishedLatch = null;
-    }
-
-    return state;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Negotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Negotiator.java
deleted file mode 100644
index 03974ad530..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Negotiator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.fsm.FiniteStateMachine;
-import org.eclipse.net4j.util.security.INegotiationContext;
-import org.eclipse.net4j.util.security.INegotiator;
-
-import java.nio.ByteBuffer;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Negotiator<STATE extends Enum<?>, EVENT extends Enum<?>> extends
-    FiniteStateMachine<STATE, EVENT, INegotiationContext> implements INegotiator, INegotiationContext.Receiver
-{
-  private transient STATE initialState;
-
-  private transient STATE successState;
-
-  private transient STATE failureState;
-
-  private transient EVENT startEvent;
-
-  private transient EVENT bufferEvent;
-
-  private boolean initiator;
-
-  public Negotiator(Class<STATE> stateEnum, Class<EVENT> eventEnum, STATE initialState, STATE successState,
-      STATE failureState, EVENT startEvent, EVENT bufferEvent, boolean initiator)
-  {
-    super(stateEnum, eventEnum);
-
-    if (initialState == null) throw new IllegalStateException("initialState == null");
-    if (successState == null) throw new IllegalStateException("successState == null");
-    if (failureState == null) throw new IllegalStateException("failureState == null");
-    if (startEvent == null) throw new IllegalStateException("startEvent == null");
-    if (bufferEvent == null) throw new IllegalStateException("bufferEvent == null");
-
-    this.initialState = initialState;
-    this.successState = successState;
-    this.failureState = failureState;
-    this.startEvent = startEvent;
-    this.bufferEvent = bufferEvent;
-    this.initiator = initiator;
-
-  }
-
-  public STATE getInitialState()
-  {
-    return initialState;
-  }
-
-  public STATE getSuccessState()
-  {
-    return successState;
-  }
-
-  public STATE getFailureState()
-  {
-    return failureState;
-  }
-
-  public EVENT getBufferEvent()
-  {
-    return bufferEvent;
-  }
-
-  public EVENT getStartEvent()
-  {
-    return startEvent;
-  }
-
-  public boolean isInitiator()
-  {
-    return initiator;
-  }
-
-  public void negotiate(INegotiationContext context)
-  {
-    context.setReceiver(this);
-    context.setState(initialState);
-    if (initiator)
-    {
-      process(context, startEvent, null);
-      postProcess(context);
-    }
-  }
-
-  public void receiveBuffer(INegotiationContext context, ByteBuffer buffer)
-  {
-    process(context, bufferEvent, buffer);
-    postProcess(context);
-  }
-
-  protected void postProcess(INegotiationContext context)
-  {
-    Enum<?> state = context.getState();
-    if (state == successState)
-    {
-      context.setFinished(true);
-    }
-    else if (state == failureState)
-    {
-      context.setFinished(false);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/NegotiatorFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/NegotiatorFactory.java
deleted file mode 100644
index ee4090c1b5..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/NegotiatorFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.internal.util.factory.Factory;
-
-/**
- * @author Eike Stepper
- */
-public abstract class NegotiatorFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.Negotiators";
-
-  public NegotiatorFactory(String type)
-  {
-    super(PRODUCT_GROUP, type);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentials.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentials.java
deleted file mode 100644
index 94a83fd40e..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentials.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.security.IPasswordCredentials;
-
-/**
- * @author Eike Stepper
- */
-public class PasswordCredentials extends Credentials implements IPasswordCredentials
-{
-  private char[] password;
-
-  public PasswordCredentials(String userID, char[] password)
-  {
-    super(userID);
-    this.password = password;
-  }
-
-  public char[] getPassword()
-  {
-    return password;
-  }
-
-  public void setPassword(char[] password)
-  {
-    this.password = password;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentialsProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentialsProvider.java
deleted file mode 100644
index 53d392d369..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentialsProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.security.IPasswordCredentials;
-import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
-
-/**
- * @author Eike Stepper
- */
-public final class PasswordCredentialsProvider implements IPasswordCredentialsProvider
-{
-  private IPasswordCredentials credentials;
-
-  public PasswordCredentialsProvider(IPasswordCredentials credentials)
-  {
-    this.credentials = credentials;
-  }
-
-  public boolean isInteractive()
-  {
-    return false;
-  }
-
-  public IPasswordCredentials getCredentials()
-  {
-    return credentials;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Randomizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Randomizer.java
deleted file mode 100644
index 0a58d395e7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Randomizer.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.security.IRandomizer;
-
-import java.security.SecureRandom;
-
-/**
- * @author Eike Stepper
- */
-public class Randomizer extends Lifecycle implements IRandomizer
-{
-  public static final String ALGORITHM_SHA1PRNG = "SHA1PRNG";
-
-  public static final String DEFAULT_ALGORITHM_NAME = ALGORITHM_SHA1PRNG;
-
-  private String algorithmName = DEFAULT_ALGORITHM_NAME;
-
-  private String providerName;
-
-  private transient SecureRandom secureRandom;
-
-  public String getAlgorithmName()
-  {
-    return algorithmName;
-  }
-
-  public void setAlgorithmName(String algorithmName)
-  {
-    this.algorithmName = algorithmName;
-  }
-
-  public String getProviderName()
-  {
-    return providerName;
-  }
-
-  public void setProviderName(String providerName)
-  {
-    this.providerName = providerName;
-  }
-
-  public boolean nextBoolean()
-  {
-    return secureRandom.nextBoolean();
-  }
-
-  public double nextDouble()
-  {
-    return secureRandom.nextDouble();
-  }
-
-  public float nextFloat()
-  {
-    return secureRandom.nextFloat();
-  }
-
-  public synchronized double nextGaussian()
-  {
-    return secureRandom.nextGaussian();
-  }
-
-  public int nextInt()
-  {
-    return secureRandom.nextInt();
-  }
-
-  public int nextInt(int n)
-  {
-    return secureRandom.nextInt(n);
-  }
-
-  public long nextLong()
-  {
-    return secureRandom.nextLong();
-  }
-
-  public byte[] generateSeed(int numBytes)
-  {
-    return secureRandom.generateSeed(numBytes);
-  }
-
-  public String getAlgorithm()
-  {
-    return secureRandom.getAlgorithm();
-  }
-
-  public synchronized void nextBytes(byte[] bytes)
-  {
-    secureRandom.nextBytes(bytes);
-  }
-
-  public synchronized void setSeed(byte[] seed)
-  {
-    secureRandom.setSeed(seed);
-  }
-
-  public void setSeed(long seed)
-  {
-    secureRandom.setSeed(seed);
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (algorithmName == null)
-    {
-      throw new IllegalStateException("algorithmName == null");
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    if (providerName == null)
-    {
-      secureRandom = SecureRandom.getInstance(algorithmName);
-    }
-    else
-    {
-      secureRandom = SecureRandom.getInstance(algorithmName, providerName);
-    }
-
-    secureRandom.setSeed(System.currentTimeMillis());
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    secureRandom = null;
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/RandomizerFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/RandomizerFactory.java
deleted file mode 100644
index 537b8754af..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/RandomizerFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.internal.util.factory.Factory;
-import org.eclipse.net4j.util.factory.ProductCreationException;
-
-/**
- * @author Eike Stepper
- */
-public class RandomizerFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.randomizers";
-
-  public static final String TYPE = "default";
-
-  public RandomizerFactory()
-  {
-    super(PRODUCT_GROUP, TYPE);
-  }
-
-  public Randomizer create(String description) throws ProductCreationException
-  {
-    Randomizer randomizer = new Randomizer();
-    if (description != null)
-    {
-      randomizer.setAlgorithmName(description);
-    }
-
-    return randomizer;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ResponseNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ResponseNegotiator.java
deleted file mode 100644
index d734a7c25f..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ResponseNegotiator.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.util.security.INegotiationContext;
-import org.eclipse.net4j.util.security.IPasswordCredentials;
-import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
-import org.eclipse.net4j.util.security.SecurityUtil;
-
-import java.nio.ByteBuffer;
-
-/**
- * @author Eike Stepper
- */
-public class ResponseNegotiator extends ChallengeResponseNegotiator
-{
-  private IPasswordCredentialsProvider credentialsProvider;
-
-  public ResponseNegotiator()
-  {
-    super(false);
-  }
-
-  public IPasswordCredentialsProvider getCredentialsProvider()
-  {
-    return credentialsProvider;
-  }
-
-  public void setCredentialsProvider(IPasswordCredentialsProvider credentialsProvider)
-  {
-    this.credentialsProvider = credentialsProvider;
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (credentialsProvider == null)
-    {
-      throw new IllegalStateException("credentialsProvider == null");
-    }
-  }
-
-  @Override
-  protected void createChallenge(INegotiationContext context, ByteBuffer challenge)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  protected void handleChallenge(INegotiationContext context, ByteBuffer challenge, ByteBuffer response)
-  {
-    // Get random token from challenge
-    int size = challenge.getInt();
-    byte[] randomToken = new byte[size];
-    challenge.get(randomToken);
-
-    // Get credentials and encrypt token
-    IPasswordCredentials credentials = credentialsProvider.getCredentials();
-    String userID = credentials.getUserID();
-    context.setUserID(userID);
-
-    // Set userID into response
-    byte[] userIDBytes = userID.getBytes();
-    response.putInt(userIDBytes.length);
-    response.put(userIDBytes);
-
-    // Set crypted token into response
-    byte[] cryptedToken = encryptToken(credentials.getPassword(), randomToken);
-    response.putInt(cryptedToken.length);
-    response.put(cryptedToken);
-  }
-
-  @Override
-  protected boolean handleResponse(INegotiationContext context, ByteBuffer response)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  protected byte[] encryptToken(char[] password, byte[] token)
-  {
-    try
-    {
-      return SecurityUtil.encrypt(token, password, getAlgorithmName());
-    }
-    catch (RuntimeException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new SecurityException(ex);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ResponseNegotiatorFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ResponseNegotiatorFactory.java
deleted file mode 100644
index 12030ce0df..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/ResponseNegotiatorFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-/**
- * @author Eike Stepper
- */
-public class ResponseNegotiatorFactory extends NegotiatorFactory
-{
-  public static final String TYPE = "response";
-
-  public ResponseNegotiatorFactory()
-  {
-    super(TYPE);
-  }
-
-  public ResponseNegotiator create(String description)
-  {
-    return new ResponseNegotiator();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/UserManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/UserManager.java
deleted file mode 100644
index bec24fa4d0..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/UserManager.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.io.IORuntimeException;
-import org.eclipse.net4j.util.security.IUserManager;
-import org.eclipse.net4j.util.security.SecurityUtil;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class UserManager extends Lifecycle implements IUserManager
-{
-  // Transient to prevent from logging
-  protected transient Map<String, char[]> users = new HashMap<String, char[]>();
-
-  public UserManager()
-  {
-  }
-
-  public synchronized void addUser(String userID, char[] password)
-  {
-    users.put(userID, password);
-    save(users);
-  }
-
-  public synchronized void removeUser(String userID)
-  {
-    if (users.remove(userID) != null)
-    {
-      save(users);
-    }
-  }
-
-  public byte[] encrypt(String userID, byte[] data, String algorithmName) throws SecurityException
-  {
-    char[] password;
-    synchronized (this)
-    {
-      password = users.get(userID);
-    }
-
-    if (password == null)
-    {
-      throw new SecurityException("No such user: " + userID);
-    }
-
-    try
-    {
-      return SecurityUtil.encrypt(data, password, algorithmName);
-    }
-    catch (RuntimeException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new SecurityException(ex);
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    load(users);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    users.clear();
-    super.doDeactivate();
-  }
-
-  protected void load(Map<String, char[]> users) throws IORuntimeException
-  {
-  }
-
-  protected void save(Map<String, char[]> users) throws IORuntimeException
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/UserManagerFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/UserManagerFactory.java
deleted file mode 100644
index 448a721e63..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/UserManagerFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.security;
-
-import org.eclipse.net4j.internal.util.factory.Factory;
-
-/**
- * @author Eike Stepper
- */
-public abstract class UserManagerFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.userManagers";
-
-  public UserManagerFactory(String type)
-  {
-    super(PRODUCT_GROUP, type);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java
deleted file mode 100644
index d96fe298cb..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.internal.util.transaction;
-
-import org.eclipse.net4j.util.transaction.ITransaction;
-import org.eclipse.net4j.util.transaction.ITransactionalOperation;
-import org.eclipse.net4j.util.transaction.TransactionException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public class Transaction<CONTEXT> implements ITransaction<CONTEXT>
-{
-  private List<ITransactionalOperation<CONTEXT>> operations = new ArrayList<ITransactionalOperation<CONTEXT>>();
-
-  private CONTEXT context;
-
-  private boolean undoPhase1OnRollback;
-
-  public Transaction(CONTEXT context, boolean undoPhase1OnRollback)
-  {
-    this.context = context;
-    this.undoPhase1OnRollback = undoPhase1OnRollback;
-  }
-
-  public Transaction(CONTEXT context)
-  {
-    this(context, true);
-  }
-
-  public boolean isUndoPhase1OnRollback()
-  {
-    return undoPhase1OnRollback;
-  }
-
-  public boolean isActive()
-  {
-    return operations != null;
-  }
-
-  public CONTEXT getContext()
-  {
-    return context;
-  }
-
-  public void execute(ITransactionalOperation<CONTEXT> operation) throws TransactionException
-  {
-    if (!isActive())
-    {
-      throw new TransactionException("Transaction inactive");
-    }
-
-    try
-    {
-      operation.phase1(context);
-      operations.add(operation);
-    }
-    catch (RuntimeException ex)
-    {
-      rollback();
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      rollback();
-      throw new TransactionException(ex);
-    }
-  }
-
-  public void commit()
-  {
-    for (ITransactionalOperation<CONTEXT> operation : end())
-    {
-      operation.phase2(context);
-    }
-  }
-
-  public void rollback()
-  {
-    if (undoPhase1OnRollback)
-    {
-      for (ITransactionalOperation<CONTEXT> operation : end())
-      {
-        operation.undoPhase1(context);
-      }
-    }
-  }
-
-  private List<ITransactionalOperation<CONTEXT>> end()
-  {
-    List<ITransactionalOperation<CONTEXT>> tmp = operations;
-    operations = null;
-    return tmp;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
deleted file mode 100644
index c37a2d92d1..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util;
-
-/**
- * @author Eike Stepper
- */
-public final class CheckUtil
-{
-  private CheckUtil()
-  {
-  }
-
-  public static void checkNull(Object handle, String msg) throws NullPointerException
-  {
-    if (handle == null)
-    {
-      throw new NullPointerException(msg);
-    }
-  }
-
-  public static void checkArg(boolean expr, String msg) throws IllegalArgumentException
-  {
-    if (!expr)
-    {
-      throw new IllegalArgumentException(msg);
-    }
-  }
-
-  public static void checkArg(Object handle, String handleName) throws IllegalArgumentException
-  {
-    if (handle == null)
-    {
-      throw new IllegalArgumentException(handleName + " is null");
-    }
-  }
-
-  public static void checkState(boolean expr, String msg) throws IllegalStateException
-  {
-    if (!expr)
-    {
-      throw new IllegalStateException(msg);
-    }
-  }
-
-  public static void checkState(Object handle, String handleName) throws IllegalStateException
-  {
-    if (handle == null)
-    {
-      throw new IllegalStateException(handleName + " is null");
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
deleted file mode 100644
index 09fb81fef9..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util;
-
-import org.eclipse.net4j.util.io.IORuntimeException;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public final class HexUtil
-{
-  public static final char DIGITS[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', };
-
-  private HexUtil()
-  {
-  }
-
-  /**
-   * Converts a byte array into a string of lower case hex chars.
-   * 
-   * @param bs
-   *          A byte array
-   * @param off
-   *          The index of the first byte to read
-   * @param length
-   *          The number of bytes to read.
-   * @return the string of hex chars.
-   */
-  public static final String bytesToHex(byte[] bs, int off, int length)
-  {
-    if (bs.length <= off || bs.length < off + length)
-    {
-      throw new IllegalArgumentException();
-    }
-
-    StringBuilder sb = new StringBuilder(length * 2);
-    bytesToHexAppend(bs, off, length, sb);
-    return sb.toString();
-  }
-
-  public static final void bytesToHexAppend(byte[] bs, int off, int length, Appendable appendable)
-  {
-    if (bs.length <= off || bs.length < off + length)
-    {
-      throw new IllegalArgumentException();
-    }
-
-    if (appendable instanceof StringBuffer)
-    {
-      StringBuffer buffer = (StringBuffer)appendable;
-      buffer.ensureCapacity(buffer.length() + length * 2);
-    }
-
-    try
-    {
-      for (int i = off; i < off + length; i++)
-      {
-        appendable.append(Character.forDigit(bs[i] >>> 4 & 0xf, 16));
-        appendable.append(Character.forDigit(bs[i] & 0xf, 16));
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static final String bytesToHex(byte[] bs)
-  {
-    return bytesToHex(bs, 0, bs.length);
-  }
-
-  public static final byte[] hexToBytes(String s)
-  {
-    return hexToBytes(s, 0);
-  }
-
-  public static final byte[] hexToBytes(String s, int off)
-  {
-    byte[] bs = new byte[off + (1 + s.length()) / 2];
-    hexToBytes(s, bs, off);
-    return bs;
-  }
-
-  /**
-   * Converts a String of hex characters into an array of bytes.
-   * 
-   * @param s
-   *          A string of hex characters (upper case or lower) of even length.
-   * @param out
-   *          A byte array of length at least s.length()/2 + off
-   * @param off
-   *          The first byte to write of the array
-   */
-  public static final void hexToBytes(String s, byte[] out, int off) throws NumberFormatException,
-      IndexOutOfBoundsException
-  {
-    int slen = s.length();
-    if (slen % 2 != 0)
-    {
-      s = '0' + s;
-    }
-
-    if (out.length < off + slen / 2)
-    {
-      throw new IndexOutOfBoundsException("Output buffer too small for input (" + out.length + '<' + off + slen / 2
-          + ')');
-    }
-
-    // Safe to assume the string is even length
-    byte b1, b2;
-    for (int i = 0; i < slen; i += 2)
-    {
-      b1 = (byte)Character.digit(s.charAt(i), 16);
-      b2 = (byte)Character.digit(s.charAt(i + 1), 16);
-      if (b1 < 0 || b2 < 0)
-      {
-        throw new NumberFormatException();
-      }
-
-      out[off + i / 2] = (byte)(b1 << 4 | b2);
-    }
-  }
-
-  public static String longToHex(long v)
-  {
-    final String hex = Long.toHexString(v);
-    if (hex.length() < 8)
-    {
-      return "00000000".substring(hex.length()) + hex;
-    }
-
-    return hex;
-  }
-
-  @Deprecated
-  public static String formatByte(int b)
-  {
-    assertByte(b);
-    return "" + DIGITS[b >> 4] + DIGITS[b & 0xf]; //$NON-NLS-1$
-  }
-
-  @Deprecated
-  public static String formatBytes(byte[] bytes)
-  {
-    StringBuilder builder = new StringBuilder();
-    for (byte b : bytes)
-    {
-      appendHex(builder, b - Byte.MIN_VALUE);
-    }
-
-    return builder.toString();
-  }
-
-  @Deprecated
-  public static void appendHex(StringBuilder builder, int b)
-  {
-    assertByte(b);
-    builder.append(DIGITS[b >> 4]);
-    builder.append(DIGITS[b & 0xf]);
-  }
-
-  @Deprecated
-  private static void assertByte(int b)
-  {
-    if (b < 0 || b > 255)
-    {
-      throw new IllegalArgumentException("b=" + b); //$NON-NLS-1$
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java
deleted file mode 100644
index 35258aba1d..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util;
-
-/**
- * @author Eike Stepper
- */
-public class ImplementationError extends Error
-{
-  private static final long serialVersionUID = 1L;
-
-  public ImplementationError()
-  {
-  }
-
-  public ImplementationError(String message)
-  {
-    super(message);
-  }
-
-  public ImplementationError(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-
-  public ImplementationError(Throwable cause)
-  {
-    super(cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ObjectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ObjectUtil.java
deleted file mode 100644
index 85fe87ca2e..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ObjectUtil.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util;
-
-import java.lang.reflect.Array;
-
-/**
- * @author Eike Stepper
- */
-public final class ObjectUtil
-{
-  private ObjectUtil()
-  {
-  }
-
-  public static boolean equals(Object o1, Object o2)
-  {
-    if (o1 == null)
-    {
-      return o2 == null;
-    }
-
-    return o1.equals(o2);
-  }
-
-  public static int hashCode(Object o)
-  {
-    if (o == null)
-    {
-      return 0;
-    }
-
-    return o.hashCode();
-  }
-
-  public static int hashCode(long num)
-  {
-    return (int)(num >> 32) ^ (int)(num & 0xffffffff);
-  }
-
-  @SuppressWarnings("unchecked")
-  public static <T> T[] appendtoArray(T[] array, T... elements)
-  {
-    T[] result = (T[])Array.newInstance(array.getClass().getComponentType(), array.length + elements.length);
-    System.arraycopy(array, 0, result, 0, array.length);
-    System.arraycopy(elements, 0, result, array.length, elements.length);
-    return result;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
deleted file mode 100644
index 2f97c40a4f..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.collection.Pair;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import java.io.PrintStream;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.Map.Entry;
-
-/**
- * @author Eike Stepper
- */
-public final class ReflectUtil
-{
-  private static final String NAMESPACE_SEPARATOR = ".";
-
-  public static final Class<Object> ROOT_CLASS = Object.class;
-
-  public static final Class<?>[] NO_PARAMETERS = null;
-
-  public static final Object[] NO_ARGUMENTS = null;
-
-  private static final Method HASH_CODE_METHOD = lookupHashCodeMethod();
-
-  private static final Map<Object, Long> ids = new WeakHashMap<Object, Long>();
-
-  public static boolean DUMP_STATICS = false;
-
-  private static long lastID;
-
-  private ReflectUtil()
-  {
-  }
-
-  public static Method getMethod(Class<?> c, String methodName, Class<?>... parameterTypes)
-  {
-    try
-    {
-      try
-      {
-        return c.getDeclaredMethod(methodName, parameterTypes);
-      }
-      catch (NoSuchMethodException ex)
-      {
-        Class<?> superclass = c.getSuperclass();
-        if (superclass != null)
-        {
-          return getMethod(superclass, methodName, parameterTypes);
-        }
-
-        return null;
-      }
-    }
-    catch (RuntimeException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new ImplementationError(ex);
-    }
-  }
-
-  public static Object invokeMethod(Method method, Object target, Object... arguments) throws InvocationTargetException
-  {
-    if (!method.isAccessible())
-    {
-      method.setAccessible(true);
-    }
-
-    try
-    {
-      return method.invoke(target, arguments);
-    }
-    catch (IllegalAccessException ex)
-    {
-      throw new ImplementationError(ex);
-    }
-  }
-
-  public static Field getField(Class<?> c, String fieldName)
-  {
-    try
-    {
-      try
-      {
-        return c.getDeclaredField(fieldName);
-      }
-      catch (NoSuchFieldException ex)
-      {
-        Class<?> superclass = c.getSuperclass();
-        if (superclass != null)
-        {
-          return getField(superclass, fieldName);
-        }
-
-        return null;
-      }
-    }
-    catch (RuntimeException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new ImplementationError(ex);
-    }
-  }
-
-  public static void collectFields(Class<?> c, List<Field> fields)
-  {
-    if (c == ROOT_CLASS)
-    {
-      return;
-    }
-
-    // Recurse
-    collectFields(c.getSuperclass(), fields);
-
-    try
-    {
-      Field[] declaredFields = c.getDeclaredFields();
-      for (Field field : declaredFields)
-      {
-        if (field.isSynthetic())
-        {
-          continue;
-        }
-
-        if ((field.getModifiers() & Modifier.STATIC) != 0 && !DUMP_STATICS)
-        {
-          continue;
-        }
-
-        if (field.getAnnotation(ExcludeFromDump.class) != null)
-        {
-          continue;
-        }
-
-        fields.add(field);
-      }
-    }
-    catch (RuntimeException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new ImplementationError(ex);
-    }
-  }
-
-  public static Object getValue(Field field, Object target)
-  {
-    if (!field.isAccessible())
-    {
-      field.setAccessible(true);
-    }
-
-    try
-    {
-      return field.get(target);
-    }
-    catch (IllegalAccessException ex)
-    {
-      throw new ImplementationError(ex);
-    }
-  }
-
-  public static void setValue(Field field, Object target, Object value)
-  {
-    if (!field.isAccessible())
-    {
-      field.setAccessible(true);
-    }
-
-    try
-    {
-      field.set(target, value);
-    }
-    catch (IllegalAccessException ex)
-    {
-      throw new ImplementationError(ex);
-    }
-  }
-
-  public static void printStackTrace(PrintStream out, StackTraceElement[] stackTrace)
-  {
-    for (int i = 2; i < stackTrace.length; i++)
-    {
-      StackTraceElement stackTraceElement = stackTrace[i];
-      out.println("\tat " + stackTraceElement);
-    }
-  }
-
-  public static void printStackTrace(StackTraceElement[] stackTrace)
-  {
-    printStackTrace(System.err, stackTrace);
-  }
-
-  public static Integer getHashCode(Object object)
-  {
-    try
-    {
-      return (Integer)HASH_CODE_METHOD.invoke(object, NO_ARGUMENTS);
-    }
-    catch (Exception ex)
-    {
-      IOUtil.print(ex);
-    }
-
-    return 0;
-  }
-
-  public static Long getID(Object object)
-  {
-    Long id = ids.get(object);
-    if (id == null)
-    {
-      id = ++lastID;
-      ids.put(object, id);
-    }
-
-    return id;
-  }
-
-  public static String getPackageName(Class<? extends Object> c)
-  {
-    if (c == null)
-    {
-      return null;
-    }
-
-    return getPackageName(c.getName());
-  }
-
-  public static String getPackageName(String className)
-  {
-    if (className == null)
-    {
-      return null;
-    }
-
-    int lastDot = className.lastIndexOf('.');
-    if (lastDot != -1)
-    {
-      className = className.substring(0, lastDot);
-    }
-
-    return className;
-  }
-
-  public static String getSimpleName(Class<? extends Object> c)
-  {
-    if (c == null)
-    {
-      return null;
-    }
-
-    return c.getSimpleName();
-  }
-
-  public static String getSimpleClassName(String name)
-  {
-    if (name == null)
-    {
-      return null;
-    }
-
-    int lastDot = name.lastIndexOf('.');
-    if (lastDot != -1)
-    {
-      name = name.substring(lastDot + 1);
-    }
-
-    return name.replace('$', '.');
-  }
-
-  public static String getSimpleClassName(Object object)
-  {
-    if (object == null)
-    {
-      return null;
-    }
-
-    return getSimpleName(object.getClass());
-  }
-
-  public static String getLabel(Object object)
-  {
-    if (object == null)
-    {
-      return null;
-    }
-
-    return object.getClass().getSimpleName() + "@" + getID(object); //$NON-NLS-1$
-  }
-
-  public static void dump(Object object)
-  {
-    dump(object, ""); //$NON-NLS-1$
-  }
-
-  public static void dump(Object object, String prefix)
-  {
-    dump(object, prefix, IOUtil.OUT());
-  }
-
-  public static void dump(Object object, String prefix, PrintStream out)
-  {
-    out.print(toString(object, prefix));
-  }
-
-  @SuppressWarnings("unchecked")
-  public static Pair<Field, Object>[] dumpToArray(Object object)
-  {
-    List<Field> fields = new ArrayList<Field>();
-    collectFields(object.getClass(), fields);
-    Pair<Field, Object>[] result = new Pair[fields.size()];
-    int i = 0;
-    for (Field field : fields)
-    {
-      Object value = getValue(field, object);
-      result[i++] = new Pair<Field, Object>(field, value);
-    }
-
-    return result;
-  }
-
-  public static Object instantiate(Map<Object, Object> properties, String namespace, String classKey,
-      ClassLoader classLoader) throws ClassNotFoundException, InstantiationException, IllegalAccessException,
-      IllegalArgumentException, InvocationTargetException
-  {
-    if (namespace != null)
-    {
-      if (namespace.length() == 0)
-      {
-        namespace = null;
-      }
-      else if (!namespace.endsWith(NAMESPACE_SEPARATOR))
-      {
-        namespace += NAMESPACE_SEPARATOR;
-      }
-    }
-
-    String className = null;
-    Map<String, Object> values = new HashMap<String, Object>();
-    for (Entry<Object, Object> entry : properties.entrySet())
-    {
-      if (entry.getKey() instanceof String)
-      {
-        String key = (String)entry.getKey();
-        if (namespace != null)
-        {
-          if (key.startsWith(namespace))
-          {
-            key = key.substring(namespace.length());
-          }
-          else
-          {
-            continue;
-          }
-        }
-
-        if (classKey.equals(key))
-        {
-          Object classValue = entry.getValue();
-          if (classValue instanceof String)
-          {
-            className = (String)classValue;
-          }
-          else
-          {
-            OM.LOG.warn("Value of classKey " + classKey + " is not a String");
-          }
-        }
-        else
-        {
-          values.put(key, entry.getValue());
-        }
-      }
-    }
-
-    if (className == null)
-    {
-      throw new IllegalArgumentException("Properties do not contain a valid class name for key " + classKey);
-    }
-
-    Class<?> c = classLoader.loadClass(className);
-    Object instance = c.newInstance();
-    Method[] methods = c.getMethods();
-    for (Method method : methods)
-    {
-      if (isSetter(method))
-      {
-        String name = StringUtil.uncap(method.getName().substring(3));
-        Object value = values.get(name);
-        if (value != null)
-        {
-          Class<?> type = method.getParameterTypes()[0];
-          if (!type.isAssignableFrom(value.getClass()))
-          {
-            if (value instanceof String)
-            {
-              String str = (String)value;
-              value = null;
-              if (type.isAssignableFrom(Boolean.class))
-              {
-                value = Boolean.parseBoolean(str);
-              }
-              else if (type.isAssignableFrom(Byte.class))
-              {
-                value = Byte.parseByte(str);
-              }
-              else if (type.isAssignableFrom(Short.class))
-              {
-                value = Short.parseShort(str);
-              }
-              else if (type.isAssignableFrom(Integer.class))
-              {
-                value = Integer.parseInt(str);
-              }
-              else if (type.isAssignableFrom(Long.class))
-              {
-                value = Long.parseLong(str);
-              }
-              else if (type.isAssignableFrom(Float.class))
-              {
-                value = Float.parseFloat(str);
-              }
-              else if (type.isAssignableFrom(Double.class))
-              {
-                value = Double.parseDouble(str);
-              }
-            }
-            else
-            {
-              value = null;
-            }
-          }
-
-          if (value == null)
-          {
-            throw new IllegalArgumentException("Value of property " + name + " can not be assigned to type "
-                + type.getName());
-          }
-
-          method.invoke(instance, value);
-        }
-      }
-    }
-
-    return instance;
-  }
-
-  public static boolean isSetter(Method method)
-  {
-    return method.getParameterTypes().length == 1 && isSetterName(method.getName());
-  }
-
-  public static boolean isSetterName(String name)
-  {
-    return name.startsWith("set") && name.length() > 3 && Character.isUpperCase(name.charAt(3));
-  }
-
-  public static String toString(Object object)
-  {
-    return toString(object, " "); //$NON-NLS-1$
-  }
-
-  public static String toString(Object object, String prefix)
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append(prefix);
-    builder.append(getLabel(object));
-    builder.append(StringUtil.NL);
-    toString(object.getClass(), object, prefix, builder);
-    return builder.toString();
-  }
-
-  private static void toString(Class<? extends Object> segment, Object object, String prefix, StringBuilder builder)
-  {
-    if (segment == ROOT_CLASS || segment == Lifecycle.class)
-    {
-      return;
-    }
-
-    // Recurse
-    toString(segment.getSuperclass(), object, prefix, builder);
-
-    String segmentPrefix = segment == object.getClass() ? "" : getSimpleName(segment) + NAMESPACE_SEPARATOR; //$NON-NLS-1$ 
-    Field[] fields = segment.getDeclaredFields();
-    for (Field field : fields)
-    {
-      if (field.isSynthetic())
-      {
-        continue;
-      }
-
-      if ((field.getModifiers() & Modifier.STATIC) != 0 && !DUMP_STATICS)
-      {
-        continue;
-      }
-
-      if (field.getAnnotation(ExcludeFromDump.class) != null)
-      {
-        continue;
-      }
-
-      builder.append(prefix);
-      builder.append(segmentPrefix);
-      builder.append(field.getName());
-      builder.append(" = "); //$NON-NLS-1$
-
-      Object value = getValue(field, object);
-      if (value instanceof Map)
-      {
-        value = ((Map<?, ?>)value).entrySet();
-      }
-
-      if (value instanceof Collection)
-      {
-        builder.append(StringUtil.NL);
-        for (Object element : (Collection<?>)value)
-        {
-          builder.append("    ");
-          builder.append(element);
-          builder.append(StringUtil.NL);
-        }
-      }
-      else
-      {
-        builder.append(value);
-        builder.append(StringUtil.NL);
-      }
-    }
-  }
-
-  private static Method lookupHashCodeMethod()
-  {
-    Method method;
-
-    try
-    {
-      method = ROOT_CLASS.getMethod("hashCode", NO_PARAMETERS); //$NON-NLS-1$
-    }
-    catch (Exception ex)
-    {
-      // This can really not happen
-      throw new AssertionError();
-    }
-
-    if (!method.isAccessible())
-    {
-      method.setAccessible(true);
-    }
-
-    return method;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  @Retention(RetentionPolicy.RUNTIME)
-  @Target(ElementType.FIELD)
-  public @interface ExcludeFromDump
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java
deleted file mode 100644
index 1faa1c8eed..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util;
-
-/**
- * @author Eike Stepper
- */
-public final class StringUtil
-{
-  public static final String EMPTY = "";
-
-  public static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$
-
-  private StringUtil()
-  {
-  }
-
-  public static String replace(String text, String[] find, String[] replace)
-  {
-    for (int i = 0; i < find.length; i++)
-    {
-      int end = 0;
-      for (;;)
-      {
-        int start = text.indexOf(find[i], end);
-        if (start == -1)
-        {
-          break;
-        }
-
-        end = start + find[i].length();
-        text = text.substring(0, start) + replace[i] + text.substring(end);
-      }
-    }
-
-    return text;
-  }
-
-  public static String safe(String str)
-  {
-    if (str == null)
-    {
-      return EMPTY;
-    }
-
-    return str;
-  }
-
-  public static int compare(String s1, String s2)
-  {
-    if (s1 == null)
-    {
-      return s2 == null ? 0 : -1;
-    }
-
-    if (s2 == null)
-    {
-      return 1;
-    }
-
-    return s1.compareTo(s2);
-  }
-
-  public static String cap(String str)
-  {
-    if (str == null || str.length() == 0)
-    {
-      return str;
-    }
-
-    char first = str.charAt(0);
-    if (Character.isUpperCase(first))
-    {
-      return str;
-    }
-
-    if (str.length() == 1)
-    {
-      return str.toUpperCase();
-    }
-
-    StringBuilder builder = new StringBuilder(str);
-    builder.setCharAt(0, Character.toUpperCase(first));
-    return builder.toString();
-  }
-
-  public static String uncap(String str)
-  {
-    if (str == null || str.length() == 0)
-    {
-      return str;
-    }
-
-    char first = str.charAt(0);
-    if (Character.isLowerCase(first))
-    {
-      return str;
-    }
-
-    if (str.length() == 1)
-    {
-      return str.toLowerCase();
-    }
-
-    StringBuilder builder = new StringBuilder(str);
-    builder.setCharAt(0, Character.toLowerCase(first));
-    return builder.toString();
-  }
-
-  public static int occurrences(String str, char c)
-  {
-    int count = 0;
-    for (int i = 0; (i = str.indexOf(c, i)) != -1; ++i)
-    {
-      ++count;
-    }
-
-    return count;
-  }
-
-  public static int occurrences(String str, String c)
-  {
-    int count = 0;
-    for (int i = 0; (i = str.indexOf(c, i)) != -1; i += c.length())
-    {
-      ++count;
-    }
-
-    return count;
-  }
-
-  public static boolean isEmpty(String str)
-  {
-    return str == null || str.length() == 0;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java
deleted file mode 100644
index e847ef302b..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util;
-
-/**
- * TODO Handle IORuntimeException
- * 
- * @author Eike Stepper
- */
-public class WrappedException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  private WrappedException(Exception exception)
-  {
-    super(exception);
-  }
-
-  public Exception exception()
-  {
-    return (Exception)getCause();
-  }
-
-  public static RuntimeException wrap(Exception exception)
-  {
-    if (exception instanceof RuntimeException)
-    {
-      return (RuntimeException)exception;
-    }
-
-    return new WrappedException(exception);
-  }
-
-  public static Exception unwrap(Exception exception)
-  {
-    if (exception instanceof WrappedException)
-    {
-      return ((WrappedException)exception).exception();
-    }
-
-    return exception;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICache.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICache.java
deleted file mode 100644
index 185ab61b94..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICache.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.cache;
-
-/**
- * @author Eike Stepper
- */
-public interface ICache
-{
-  public ICacheMonitor getCacheMonitor();
-
-  /**
-   * Instructs this cache to evict <b>elementCount</b> elements.
-   */
-  public void evictElements(int elementCount);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitor.java
deleted file mode 100644
index 5c1d77b167..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.cache;
-
-import org.eclipse.net4j.util.event.INotifier;
-
-/**
- * @author Eike Stepper
- */
-public interface ICacheMonitor extends INotifier
-{
-  public ConditionPolicy getConditionPolicy();
-
-  public Condition getCondition();
-
-  public ICacheProbe registerCache(ICache cache);
-
-  public void deregisterCache(ICache cache);
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum Condition
-  {
-    /**
-     * Condition <b>GREEN</b> indicates that the system is operating normally and enough free memory is available so
-     * that caches are free to cache additional elements.
-     */
-    GREEN,
-
-    /**
-     * Condition <b>YELLOW</b> indicates that the system is operating normally but free memory is about to go low so
-     * that caches should stop to cache additional elements.
-     */
-    YELLOW,
-
-    /**
-     * Condition <b>RED</b> indicates that the system state is critical and free memory is almost exhausted so that
-     * caches must immediately stop to cache additional elements. Depending of the eviction strategy element eviction is
-     * ordered.
-     */
-    RED;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface ConditionPolicy
-  {
-    public Condition getNewCondition(Condition oldCondition);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitorEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitorEvent.java
deleted file mode 100644
index e3227bc5a6..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitorEvent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.cache;
-
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Eike Stepper
- */
-public interface ICacheMonitorEvent extends IEvent
-{
-  public ICacheMonitor getCacheMonitor();
-
-  public ICacheMonitor.Condition getOldCondition();
-
-  public ICacheMonitor.Condition getNewCondition();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheProbe.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheProbe.java
deleted file mode 100644
index db50f7b4a0..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheProbe.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.cache;
-
-/**
- * @author Eike Stepper
- */
-public interface ICacheProbe
-{
-  public boolean isDisposed();
-
-  public void elementCached(int elementSize);
-
-  public void elementEvicted(int elementSize);
-
-  public void elementReconstructed(long reconstructionTime);
-
-  public int getElementCount();
-
-  public long getCacheSize();
-
-  public long getAverageElementSize();
-
-  public long getReconstructionCost();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheRegistration.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheRegistration.java
deleted file mode 100644
index 980bf90b43..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheRegistration.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.cache;
-
-/**
- * @author Eike Stepper
- */
-public interface ICacheRegistration extends ICacheProbe
-{
-  public ICacheMonitor getCacheMonitor();
-
-  public ICache getCache();
-
-  public void dispose();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/package.html
deleted file mode 100644
index 3c3ce0d71a..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-A generic caching and memory monitoring framework.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java
deleted file mode 100644
index 935cb12aca..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.collection;
-
-import org.eclipse.net4j.internal.util.collection.History;
-import org.eclipse.net4j.internal.util.collection.PreferenceHistory;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-
-/**
- * @author Eike Stepper
- */
-public final class HistoryUtil
-{
-  private HistoryUtil()
-  {
-  }
-
-  public static IHistory<String> createHistory()
-  {
-    return new History<String>();
-  }
-
-  public static IHistory<String> createPreferenceHistory(OMPreference<String[]> preference)
-  {
-    return new PreferenceHistory(preference);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistory.java
deleted file mode 100644
index d2776c66bb..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.collection;
-
-import org.eclipse.net4j.util.event.INotifier;
-
-/**
- * @author Eike Stepper
- */
-public interface IHistory<T> extends INotifier, Iterable<IHistoryElement<T>>
-{
-  public boolean isEmpty();
-
-  public int size();
-
-  public boolean clear();
-
-  public int indexOf(T data);
-
-  public boolean add(T data);
-
-  public IHistoryElement<T> remove(int index);
-
-  public IHistoryElement<T> get(int index);
-
-  public T getMostRecent();
-
-  public <D> D[] getData(D[] a);
-
-  public IHistoryElement<T>[] toArray();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryChangeEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryChangeEvent.java
deleted file mode 100644
index 8c462b03da..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryChangeEvent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.collection;
-
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Eike Stepper
- */
-public interface IHistoryChangeEvent extends IEvent
-{
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java
deleted file mode 100644
index 31823dc319..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.collection;
-
-/**
- * @author Eike Stepper
- */
-public interface IHistoryElement<T>
-{
-  public IHistory<IHistoryElement<T>> getHistory();
-
-  public T getData();
-
-  public String getText();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java
deleted file mode 100644
index cab706dedc..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.collection;
-
-import org.eclipse.net4j.util.ObjectUtil;
-
-import java.text.MessageFormat;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class MapEntry<K, V> implements Map.Entry<K, V>
-{
-  private K key;
-
-  private V value;
-
-  public MapEntry(K key, V value)
-  {
-    this.key = key;
-    this.value = value;
-  }
-
-  public MapEntry(Map.Entry<K, V> entry)
-  {
-    key = entry.getKey();
-    value = entry.getValue();
-  }
-
-  public K getKey()
-  {
-    return key;
-  }
-
-  public V getValue()
-  {
-    return value;
-  }
-
-  public V setValue(V value)
-  {
-    V oldValue = this.value;
-    this.value = value;
-    return oldValue;
-  }
-
-  @Override
-  public boolean equals(Object obj)
-  {
-    if (obj == this)
-    {
-      return true;
-    }
-
-    if (obj instanceof Map.Entry<?, ?>)
-    {
-      Map.Entry<?, ?> entry = (Map.Entry<?, ?>)obj;
-      return ObjectUtil.equals(key, entry.getKey()) && ObjectUtil.equals(value, entry.getValue());
-    }
-
-    return false;
-  }
-
-  @Override
-  public int hashCode()
-  {
-    return ObjectUtil.hashCode(key) ^ ObjectUtil.hashCode(value);
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("{0}={1}", key, value);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableList.java
deleted file mode 100644
index 35eed8012f..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.net4j.util.collection;
-
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public interface MoveableList<E> extends List<E>
-{
-  public E move(int targetIndex, int sourceIndex);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java
deleted file mode 100644
index 09f6405bd8..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java
+++ /dev/null
@@ -1,744 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.collection;
-
-import org.eclipse.net4j.util.ObjectUtil;
-
-import java.util.AbstractCollection;
-import java.util.AbstractSet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public abstract class MultiMap<K, V> implements Map<K, V>
-{
-  private transient Entries entries;
-
-  private transient Set<K> keys;
-
-  private transient Collection<V> values;
-
-  public MultiMap()
-  {
-  }
-
-  public abstract int getDelegateCount();
-
-  public Map<K, V> getDelegate(int index)
-  {
-    if (0 <= index && index < getDelegateCount())
-    {
-      return doGetDelegate(index);
-    }
-
-    return null;
-  }
-
-  /**
-   * @category WRITE
-   */
-  public void clear()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * @category WRITE
-   */
-  public V put(K key, V value)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * @category WRITE
-   */
-  public void putAll(Map<? extends K, ? extends V> t)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * @category WRITE
-   */
-  public V remove(Object key)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * @category READ
-   */
-  public boolean containsKey(Object key)
-  {
-    return containsKey(key, getDelegateCount());
-  }
-
-  /**
-   * @category READ
-   */
-  public boolean containsValue(Object value)
-  {
-    for (int i = 0; i < getDelegateCount(); i++)
-    {
-      Map<K, V> delegate = getDelegate(i);
-      if (delegate != null)
-      {
-        if (delegate.containsValue(value))
-        {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * @category READ
-   */
-  public V get(Object key)
-  {
-    for (int i = 0; i < getDelegateCount(); i++)
-    {
-      Map<K, V> delegate = getDelegate(i);
-      if (delegate != null)
-      {
-        if (delegate.containsKey(key))
-        {
-          return delegate.get(key);
-        }
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * @category READ
-   */
-  public int size()
-  {
-    int size = 0;
-    Map<K, V> delegate = getDelegate(0);
-    if (delegate != null)
-    {
-      size += delegate.size();
-      for (int i = 1; i < getDelegateCount(); i++)
-      {
-        delegate = getDelegate(i);
-        if (delegate != null)
-        {
-          Set<K> keySet = delegate.keySet();
-          for (K key : keySet)
-          {
-            if (!containsKey(key, i))
-            {
-              ++size;
-            }
-          }
-        }
-      }
-    }
-
-    return size;
-  }
-
-  /**
-   * @category READ
-   */
-  public boolean isEmpty()
-  {
-    for (int i = 0; i < getDelegateCount(); i++)
-    {
-      Map<K, V> delegate = getDelegate(i);
-      if (delegate != null)
-      {
-        if (!delegate.isEmpty())
-        {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
-  public synchronized Set<Map.Entry<K, V>> entrySet()
-  {
-    if (entries == null)
-    {
-      entries = new Entries();
-    }
-
-    return entries;
-  }
-
-  public synchronized Set<K> keySet()
-  {
-    if (keys == null)
-    {
-      keys = new Keys();
-    }
-
-    return keys;
-  }
-
-  public synchronized Collection<V> values()
-  {
-    if (values == null)
-    {
-      values = new Values();
-    }
-
-    return values;
-  }
-
-  protected boolean containsKey(Object key, int delegateCount)
-  {
-    for (int i = 0; i < delegateCount; i++)
-    {
-      Map<K, V> delegate = getDelegate(i);
-      if (delegate != null)
-      {
-        if (delegate.containsKey(key))
-        {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-
-  protected abstract Map<K, V> doGetDelegate(int index);
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class ListBased<K, V> extends MultiMap<K, V>
-  {
-    private List<Map<K, V>> delegates;
-
-    public ListBased()
-    {
-    }
-
-    public ListBased(List<Map<K, V>> delegates)
-    {
-      this.delegates = delegates;
-    }
-
-    public synchronized List<Map<K, V>> getDelegates()
-    {
-      if (delegates == null)
-      {
-        delegates = createDelegates();
-      }
-
-      return delegates;
-    }
-
-    public void setDelegates(List<Map<K, V>> delegates)
-    {
-      this.delegates = delegates;
-    }
-
-    @Override
-    public int getDelegateCount()
-    {
-      return getDelegates().size();
-    }
-
-    @Override
-    protected Map<K, V> doGetDelegate(int index)
-    {
-      return getDelegates().get(index);
-    }
-
-    protected List<Map<K, V>> createDelegates()
-    {
-      return new ArrayList<Map<K, V>>();
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class Entries extends AbstractSet<Entry<K, V>>
-  {
-    public Entries()
-    {
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean add(Entry<K, V> o)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean addAll(Collection<? extends Entry<K, V>> c)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public void clear()
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean remove(Object o)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean removeAll(Collection<?> c)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean retainAll(Collection<?> c)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category READ
-     */
-    @SuppressWarnings("unchecked")
-    public boolean contains(Object o)
-    {
-      if (o instanceof Map.Entry)
-      {
-        for (int i = 0; i < getDelegateCount(); i++)
-        {
-          Map<K, V> delegate = getDelegate(i);
-          if (delegate != null)
-          {
-            K key = ((Map.Entry<K, V>)o).getKey();
-            if (delegate.containsKey(key))
-            {
-              V value = ((Map.Entry<K, V>)o).getValue();
-              if (ObjectUtil.equals(delegate.get(key), value))
-              {
-                return true;
-              }
-            }
-          }
-        }
-      }
-
-      return false;
-    }
-
-    /**
-     * @category READ
-     */
-    public boolean isEmpty()
-    {
-      return MultiMap.this.isEmpty();
-    }
-
-    /**
-     * @category READ
-     */
-    public int size()
-    {
-      return MultiMap.this.size();
-    }
-
-    public Iterator<Entry<K, V>> iterator()
-    {
-      return new Iterator<Entry<K, V>>()
-      {
-        private Entry<K, V> next;
-
-        private int delegateIndex = -1;
-
-        private Iterator<Entry<K, V>> delegateIt;
-
-        /**
-         * @category WRITE
-         */
-        public void remove()
-        {
-          throw new UnsupportedOperationException();
-        }
-
-        /**
-         * @category READ
-         */
-        public boolean hasNext()
-        {
-          next = null;
-          while (next == null)
-          {
-            if (delegateIt == null)
-            {
-              Map<K, V> delegate = getDelegate(++delegateIndex);
-              if (delegate == null)
-              {
-                // All delegates have been iterated
-                break;
-              }
-
-              delegateIt = delegate.entrySet().iterator();
-            }
-
-            if (delegateIt.hasNext())
-            {
-              next = delegateIt.next();
-
-              // Check if this key has been returned previously
-              if (containsKey(next.getKey(), delegateIndex))
-              {
-                next = null;
-              }
-            }
-            else
-            {
-              // Determine next delegate iterator in next loop
-              delegateIt = null;
-            }
-          }
-
-          return next != null;
-        }
-
-        /**
-         * @category READ
-         */
-        public Map.Entry<K, V> next()
-        {
-          if (next == null)
-          {
-            throw new NoSuchElementException();
-          }
-
-          try
-          {
-            return next;
-          }
-          finally
-          {
-            next = null;
-          }
-        }
-      };
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class Keys extends AbstractSet<K>
-  {
-    public Keys()
-    {
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean add(K o)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean addAll(Collection<? extends K> c)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public void clear()
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean remove(Object o)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean removeAll(Collection<?> c)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean retainAll(Collection<?> c)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category READ
-     */
-    public boolean contains(Object o)
-    {
-      return MultiMap.this.containsKey(o);
-    }
-
-    /**
-     * @category READ
-     */
-    public boolean isEmpty()
-    {
-      return MultiMap.this.isEmpty();
-    }
-
-    /**
-     * @category READ
-     */
-    public int size()
-    {
-      return MultiMap.this.size();
-    }
-
-    /**
-     * @category READ
-     */
-    public Iterator<K> iterator()
-    {
-      return new Iterator<K>()
-      {
-        private K next;
-
-        private int delegateIndex = -1;
-
-        private Iterator<K> delegateIt;
-
-        /**
-         * @category WRITE
-         */
-        public void remove()
-        {
-          throw new UnsupportedOperationException();
-        }
-
-        /**
-         * @category READ
-         */
-        public boolean hasNext()
-        {
-          next = null;
-          while (next == null)
-          {
-            if (delegateIt == null)
-            {
-              Map<K, V> delegate = getDelegate(++delegateIndex);
-              if (delegate == null)
-              {
-                // All delegates have been iterated
-                break;
-              }
-
-              delegateIt = delegate.keySet().iterator();
-            }
-
-            if (delegateIt.hasNext())
-            {
-              next = delegateIt.next();
-
-              // Check if this key has been returned previously
-              if (containsKey(next, delegateIndex))
-              {
-                next = null;
-              }
-            }
-            else
-            {
-              // Determine next delegate iterator in next loop
-              delegateIt = null;
-            }
-          }
-
-          return next != null;
-        }
-
-        /**
-         * @category READ
-         */
-        public K next()
-        {
-          if (next == null)
-          {
-            throw new NoSuchElementException();
-          }
-
-          try
-          {
-            return next;
-          }
-          finally
-          {
-            next = null;
-          }
-        }
-      };
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class Values extends AbstractCollection<V>
-  {
-    public Values()
-    {
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean add(V o)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean addAll(Collection<? extends V> c)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public void clear()
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean remove(Object o)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean removeAll(Collection<?> c)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category WRITE
-     */
-    public boolean retainAll(Collection<?> c)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @category READ
-     */
-    public boolean contains(Object o)
-    {
-      return MultiMap.this.containsValue(o);
-    }
-
-    /**
-     * @category READ
-     */
-    public boolean isEmpty()
-    {
-      return MultiMap.this.isEmpty();
-    }
-
-    /**
-     * @category READ
-     */
-    public int size()
-    {
-      return MultiMap.this.size();
-    }
-
-    /**
-     * @category READ
-     */
-    public Iterator<V> iterator()
-    {
-      return new Iterator<V>()
-      {
-        private Iterator<Entry<K, V>> delegateIt = entrySet().iterator();
-
-        /**
-         * @category WRITE
-         */
-        public void remove()
-        {
-          throw new UnsupportedOperationException();
-        }
-
-        /**
-         * @category READ
-         */
-        public boolean hasNext()
-        {
-          return delegateIt.hasNext();
-        }
-
-        /**
-         * @category READ
-         */
-        public V next()
-        {
-          return delegateIt.next().getValue();
-        }
-      };
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java
deleted file mode 100644
index 6e98fd9ff2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.collection;
-
-/**
- * @author Eike Stepper
- */
-public class Pair<T1, T2>
-{
-  private T1 element1;
-
-  private T2 element2;
-
-  public Pair()
-  {
-  }
-
-  public Pair(T1 element1, T2 element2)
-  {
-    this.element1 = element1;
-    this.element2 = element2;
-  }
-
-  public final T1 getElement1()
-  {
-    return element1;
-  }
-
-  public void setElement1(T1 element1)
-  {
-    this.element1 = element1;
-  }
-
-  public final T2 getElement2()
-  {
-    return element2;
-  }
-
-  public void setElement2(T2 element2)
-  {
-    this.element2 = element2;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package.html
deleted file mode 100644
index d17670b185..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Additional collection-like interfaces and classes.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.java
deleted file mode 100644
index 561f5353dc..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.concurrent;
-
-import org.eclipse.net4j.util.WrappedException;
-
-/**
- * @author Eike Stepper
- */
-public final class ConcurrencyUtil
-{
-  private ConcurrencyUtil()
-  {
-  }
-
-  public static void sleep(long millis)
-  {
-    try
-    {
-      Thread.sleep(millis);
-    }
-    catch (InterruptedException ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  public static void sleep(long millis, int nanos)
-  {
-    try
-    {
-      Thread.sleep(millis, nanos);
-    }
-    catch (InterruptedException ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ICorrelator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ICorrelator.java
deleted file mode 100644
index 1842603388..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ICorrelator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.concurrent;
-
-/**
- * @author Eike Stepper
- */
-public interface ICorrelator<CORRELATION, VALUE>
-{
-  public boolean isCorrelated(CORRELATION correlation);
-
-  public VALUE correlate(CORRELATION correlation);
-
-  public VALUE correlateUnique(CORRELATION correlation);
-
-  public VALUE uncorrelate(CORRELATION correlation);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java
deleted file mode 100644
index 14da7b0a93..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.concurrent;
-
-/**
- * Synchronizes a producer and a consumer thread letting the producer pass a value to the consumer. Both producer and
- * consumer must have access to this {@link ISynchronizer} and there must only ever exist one consumer for it. Once the
- * result value is consumed by the consumer this {@link ISynchronizer} must not be reused.
- * <p>
- * 
- * @author Eike Stepper
- */
-public interface ISynchronizer<RESULT>
-{
-  public RESULT get(long timeout);
-
-  public void put(RESULT result);
-
-  public boolean put(RESULT result, long timeout);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java
deleted file mode 100644
index 7e09eb5253..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.concurrent;
-
-/**
- * @author Eike Stepper
- */
-public interface IWorkSerializer
-{
-  public boolean addWork(Runnable work);
-
-  public void dispose();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.java
deleted file mode 100644
index 27237ddeb4..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.concurrent;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author Eike Stepper
- */
-public final class NonBlockingIntCounter
-{
-  private AtomicInteger value;
-
-  public NonBlockingIntCounter()
-  {
-    this(0);
-  }
-
-  public NonBlockingIntCounter(int initialValue)
-  {
-    value = new AtomicInteger(initialValue);
-  }
-
-  public int getValue()
-  {
-    return value.get();
-  }
-
-  public int increment()
-  {
-    int v;
-    do
-    {
-      v = value.get();
-    } while (!value.compareAndSet(v, v + 1));
-
-    return v + 1;
-  }
-
-  @Override
-  public String toString()
-  {
-    return Long.toString(getValue());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java
deleted file mode 100644
index 23a52ba2ec..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.concurrent;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * @author Eike Stepper
- */
-public final class NonBlockingLongCounter
-{
-  private AtomicLong value;
-
-  public NonBlockingLongCounter()
-  {
-    this(0L);
-  }
-
-  public NonBlockingLongCounter(long initialValue)
-  {
-    value = new AtomicLong(initialValue);
-  }
-
-  public long getValue()
-  {
-    return value.get();
-  }
-
-  public long increment()
-  {
-    long v;
-    do
-    {
-      v = value.get();
-    } while (!value.compareAndSet(v, v + 1));
-
-    return v + 1;
-  }
-
-  @Override
-  public String toString()
-  {
-    return Long.toString(getValue());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLock.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLock.java
deleted file mode 100644
index 26c4c12077..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLock.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.concurrent;
-
-import org.eclipse.net4j.util.WrappedException;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-/**
- * @author Eike Stepper
- */
-public class RWLock extends ReentrantReadWriteLock
-{
-  private static final long serialVersionUID = 1L;
-
-  private long timeoutMillis;
-
-  public RWLock(long timeoutMillis)
-  {
-    this.timeoutMillis = timeoutMillis;
-  }
-
-  public RWLock(long timeoutMillis, boolean fair)
-  {
-    super(fair);
-    this.timeoutMillis = timeoutMillis;
-  }
-
-  public <V> V read(Callable<V> callable)
-  {
-    return call(callable, readLock(), timeoutMillis);
-  }
-
-  public void read(Runnable runnable)
-  {
-    run(runnable, readLock(), timeoutMillis);
-  }
-
-  public <V> V write(Callable<V> callable)
-  {
-    return call(callable, writeLock(), timeoutMillis);
-  }
-
-  public void write(Runnable runnable)
-  {
-    run(runnable, writeLock(), timeoutMillis);
-  }
-
-  public static <V> V call(Callable<V> callable, Lock lock, long timeoutMillis)
-  {
-    try
-    {
-      boolean locked = lock.tryLock(timeoutMillis, TimeUnit.MILLISECONDS);
-      if (locked)
-      {
-        try
-        {
-          return callable.call();
-        }
-        finally
-        {
-          lock.unlock();
-        }
-      }
-
-      throw new TimeoutException("Acquisition of lock timed out after " + timeoutMillis + " millis");
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  public static void run(Runnable runnable, Lock lock, long timeoutMillis)
-  {
-    try
-    {
-      boolean locked = lock.tryLock(timeoutMillis, TimeUnit.MILLISECONDS);
-      if (locked)
-      {
-        try
-        {
-          runnable.run();
-        }
-        finally
-        {
-          lock.unlock();
-        }
-      }
-      else
-      {
-        throw new TimeoutException("Acquisition of lock timed out after " + timeoutMillis + " millis");
-      }
-    }
-    catch (InterruptedException ignore)
-    {
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Sleeper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Sleeper.java
deleted file mode 100644
index bc5da97c20..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Sleeper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.concurrent;
-
-/**
- * @author Eike Stepper
- */
-public class Sleeper
-{
-  private static final int DEFAULT_INTERVAL = 10;
-
-  private long start;
-
-  private int interval;
-
-  public Sleeper()
-  {
-    this(DEFAULT_INTERVAL);
-  }
-
-  public Sleeper(int interval)
-  {
-    this.interval = interval;
-    restart();
-  }
-
-  public int getInterval()
-  {
-    return interval;
-  }
-
-  public long getStart()
-  {
-    return start;
-  }
-
-  public void restart()
-  {
-    start = System.currentTimeMillis();
-  }
-
-  public void sleep(long millis)
-  {
-    while (System.currentTimeMillis() < start + millis)
-    {
-      ConcurrencyUtil.sleep(interval);
-    }
-  }
-
-  public void resleep(long millis)
-  {
-    restart();
-    sleep(millis);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.java
deleted file mode 100644
index 35879444a4..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.concurrent;
-
-/**
- * @author Eike Stepper
- */
-public class TimeoutRuntimeException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public TimeoutRuntimeException()
-  {
-  }
-
-  public TimeoutRuntimeException(String message)
-  {
-    super(message);
-  }
-
-  public TimeoutRuntimeException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public TimeoutRuntimeException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package.html
deleted file mode 100644
index bd695ca252..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Utility interfaces and classes commonly useful in concurrent programming.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
deleted file mode 100644
index 4064df9f96..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container;
-
-import org.eclipse.net4j.internal.util.container.ManagedContainer;
-import org.eclipse.net4j.util.event.IListener;
-
-/**
- * @author Eike Stepper
- */
-public final class ContainerUtil
-{
-  private static final Object[] NO_ELEMENTS = {};
-
-  private static final IContainer<Object> EMPTY = new IContainer<Object>()
-  {
-    public Object[] getElements()
-    {
-      return NO_ELEMENTS;
-    }
-
-    public boolean isEmpty()
-    {
-      return true;
-    }
-
-    public void addListener(IListener listener)
-    {
-    }
-
-    public void removeListener(IListener listener)
-    {
-    }
-
-    @Override
-    public String toString()
-    {
-      return "EMPTY_CONTAINER";
-    }
-  };
-
-  private ContainerUtil()
-  {
-  }
-
-  public static IContainer<Object> emptyContainer()
-  {
-    return EMPTY;
-  }
-
-  public static IManagedContainer createContainer()
-  {
-    return new ManagedContainer();
-  }
-
-  public static boolean isEmpty(Object container)
-  {
-    if (container instanceof IContainer)
-    {
-      return ((IContainer<?>)container).isEmpty();
-    }
-
-    return true;
-  }
-
-  public static Object[] getElements(Object container)
-  {
-    if (container instanceof IContainer)
-    {
-      return ((IContainer<?>)container).getElements();
-    }
-
-    return NO_ELEMENTS;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java
deleted file mode 100644
index 1b2300dcbf..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container;
-
-/**
- * @author Eike Stepper
- */
-public class FactoryNotFoundException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public FactoryNotFoundException()
-  {
-  }
-
-  public FactoryNotFoundException(String message)
-  {
-    super(message);
-  }
-
-  public FactoryNotFoundException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public FactoryNotFoundException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainer.java
deleted file mode 100644
index ea05f57f72..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container;
-
-import org.eclipse.net4j.util.event.INotifier;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainer<E> extends INotifier
-{
-  public boolean isEmpty();
-
-  public E[] getElements();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java
deleted file mode 100644
index da2145647e..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerDelta<E>
-{
-  public E getElement();
-
-  public Kind getKind();
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum Kind
-  {
-    ADDED, REMOVED
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java
deleted file mode 100644
index 70971cae02..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container;
-
-import org.eclipse.net4j.util.container.IContainerDelta.Kind;
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerEvent<E> extends IEvent
-{
-  public IContainer<E> getContainer();
-
-  public boolean isEmpty();
-
-  public IContainerDelta<E>[] getDeltas();
-
-  public IContainerDelta<E> getDelta() throws IllegalStateException;
-
-  public E getDeltaElement() throws IllegalStateException;
-
-  public Kind getDeltaKind() throws IllegalStateException;
-
-  public void accept(IContainerEventVisitor<E> visitor);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java
deleted file mode 100644
index c87a0654ec..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerEventVisitor<E>
-{
-  public void added(E element);
-
-  public void removed(E element);
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface Filtered<E> extends IContainerEventVisitor<E>
-  {
-    public boolean filter(E element);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java
deleted file mode 100644
index 52ecb03b78..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container;
-
-/**
- * @author Eike Stepper
- */
-public interface IElementProcessor
-{
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
deleted file mode 100644
index 343d6d1b64..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container;
-
-import org.eclipse.net4j.util.factory.IFactory;
-import org.eclipse.net4j.util.factory.IFactoryKey;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public interface IManagedContainer extends IContainer<Object>
-{
-  public IRegistry<IFactoryKey, IFactory> getFactoryRegistry();
-
-  public IManagedContainer registerFactory(IFactory factory);
-
-  public List<IElementProcessor> getPostProcessors();
-
-  public void addPostProcessor(IElementProcessor postProcessor, boolean processExistingElements);
-
-  public void addPostProcessor(IElementProcessor postProcessor);
-
-  public void removePostProcessor(IElementProcessor postProcessor);
-
-  public Set<String> getProductGroups();
-
-  public Set<String> getFactoryTypes(String productGroup);
-
-  public IFactory getFactory(String productGroup, String factoryType);
-
-  public Object putElement(String productGroup, String factoryType, String description, Object element);
-
-  public String[] getElementKey(Object element);
-
-  public Object[] getElements(String productGroup);
-
-  public Object[] getElements(String productGroup, String factoryType);
-
-  public Object getElement(String productGroup, String factoryType, String description);
-
-  public Object removeElement(String productGroup, String factoryType, String description);
-
-  public void clearElements();
-
-  public void loadElements(InputStream stream) throws IOException;
-
-  public void saveElements(OutputStream stream) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java
deleted file mode 100644
index 444ed5185e..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container;
-
-import org.eclipse.net4j.internal.util.container.PluginContainer;
-
-/**
- * @author Eike Stepper
- */
-public interface IPluginContainer extends IManagedContainer
-{
-  public static final IPluginContainer INSTANCE = PluginContainer.getInstance();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java
deleted file mode 100644
index cbb971adce..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container.delegate;
-
-import java.util.concurrent.BlockingQueue;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerBlockingQueue<E> extends IContainerQueue<E>, BlockingQueue<E>
-{
-  public BlockingQueue<E> getDelegate();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java
deleted file mode 100644
index 8edaac2503..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container.delegate;
-
-import org.eclipse.net4j.util.container.IContainer;
-
-import java.util.Collection;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerCollection<E> extends IContainer<E>, Collection<E>
-{
-  public Collection<E> getDelegate();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerList.java
deleted file mode 100644
index 112ae7860d..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerList.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container.delegate;
-
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerList<E> extends IContainerCollection<E>, List<E>
-{
-  public List<E> getDelegate();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java
deleted file mode 100644
index 8c79d3f520..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container.delegate;
-
-import org.eclipse.net4j.util.container.IContainer;
-
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerMap<K, V> extends IContainer<Map.Entry<K, V>>, Map<K, V>
-{
-  public Map<K, V> getDelegate();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java
deleted file mode 100644
index df38858104..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container.delegate;
-
-import java.util.Queue;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerQueue<E> extends IContainerCollection<E>, Queue<E>
-{
-  public Queue<E> getDelegate();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java
deleted file mode 100644
index 1794fbeb23..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container.delegate;
-
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerSet<E> extends IContainerCollection<E>, Set<E>
-{
-  public Set<E> getDelegate();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java
deleted file mode 100644
index ef1a696269..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.container.delegate;
-
-import java.util.SortedSet;
-
-/**
- * @author Eike Stepper
- */
-public interface IContainerSortedSet<E> extends IContainerSet<E>, SortedSet<E>
-{
-  public SortedSet<E> getDelegate();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/package.html
deleted file mode 100644
index 2bcc5686a3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Hybrid interfaces of notifying containers and the Java Collection Framework.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/package.html
deleted file mode 100644
index 4495924079..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-A framework of notifying collections and wiring containers.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/EventUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/EventUtil.java
deleted file mode 100644
index b90d99bbce..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/EventUtil.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.event;
-
-/**
- * @author Eike Stepper
- */
-public final class EventUtil
-{
-  private static final IListener[] NO_LISTENERS = new IListener[0];
-
-  private EventUtil()
-  {
-  }
-
-  public static boolean addListener(Object notifier, IListener listener)
-  {
-    if (notifier instanceof INotifier)
-    {
-      ((INotifier)notifier).addListener(listener);
-      return true;
-    }
-
-    return false;
-  }
-
-  public static boolean removeListener(Object notifier, IListener listener)
-  {
-    if (notifier instanceof INotifier)
-    {
-      ((INotifier)notifier).removeListener(listener);
-      return true;
-    }
-
-    return false;
-  }
-
-  public static IListener[] getListeners(Object notifier)
-  {
-    if (notifier instanceof INotifier.Introspection)
-    {
-      return ((INotifier.Introspection)notifier).getListeners();
-    }
-
-    return NO_LISTENERS;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java
deleted file mode 100644
index aa0921bffa..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.event;
-
-/**
- * @author Eike Stepper
- */
-public interface IEvent
-{
-  public INotifier getSource();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java
deleted file mode 100644
index dce34eaac3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.event;
-
-import java.util.EventListener;
-
-/**
- * @author Eike Stepper
- */
-public interface IListener extends EventListener
-{
-  public void notifyEvent(IEvent event);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java
deleted file mode 100644
index 39f3701934..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.event;
-
-/**
- * @author Eike Stepper
- */
-public interface INotifier
-{
-  public void addListener(IListener listener);
-
-  public void removeListener(IListener listener);
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface Introspection extends INotifier
-  {
-    public boolean hasListeners();
-
-    public IListener[] getListeners();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/package.html
deleted file mode 100644
index 2c5acc4d69..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-A framework for sending of and listening to events.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
deleted file mode 100644
index 9f81f03bc2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.factory;
-
-/**
- * @author Eike Stepper
- */
-public interface IFactory
-{
-  public IFactoryKey getKey();
-
-  public Object create(String description) throws ProductCreationException;
-
-  public String getDescriptionFor(Object product);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java
deleted file mode 100644
index e246b14eec..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.factory;
-
-/**
- * @author Eike Stepper
- */
-public interface IFactoryKey
-{
-  public String getProductGroup();
-
-  public String getType();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java
deleted file mode 100644
index a18090c457..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.factory;
-
-/**
- * @author Eike Stepper
- */
-public class ProductCreationException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public ProductCreationException()
-  {
-  }
-
-  public ProductCreationException(String message)
-  {
-    super(message);
-  }
-
-  public ProductCreationException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public ProductCreationException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/package.html
deleted file mode 100644
index fcd135183d..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-A framework for factory based instance creation.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
deleted file mode 100644
index fa543c02f0..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.fsm;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.INotifier;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends Enum<?>, SUBJECT> extends Lifecycle
-{
-  @SuppressWarnings("unchecked")
-  public static final ITransition IGNORE = new IgnoreTransition();
-
-  @SuppressWarnings("unchecked")
-  public static final ITransition FAIL = new FailTransition();
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, FiniteStateMachine.class);
-
-  private static final String MSG_PROCESS = "Processing event {0} in state {1} for {2} (data={3})";
-
-  private static final String MSG_IGNORE = "Ignoring event {0} in state {1} for {2} (data={3})";
-
-  private static final String MSG_FAIL = "Failing event {0} in state {1} for {2} (data={3})";
-
-  private STATE[] states;
-
-  private EVENT[] events;
-
-  private ITransition<STATE, EVENT, SUBJECT, ?>[][] transitions;
-
-  @SuppressWarnings("unchecked")
-  public FiniteStateMachine(Class<STATE> stateEnum, Class<EVENT> eventEnum,
-      ITransition<STATE, EVENT, SUBJECT, ?> defaultTransition)
-  {
-    states = stateEnum.getEnumConstants();
-    events = eventEnum.getEnumConstants();
-    transitions = new ITransition[states.length][events.length];
-    initAll(defaultTransition);
-  }
-
-  @SuppressWarnings("unchecked")
-  public FiniteStateMachine(Class<STATE> stateEnum, Class<EVENT> eventEnum)
-  {
-    this(stateEnum, eventEnum, FAIL);
-  }
-
-  public final STATE[] getStates()
-  {
-    return states;
-  }
-
-  public final EVENT[] getEvents()
-  {
-    return events;
-  }
-
-  public final ITransition<STATE, EVENT, SUBJECT, ?> getTransition(STATE state, EVENT event)
-  {
-    int s = state.ordinal();
-    int e = event.ordinal();
-    return transitions[s][e];
-  }
-
-  public final void init(STATE state, EVENT event, STATE targetState)
-  {
-    init(state, event, new ChangeStateTransition(targetState));
-  }
-
-  public final void init(STATE state, EVENT event, ITransition<STATE, EVENT, SUBJECT, ?> transition)
-  {
-    checkTransition(transition);
-    int s = state.ordinal();
-    int e = event.ordinal();
-    transitions[s][e] = transition;
-  }
-
-  public final void initEvents(STATE state, STATE targetState)
-  {
-    initEvents(state, new ChangeStateTransition(targetState));
-  }
-
-  public final void initEvents(STATE state, ITransition<STATE, EVENT, SUBJECT, ?> transition)
-  {
-    checkTransition(transition);
-    int s = state.ordinal();
-    for (int e = 0; e < events.length; e++)
-    {
-      transitions[s][e] = transition;
-    }
-  }
-
-  public final void initStates(EVENT event, STATE targetState)
-  {
-    initStates(event, new ChangeStateTransition(targetState));
-  }
-
-  public final void initStates(EVENT event, ITransition<STATE, EVENT, SUBJECT, ?> transition)
-  {
-    checkTransition(transition);
-    int e = event.ordinal();
-    for (int s = 0; s < states.length; s++)
-    {
-      transitions[s][e] = transition;
-    }
-  }
-
-  public final void initAll(STATE targetState)
-  {
-    initAll(new ChangeStateTransition(targetState));
-  }
-
-  public final void initAll(ITransition<STATE, EVENT, SUBJECT, ?> transition)
-  {
-    checkTransition(transition);
-    for (int s = 0; s < states.length; s++)
-    {
-      for (int e = 0; e < events.length; e++)
-      {
-        transitions[s][e] = transition;
-      }
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public final <DATA> void process(SUBJECT subject, EVENT event, DATA data)
-  {
-    STATE state = getState(subject);
-    int s = state.ordinal();
-    int e = event.ordinal();
-    ITransition<STATE, EVENT, SUBJECT, DATA> transition = (ITransition<STATE, EVENT, SUBJECT, DATA>)transitions[s][e];
-    if (transition == IGNORE)
-    {
-      // Do nothing
-    }
-    else if (transition == FAIL)
-    {
-      throw new IllegalStateException(formatFailMessage(subject, state, event, data));
-    }
-    else
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace(formatProcessMessage(subject, state, event, data));
-      }
-
-      transition.execute(subject, state, event, data);
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  protected ITransition<STATE, EVENT, SUBJECT, ?> createIgnoreTransition(STATE state, EVENT event)
-  {
-    return IGNORE;
-  }
-
-  @SuppressWarnings("unchecked")
-  protected ITransition<STATE, EVENT, SUBJECT, ?> createFailTransition(STATE state, EVENT event)
-  {
-    return FAIL;
-  }
-
-  protected String formatProcessMessage(SUBJECT subject, STATE state, EVENT event, Object data)
-  {
-    return MessageFormat.format(MSG_PROCESS, event, state, subject, data);
-  }
-
-  protected String formatIgnoreMessage(SUBJECT subject, STATE state, EVENT event, Object data)
-  {
-    return MessageFormat.format(MSG_IGNORE, event, state, subject, data);
-  }
-
-  protected String formatFailMessage(SUBJECT subject, STATE state, EVENT event, Object data)
-  {
-    return MessageFormat.format(MSG_FAIL, event, state, subject, data);
-  }
-
-  protected abstract STATE getState(SUBJECT subject);
-
-  protected abstract void setState(SUBJECT subject, STATE state);
-
-  protected void changeState(SUBJECT subject, STATE state)
-  {
-    STATE oldState = getState(subject);
-    setState(subject, state);
-    if (oldState != state)
-    {
-      fireEvent(new StateChangedEvent(subject, oldState, state));
-    }
-  }
-
-  private void checkTransition(ITransition<STATE, EVENT, SUBJECT, ?> transition)
-  {
-    if (transition == null)
-    {
-      throw new IllegalArgumentException("transition == null");
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class IgnoreTransition implements ITransition<Enum<?>, Enum<?>, Object, Object>
-  {
-    public void execute(Object subject, Enum<?> state, Enum<?> event, Object data)
-    {
-      // Do nothing
-    }
-
-    @Override
-    public String toString()
-    {
-      return "IGNORE";
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class FailTransition implements ITransition<Enum<?>, Enum<?>, Object, Object>
-  {
-    public void execute(Object subject, Enum<?> state, Enum<?> event, Object data)
-    {
-      // Do nothing
-    }
-
-    @Override
-    public String toString()
-    {
-      return "FAIL";
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class ChangeStateTransition implements ITransition<STATE, EVENT, SUBJECT, Object>
-  {
-    private STATE targetState;
-
-    public ChangeStateTransition(STATE targetState)
-    {
-      this.targetState = targetState;
-    }
-
-    public STATE getTargetState()
-    {
-      return targetState;
-    }
-
-    public void execute(SUBJECT subject, STATE state, EVENT event, Object data)
-    {
-      changeState(subject, targetState);
-    }
-
-    @Override
-    public String toString()
-    {
-      return MessageFormat.format("CHANGE_STATE[{0}]", targetState);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public class StateChangedEvent implements IEvent
-  {
-    private Object subject;
-
-    private Enum<?> oldState;
-
-    private Enum<?> newState;
-
-    public StateChangedEvent(Object subject, Enum<?> oldState, Enum<?> newState)
-    {
-      this.subject = subject;
-      this.oldState = oldState;
-      this.newState = newState;
-    }
-
-    public INotifier getSource()
-    {
-      return FiniteStateMachine.this;
-    }
-
-    public Object getSubject()
-    {
-      return subject;
-    }
-
-    public Enum<?> getOldState()
-    {
-      return oldState;
-    }
-
-    public Enum<?> getNewState()
-    {
-      return newState;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
deleted file mode 100644
index 73cffb5d61..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.fsm;
-
-/**
- * @author Eike Stepper
- */
-public interface ITransition<STATE extends Enum<?>, EVENT extends Enum<?>, SUBJECT, DATA>
-{
-  public void execute(SUBJECT subject, STATE state, EVENT event, DATA data);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/package.html
deleted file mode 100644
index e0810a4ece..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-A framework for finite state machines.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java
deleted file mode 100644
index b366557ae3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public abstract class CachedFileMap<K extends Comparable<K>, V> extends SortedFileMap<K, V>
-{
-  private Map<K, V> cache = new HashMap<K, V>();
-
-  public CachedFileMap(File file, String mode)
-  {
-    super(file, mode);
-  }
-
-  @Override
-  public V get(K key)
-  {
-    V value = cache.get(key);
-    if (value == null)
-    {
-      value = super.get(key);
-      cache.put(key, value);
-    }
-
-    return value;
-  }
-
-  @Override
-  public V put(K key, V value)
-  {
-    cache.put(key, value);
-    return super.put(key, value);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CloseableIterator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CloseableIterator.java
deleted file mode 100644
index 24ed7f651b..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CloseableIterator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.Closeable;
-import java.util.Iterator;
-
-/**
- * @author Eike Stepper
- */
-public interface CloseableIterator<E> extends Iterator<E>, Closeable
-{
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java
deleted file mode 100644
index 2145d11e6f..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataInputExtender.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import org.eclipse.net4j.util.io.ExtendedIOUtil.ClassResolver;
-
-import java.io.DataInput;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class DataInputExtender implements ExtendedDataInput
-{
-  private DataInput input;
-
-  public DataInputExtender(DataInput input)
-  {
-    this.input = input;
-  }
-
-  public boolean readBoolean() throws IOException
-  {
-    return input.readBoolean();
-  }
-
-  public byte readByte() throws IOException
-  {
-    return input.readByte();
-  }
-
-  public char readChar() throws IOException
-  {
-    return input.readChar();
-  }
-
-  public double readDouble() throws IOException
-  {
-    return input.readDouble();
-  }
-
-  public float readFloat() throws IOException
-  {
-    return input.readFloat();
-  }
-
-  public void readFully(byte[] b, int off, int len) throws IOException
-  {
-    input.readFully(b, off, len);
-  }
-
-  public void readFully(byte[] b) throws IOException
-  {
-    input.readFully(b);
-  }
-
-  public int readInt() throws IOException
-  {
-    return input.readInt();
-  }
-
-  public String readLine() throws IOException
-  {
-    return input.readLine();
-  }
-
-  public long readLong() throws IOException
-  {
-    return input.readLong();
-  }
-
-  public short readShort() throws IOException
-  {
-    return input.readShort();
-  }
-
-  public int readUnsignedByte() throws IOException
-  {
-    return input.readUnsignedByte();
-  }
-
-  public int readUnsignedShort() throws IOException
-  {
-    return input.readUnsignedShort();
-  }
-
-  public String readUTF() throws IOException
-  {
-    return input.readUTF();
-  }
-
-  public byte[] readByteArray() throws IOException
-  {
-    return ExtendedIOUtil.readByteArray(input);
-  }
-
-  public Object readObject() throws IOException
-  {
-    return ExtendedIOUtil.readObject(input);
-  }
-
-  public Object readObject(ClassLoader classLoader) throws IOException
-  {
-    return ExtendedIOUtil.readObject(input, classLoader);
-  }
-
-  public Object readObject(ClassResolver classResolver) throws IOException
-  {
-    return ExtendedIOUtil.readObject(input, classResolver);
-  }
-
-  public String readString() throws IOException
-  {
-    return ExtendedIOUtil.readString(input);
-  }
-
-  public int skipBytes(int n) throws IOException
-  {
-    return input.skipBytes(n);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java
deleted file mode 100644
index c0696bc8e2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DataOutputExtender.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class DataOutputExtender implements ExtendedDataOutput
-{
-  private DataOutput output;
-
-  public DataOutputExtender(DataOutput output)
-  {
-    this.output = output;
-  }
-
-  public void write(byte[] b, int off, int len) throws IOException
-  {
-    output.write(b, off, len);
-  }
-
-  public void write(byte[] b) throws IOException
-  {
-    output.write(b);
-  }
-
-  public void write(int b) throws IOException
-  {
-    output.write(b);
-  }
-
-  public void writeBoolean(boolean v) throws IOException
-  {
-    output.writeBoolean(v);
-  }
-
-  public void writeByte(int v) throws IOException
-  {
-    output.writeByte(v);
-  }
-
-  public void writeBytes(String s) throws IOException
-  {
-    output.writeBytes(s);
-  }
-
-  public void writeChar(int v) throws IOException
-  {
-    output.writeChar(v);
-  }
-
-  public void writeChars(String s) throws IOException
-  {
-    output.writeChars(s);
-  }
-
-  public void writeDouble(double v) throws IOException
-  {
-    output.writeDouble(v);
-  }
-
-  public void writeFloat(float v) throws IOException
-  {
-    output.writeFloat(v);
-  }
-
-  public void writeInt(int v) throws IOException
-  {
-    output.writeInt(v);
-  }
-
-  public void writeLong(long v) throws IOException
-  {
-    output.writeLong(v);
-  }
-
-  public void writeShort(int v) throws IOException
-  {
-    output.writeShort(v);
-  }
-
-  public void writeUTF(String str) throws IOException
-  {
-    output.writeUTF(str);
-  }
-
-  public void writeByteArray(byte[] b) throws IOException
-  {
-    ExtendedIOUtil.writeByteArray(output, b);
-  }
-
-  public void writeObject(Object object) throws IOException
-  {
-    ExtendedIOUtil.writeObject(output, object);
-  }
-
-  public void writeString(String str) throws IOException
-  {
-    ExtendedIOUtil.writeString(output, str);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java
deleted file mode 100644
index 06a837a27b..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * A <code>DelegatingInputStream</code> contains some other input stream, which it uses as its basic source of data,
- * possibly transforming the data along the way or providing additional functionality. The class
- * <code>DelegatingInputStream</code> itself simply overrides all (see note below) methods of <code>InputStream</code>
- * with versions that pass all requests to the contained input stream. Subclasses of <code>DelegatingInputStream</code>
- * may further override some of these methods and may also provide additional methods and fields.
- * <p>
- * <b>Note:</b> The only difference to {@link java.io.FilterInputStream} is that <code>DelegatingInputStream</code>
- * does <b>not</b> override {@link #read(byte[])} or {@link #read(byte[], int, int)} but rather exposes the original
- * implementations of <code>InputStream</code> which call {@link #read()} instead of their delegate counterparts.
- * 
- * @author Eike Stepper
- */
-public class DelegatingInputStream extends InputStream
-{
-  /**
-   * The input stream to be filtered.
-   */
-  protected volatile InputStream in;
-
-  /**
-   * Creates a <code>DelegatingInputStream</code> by assigning the argument <code>in</code> to the field
-   * <code>this.in</code> so as to remember it for later use.
-   * 
-   * @param in
-   *          the underlying input stream, or <code>null</code> if this instance is to be created without an
-   *          underlying stream.
-   */
-  protected DelegatingInputStream(InputStream in)
-  {
-    this.in = in;
-  }
-
-  public InputStream getDelegate()
-  {
-    return in;
-  }
-
-  /**
-   * Reads the next byte of data from this input stream. The value byte is returned as an <code>int</code> in the
-   * range <code>0</code> to <code>255</code>. If no byte is available because the end of the stream has been
-   * reached, the value <code>-1</code> is returned. This method blocks until input data is available, the end of the
-   * stream is detected, or an exception is thrown.
-   * <p>
-   * This method simply performs <code>in.read()</code> and returns the result.
-   * 
-   * @return the next byte of data, or <code>-1</code> if the end of the stream is reached.
-   * @exception IOException
-   *              if an I/O error occurs.
-   * @see DelegatingInputStream#in
-   */
-  @Override
-  public int read() throws IOException
-  {
-    return in.read();
-  }
-
-  /**
-   * Skips over and discards <code>n</code> bytes of data from the input stream. The <code>skip</code> method may,
-   * for a variety of reasons, end up skipping over some smaller number of bytes, possibly <code>0</code>. The actual
-   * number of bytes skipped is returned.
-   * <p>
-   * This method simply performs <code>in.skip(n)</code>.
-   * 
-   * @param n
-   *          the number of bytes to be skipped.
-   * @return the actual number of bytes skipped.
-   * @exception IOException
-   *              if an I/O error occurs.
-   */
-  @Override
-  public long skip(long n) throws IOException
-  {
-    return in.skip(n);
-  }
-
-  /**
-   * Returns the number of bytes that can be read from this input stream without blocking.
-   * <p>
-   * This method simply performs <code>in.available()</code> and returns the result.
-   * 
-   * @return the number of bytes that can be read from the input stream without blocking.
-   * @exception IOException
-   *              if an I/O error occurs.
-   * @see DelegatingInputStream#in
-   */
-  @Override
-  public int available() throws IOException
-  {
-    return in.available();
-  }
-
-  /**
-   * Closes this input stream and releases any system resources associated with the stream. This method simply performs
-   * <code>in.close()</code>.
-   * 
-   * @exception IOException
-   *              if an I/O error occurs.
-   * @see DelegatingInputStream#in
-   */
-  @Override
-  public void close() throws IOException
-  {
-    in.close();
-  }
-
-  /**
-   * Marks the current position in this input stream. A subsequent call to the <code>reset</code> method repositions
-   * this stream at the last marked position so that subsequent reads re-read the same bytes.
-   * <p>
-   * The <code>readlimit</code> argument tells this input stream to allow that many bytes to be read before the mark
-   * position gets invalidated.
-   * <p>
-   * This method simply performs <code>in.mark(readlimit)</code>.
-   * 
-   * @param readlimit
-   *          the maximum limit of bytes that can be read before the mark position becomes invalid.
-   * @see DelegatingInputStream#in
-   * @see DelegatingInputStream#reset()
-   */
-  @Override
-  public synchronized void mark(int readlimit)
-  {
-    in.mark(readlimit);
-  }
-
-  /**
-   * Repositions this stream to the position at the time the <code>mark</code> method was last called on this input
-   * stream.
-   * <p>
-   * This method simply performs <code>in.reset()</code>.
-   * <p>
-   * Stream marks are intended to be used in situations where you need to read ahead a little to see what's in the
-   * stream. Often this is most easily done by invoking some general parser. If the stream is of the type handled by the
-   * parse, it just chugs along happily. If the stream is not of that type, the parser should toss an exception when it
-   * fails. If this happens within readlimit bytes, it allows the outer code to reset the stream and try another parser.
-   * 
-   * @exception IOException
-   *              if the stream has not been marked or if the mark has been invalidated.
-   * @see DelegatingInputStream#in
-   * @see DelegatingInputStream#mark(int)
-   */
-  @Override
-  public synchronized void reset() throws IOException
-  {
-    in.reset();
-  }
-
-  /**
-   * Tests if this input stream supports the <code>mark</code> and <code>reset</code> methods. This method simply
-   * performs <code>in.markSupported()</code>.
-   * 
-   * @return <code>true</code> if this stream type supports the <code>mark</code> and <code>reset</code> method;
-   *         <code>false</code> otherwise.
-   * @see DelegatingInputStream#in
-   * @see java.io.InputStream#mark(int)
-   * @see java.io.InputStream#reset()
-   */
-  @Override
-  public boolean markSupported()
-  {
-    return in.markSupported();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java
deleted file mode 100644
index e49fe25605..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.eclipse.net4j.util.io;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * This class is the superclass of all classes that filter output streams. These streams sit on top of an already
- * existing output stream (the <i>underlying</i> output stream) which it uses as its basic sink of data, but possibly
- * transforming the data along the way or providing additional functionality.
- * <p>
- * The class <code>DelegatingOutputStream</code> itself simply overrides all methods of <code>OutputStream</code>
- * with versions that pass all requests to the underlying output stream. Subclasses of
- * <code>DelegatingOutputStream</code> may further override some of these methods as well as provide additional
- * methods and fields.
- * <p>
- * <b>Note:</b> The only difference to {@link java.io.FilterOutputStream} is that <code>DelegatingOutputStream</code>
- * does <b>not</b> override {@link #write(byte[])} or {@link #write(byte[], int, int)} but rather exposes the original
- * implementations of <code>InputStream</code> which call {@link #write(int)} instead of their delegate counterparts.
- * 
- * @author Eike Stepper
- */
-public class DelegatingOutputStream extends OutputStream
-{
-  /**
-   * The underlying output stream to be filtered.
-   */
-  protected OutputStream out;
-
-  /**
-   * Creates an output stream filter built on top of the specified underlying output stream.
-   * 
-   * @param out
-   *          the underlying output stream to be assigned to the field <tt>this.out</tt> for later use, or
-   *          <code>null</code> if this instance is to be created without an underlying stream.
-   */
-  public DelegatingOutputStream(OutputStream out)
-  {
-    this.out = out;
-  }
-
-  public OutputStream getDelegate()
-  {
-    return out;
-  }
-
-  /**
-   * Writes the specified <code>byte</code> to this output stream.
-   * <p>
-   * The <code>write</code> method of <code>DelegatingOutputStream</code> calls the <code>write</code> method of
-   * its underlying output stream, that is, it performs <tt>out.write(b)</tt>.
-   * <p>
-   * Implements the abstract <tt>write</tt> method of <tt>OutputStream</tt>.
-   * 
-   * @param b
-   *          the <code>byte</code>.
-   * @exception IOException
-   *              if an I/O error occurs.
-   */
-  @Override
-  public void write(int b) throws IOException
-  {
-    out.write(b);
-  }
-
-  /**
-   * Flushes this output stream and forces any buffered output bytes to be written out to the stream.
-   * <p>
-   * The <code>flush</code> method of <code>DelegatingOutputStream</code> calls the <code>flush</code> method of
-   * its underlying output stream.
-   * 
-   * @exception IOException
-   *              if an I/O error occurs.
-   * @see DelegatingOutputStream#out
-   */
-  @Override
-  public void flush() throws IOException
-  {
-    out.flush();
-  }
-
-  /**
-   * Closes this output stream and releases any system resources associated with the stream.
-   * <p>
-   * The <code>close</code> method of <code>DelegatingOutputStream</code> calls its <code>flush</code> method, and
-   * then calls the <code>close</code> method of its underlying output stream.
-   * 
-   * @exception IOException
-   *              if an I/O error occurs.
-   * @see DelegatingOutputStream#flush()
-   * @see DelegatingOutputStream#out
-   */
-  @Override
-  public void close() throws IOException
-  {
-    try
-    {
-      flush();
-    }
-    catch (IOException ignored)
-    {
-    }
-    out.close();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java
deleted file mode 100644
index c3ded5a8a5..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public abstract class DelegatingStreamWrapper implements IStreamWrapper
-{
-  private IStreamWrapper delegate;
-
-  public DelegatingStreamWrapper(IStreamWrapper delegate)
-  {
-    this.delegate = delegate;
-  }
-
-  public IStreamWrapper getDelegate()
-  {
-    return delegate;
-  }
-
-  public InputStream wrapInputStream(InputStream in) throws IOException
-  {
-    return doWrapInputStream(delegate.wrapInputStream(in));
-  }
-
-  public OutputStream wrapOutputStream(OutputStream out) throws IOException
-  {
-    return doWrapOutputStream(delegate.wrapOutputStream(out));
-  }
-
-  public void finishInputStream(InputStream in) throws IOException
-  {
-    delegate.finishInputStream(in);
-    doFinishInputStream(in);
-  }
-
-  public void finishOutputStream(OutputStream out) throws IOException
-  {
-    delegate.finishOutputStream(out);
-    doFinishOutputStream(out);
-  }
-
-  protected abstract InputStream doWrapInputStream(InputStream in) throws IOException;
-
-  protected abstract OutputStream doWrapOutputStream(OutputStream out) throws IOException;
-
-  protected abstract void doFinishInputStream(InputStream in) throws IOException;
-
-  protected abstract void doFinishOutputStream(OutputStream out) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java
deleted file mode 100644
index d5a2dd5376..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import org.eclipse.net4j.util.io.ExtendedIOUtil.ClassResolver;
-
-import java.io.DataInput;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public interface ExtendedDataInput extends DataInput
-{
-  public byte[] readByteArray() throws IOException;
-
-  public Object readObject() throws IOException;
-
-  public Object readObject(ClassLoader classLoader) throws IOException;
-
-  public Object readObject(ClassResolver classResolver) throws IOException;
-
-  public String readString() throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java
deleted file mode 100644
index e87a579f1a..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import org.eclipse.net4j.util.io.ExtendedIOUtil.ClassResolver;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author Eike Stepper
- */
-public class ExtendedDataInputStream extends DataInputStream implements ExtendedDataInput
-{
-  public ExtendedDataInputStream(InputStream in)
-  {
-    super(in);
-  }
-
-  public byte[] readByteArray() throws IOException
-  {
-    return ExtendedIOUtil.readByteArray(this);
-  }
-
-  public String readString() throws IOException
-  {
-    return ExtendedIOUtil.readString(this);
-  }
-
-  public Object readObject() throws IOException
-  {
-    return ExtendedIOUtil.readObject(this);
-  }
-
-  public Object readObject(ClassLoader classLoader) throws IOException
-  {
-    return ExtendedIOUtil.readObject(this, classLoader);
-  }
-
-  public Object readObject(ClassResolver classResolver) throws IOException
-  {
-    return ExtendedIOUtil.readObject(this, classResolver);
-  }
-
-  public static ExtendedDataInputStream wrap(InputStream stream)
-  {
-    if (stream instanceof ExtendedDataInputStream)
-    {
-      return (ExtendedDataInputStream)stream;
-    }
-
-    return new ExtendedDataInputStream(stream);
-  }
-
-  public static InputStream unwrap(InputStream stream)
-  {
-    if (stream instanceof ExtendedDataInputStream)
-    {
-      return ((ExtendedDataInputStream)stream).in;
-    }
-
-    return stream;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java
deleted file mode 100644
index a11b10b4fd..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public interface ExtendedDataOutput extends DataOutput
-{
-  public void writeByteArray(byte[] b) throws IOException;
-
-  public void writeObject(Object object) throws IOException;
-
-  public void writeString(String str) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java
deleted file mode 100644
index f304f10101..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public class ExtendedDataOutputStream extends DataOutputStream implements ExtendedDataOutput
-{
-  public ExtendedDataOutputStream(OutputStream out)
-  {
-    super(out);
-  }
-
-  public void writeByteArray(byte[] b) throws IOException
-  {
-    ExtendedIOUtil.writeByteArray(this, b);
-  }
-
-  public void writeString(String str) throws IOException
-  {
-    ExtendedIOUtil.writeString(this, str);
-  }
-
-  public void writeObject(Object object) throws IOException
-  {
-    ExtendedIOUtil.writeObject(this, object);
-  }
-
-  public static ExtendedDataOutputStream wrap(OutputStream stream)
-  {
-    if (stream instanceof ExtendedDataOutputStream)
-    {
-      return (ExtendedDataOutputStream)stream;
-    }
-
-    return new ExtendedDataOutputStream(stream);
-  }
-
-  public static OutputStream unwrap(OutputStream stream)
-  {
-    if (stream instanceof ExtendedDataOutputStream)
-    {
-      return ((ExtendedDataOutputStream)stream).out;
-    }
-
-    return stream;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java
deleted file mode 100644
index 3c0aa81a73..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.WrappedException;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public final class ExtendedIOUtil
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, ExtendedIOUtil.class);
-
-  private static final int UTF_HEADER_SIZE = 2;
-
-  private static final int MAX_16_BIT = (1 << 16) - 1;
-
-  private static final int MAX_UTF_LENGTH = MAX_16_BIT - UTF_HEADER_SIZE;
-
-  private static final int MAX_UTF_CHARS = MAX_UTF_LENGTH / 3;
-
-  private ExtendedIOUtil()
-  {
-  }
-
-  public static void writeByteArray(DataOutput out, byte[] b) throws IOException
-  {
-    if (b != null)
-    {
-      out.writeInt(b.length);
-      out.write(b);
-    }
-    else
-    {
-      out.writeInt(-1);
-    }
-  }
-
-  public static void writeObject(final DataOutput out, Object object) throws IOException
-  {
-    ObjectOutput wrapper = null;
-    if (out instanceof ObjectOutput)
-    {
-      wrapper = (ObjectOutput)out;
-    }
-    else
-    {
-      wrapper = new ObjectOutputStream(new OutputStream()
-      {
-        @Override
-        public void write(int b) throws IOException
-        {
-          out.writeByte((b & 0xff) + Byte.MIN_VALUE);
-        }
-      });
-    }
-
-    wrapper.writeObject(object);
-  }
-
-  public static void writeString(DataOutput out, String str) throws IOException
-  {
-    if (str != null)
-    {
-      int size = str.length();
-      int start = 0;
-      do
-      {
-        out.writeBoolean(true);
-        int chunk = Math.min(size, MAX_UTF_CHARS);
-        int end = start + chunk;
-        out.writeUTF(str.substring(start, end));
-        start = end;
-        size -= chunk;
-      } while (size > 0);
-    }
-
-    out.writeBoolean(false);
-  }
-
-  public static byte[] readByteArray(DataInput in) throws IOException
-  {
-    int length = in.readInt();
-    if (length < 0)
-    {
-      return null;
-    }
-
-    byte[] b;
-    try
-    {
-      b = new byte[length];
-    }
-    catch (Throwable t)
-    {
-      throw new IOException("Unable to allocate " + length + " bytes");
-    }
-
-    in.readFully(b);
-    return b;
-  }
-
-  public static Object readObject(final DataInput in) throws IOException
-  {
-    return readObject(in, (ClassResolver)null);
-  }
-
-  public static Object readObject(final DataInput in, ClassLoader classLoader) throws IOException
-  {
-    return readObject(in, new ClassLoaderClassResolver(classLoader));
-  }
-
-  public static Object readObject(final DataInput in, final ClassResolver classResolver) throws IOException
-  {
-    ObjectInput wrapper = null;
-    if (in instanceof ObjectInput)
-    {
-      wrapper = (ObjectInput)in;
-    }
-    else
-    {
-      wrapper = new ObjectInputStream(new InputStream()
-      {
-        @Override
-        public int read() throws IOException
-        {
-          return in.readByte() - Byte.MIN_VALUE;
-        }
-      })
-      {
-        @Override
-        protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException
-        {
-          if (classResolver != null)
-          {
-            if (TRACER.isEnabled())
-            {
-              TRACER.format("Deserializing class {0}", desc.getName());
-            }
-
-            Class<?> c = classResolver.resolveClass(desc);
-            if (c != null)
-            {
-              return c;
-            }
-          }
-
-          return super.resolveClass(desc);
-        }
-      };
-    }
-
-    try
-    {
-      return wrapper.readObject();
-    }
-    catch (ClassNotFoundException ex)
-    {
-      OM.LOG.error(ex);
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  public static String readString(DataInput in) throws IOException
-  {
-    boolean more = in.readBoolean();
-    if (!more)
-    {
-      return null;
-    }
-
-    StringBuilder builder = new StringBuilder();
-    do
-    {
-      String chunk = in.readUTF();
-      builder.append(chunk);
-      more = in.readBoolean();
-    } while (more);
-
-    return builder.toString();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface ClassResolver
-  {
-    public Class<?> resolveClass(ObjectStreamClass v) throws ClassNotFoundException;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class ClassLoaderClassResolver implements ClassResolver
-  {
-    private ClassLoader classLoader;
-
-    public ClassLoaderClassResolver(ClassLoader classLoader)
-    {
-      this.classLoader = classLoader;
-    }
-
-    public Class<?> resolveClass(ObjectStreamClass v) throws ClassNotFoundException
-    {
-      String className = v.getName();
-
-      try
-      {
-        return classLoader.loadClass(className);
-      }
-      catch (ClassNotFoundException ex)
-      {
-        OM.LOG.error(ex);
-        return null;
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
deleted file mode 100644
index db8e90f96d..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-/**
- * @author Eike Stepper
- */
-public class GZIPStreamWrapper implements IStreamWrapper
-{
-  public GZIPStreamWrapper()
-  {
-  }
-
-  public GZIPInputStream wrapInputStream(InputStream in) throws IOException
-  {
-    if (in instanceof GZIPInputStream)
-    {
-      return (GZIPInputStream)in;
-    }
-
-    return new GZIPInputStream(in);
-  }
-
-  public GZIPOutputStream wrapOutputStream(OutputStream out) throws IOException
-  {
-    if (out instanceof GZIPOutputStream)
-    {
-      return (GZIPOutputStream)out;
-    }
-
-    return new GZIPOutputStream(out);
-  }
-
-  public void finishInputStream(InputStream in) throws IOException
-  {
-  }
-
-  public void finishOutputStream(OutputStream out) throws IOException
-  {
-    ((GZIPOutputStream)out).finish();
-  }
-
-  /**
-   * TODO Move or remove me
-   */
-  public static void main(String[] args) throws Exception
-  {
-    final PipedOutputStream pos = new PipedOutputStream();
-    final PipedInputStream pis = new PipedInputStream(pos);
-
-    final GZIPOutputStream gos = new GZIPOutputStream(pos);
-    final byte[] out = "eike".getBytes();
-
-    Thread thread = new Thread()
-    {
-      @Override
-      public void run()
-      {
-        try
-        {
-          GZIPInputStream gis = new GZIPInputStream(pis);
-
-          byte[] in = new byte[out.length];
-          gis.read(in);
-          gis.close();
-        }
-        catch (IOException ex)
-        {
-          throw new IORuntimeException(ex);
-        }
-      }
-    };
-
-    thread.start();
-    ConcurrencyUtil.sleep(1000);
-
-    gos.write(out);
-    gos.close();
-
-    ConcurrencyUtil.sleep(2000);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOFilter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOFilter.java
deleted file mode 100644
index c5d2cd4ed6..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOFilter.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-/**
- * @author Eike Stepper
- */
-public interface IOFilter<T>
-{
-  public T filter(T data);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java
deleted file mode 100644
index 21603c0e39..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public interface IORunnable<IO extends Closeable>
-{
-  public void run(IO io) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java
deleted file mode 100644
index f764b6bed7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public class IORuntimeException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public IORuntimeException()
-  {
-  }
-
-  public IORuntimeException(String message)
-  {
-    super(message);
-  }
-
-  public IORuntimeException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public IORuntimeException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-
-  public void unwrapIOException() throws IOException
-  {
-    if (getCause() instanceof IOException)
-    {
-      throw (IOException)getCause();
-    }
-
-    throw this;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
deleted file mode 100644
index 3050e6e7ff..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
+++ /dev/null
@@ -1,564 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public final class IOUtil
-{
-  public static final int DEFAULT_BUFFER_SIZE = 8192;
-
-  private IOUtil()
-  {
-  }
-
-  public static InputStream IN()
-  {
-    return System.in;
-  }
-
-  public static PrintStream OUT()
-  {
-    return System.out;
-  }
-
-  public static PrintStream ERR()
-  {
-    return System.err;
-  }
-
-  public static void print(Throwable t, PrintStream stream)
-  {
-    t.printStackTrace(stream);
-  }
-
-  public static void print(Throwable t)
-  {
-    print(t, System.err);
-  }
-
-  public static FileInputStream openInputStream(String fileName) throws IORuntimeException
-  {
-    return openInputStream(new File(fileName));
-  }
-
-  public static FileInputStream openInputStream(File file) throws IORuntimeException
-  {
-    try
-    {
-      return new FileInputStream(file);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static FileOutputStream openOutputStream(String fileName) throws IORuntimeException
-  {
-    return openOutputStream(new File(fileName));
-  }
-
-  public static FileOutputStream openOutputStream(File file) throws IORuntimeException
-  {
-    try
-    {
-      return new FileOutputStream(file);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static FileReader openReader(String fileName) throws IORuntimeException
-  {
-    return openReader(new File(fileName));
-  }
-
-  public static FileReader openReader(File file) throws IORuntimeException
-  {
-    try
-    {
-      return new FileReader(file);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static FileWriter openWriter(String fileName) throws IORuntimeException
-  {
-    return openWriter(new File(fileName));
-  }
-
-  public static FileWriter openWriter(File file) throws IORuntimeException
-  {
-    try
-    {
-      return new FileWriter(file);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static Exception closeSilent(Closeable closeable)
-  {
-    try
-    {
-      if (closeable != null)
-      {
-        closeable.close();
-      }
-
-      return null;
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      return ex;
-    }
-  }
-
-  public static void close(Closeable closeable) throws IORuntimeException
-  {
-    try
-    {
-      if (closeable != null)
-      {
-        closeable.close();
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static void mkdirs(File folder)
-  {
-    if (!folder.exists())
-    {
-      if (!folder.mkdirs())
-      {
-        throw new IORuntimeException("Unable to create directory " + folder.getAbsolutePath());
-      }
-    }
-  }
-
-  public static int delete(File file)
-  {
-    if (file == null)
-    {
-      return 0;
-    }
-
-    int deleted = 0;
-    if (file.isDirectory())
-    {
-      for (File child : file.listFiles())
-      {
-        deleted += delete(child);
-      }
-    }
-
-    if (file.delete())
-    {
-      return deleted + 1;
-    }
-
-    return deleted;
-  }
-
-  public static void copyTree(File source, File target) throws IORuntimeException
-  {
-    if (source.isDirectory())
-    {
-      mkdirs(target);
-      File[] files = source.listFiles();
-      for (File file : files)
-      {
-        String name = file.getName();
-        copyTree(new File(source, name), new File(target, name));
-      }
-    }
-    else
-    {
-      copyFile(source, target);
-    }
-  }
-
-  public static void copyTrees(Collection<File> sources, File target) throws IORuntimeException
-  {
-    for (File source : sources)
-    {
-      copyTree(source, target);
-    }
-  }
-
-  public static void copyText(File source, File target, IOFilter<String>... lineFilters) throws IORuntimeException
-  {
-    BufferedReader reader = null;
-    BufferedWriter writer = null;
-
-    try
-    {
-      reader = new BufferedReader(openReader(source));
-      writer = new BufferedWriter(openWriter(target));
-      copyText(reader, writer, lineFilters);
-    }
-    finally
-    {
-      closeSilent(reader);
-      closeSilent(writer);
-    }
-  }
-
-  public static void copyText(BufferedReader reader, BufferedWriter writer, IOFilter<String>... lineFilters)
-  {
-    try
-    {
-      String line;
-      while ((line = reader.readLine()) != null)
-      {
-        for (IOFilter<String> lineFilter : lineFilters)
-        {
-          line = lineFilter.filter(line);
-        }
-
-        writer.write(line);
-        writer.newLine();
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static int copy(InputStream input, OutputStream output, int size, byte buffer[]) throws IORuntimeException
-  {
-    try
-    {
-      int written = 0;
-      int bufferSize = buffer.length;
-      int n = Math.min(size, bufferSize);
-      while (n > 0 && (n = input.read(buffer, 0, n)) != -1)
-      {
-        output.write(buffer, 0, n);
-        written += n;
-        size -= n;
-        n = Math.min(size, bufferSize);
-      }
-
-      return written;
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static void copy(InputStream input, OutputStream output, byte buffer[]) throws IORuntimeException
-  {
-    try
-    {
-      int n;
-      while ((n = input.read(buffer)) != -1)
-      {
-        output.write(buffer, 0, n);
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static void copy(InputStream input, OutputStream output, int bufferSize) throws IORuntimeException
-  {
-    copy(input, output, new byte[bufferSize]);
-  }
-
-  public static void copy(InputStream input, OutputStream output) throws IORuntimeException
-  {
-    copy(input, output, DEFAULT_BUFFER_SIZE);
-  }
-
-  /**
-   * @see NIOUtil#copyFile(File, File)
-   */
-  public static void copyFile(File source, File target) throws IORuntimeException
-  {
-    mkdirs(target.getParentFile());
-    FileInputStream input = null;
-    FileOutputStream output = null;
-
-    try
-    {
-      input = openInputStream(source);
-      output = openOutputStream(target);
-      copy(input, output);
-    }
-    finally
-    {
-      closeSilent(input);
-      closeSilent(output);
-    }
-  }
-
-  public static byte[] readFile(File file) throws IORuntimeException
-  {
-    if (file.length() > Integer.MAX_VALUE)
-    {
-      throw new IllegalArgumentException("File too long: " + file.length());
-    }
-
-    int size = (int)file.length();
-    FileInputStream input = openInputStream(file);
-
-    try
-    {
-      ByteArrayOutputStream output = new ByteArrayOutputStream(size);
-      copy(input, output);
-      return output.toByteArray();
-    }
-    finally
-    {
-      closeSilent(input);
-    }
-  }
-
-  public static void writeFile(File file, byte[] bytes) throws IORuntimeException
-  {
-    FileOutputStream output = openOutputStream(file);
-
-    try
-    {
-      ByteArrayInputStream input = new ByteArrayInputStream(bytes);
-      copy(input, output);
-    }
-    finally
-    {
-      closeSilent(output);
-    }
-  }
-
-  public static List<File> listDepthFirst(File file)
-  {
-    FileCollector collector = new FileCollector();
-    visitDepthFirst(file, collector);
-    return collector.getFiles();
-  }
-
-  public static List<File> listBreadthFirst(File file)
-  {
-    FileCollector collector = new FileCollector();
-    visitBreadthFirst(file, collector);
-    return collector.getFiles();
-  }
-
-  public static void visitDepthFirst(File file, IOVisitor visitor) throws IORuntimeException
-  {
-    try
-    {
-      boolean recurse = visitor.visit(file);
-      if (recurse && file.isDirectory())
-      {
-        visitDepthFirst(file.listFiles(), visitor);
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static void visitDepthFirst(File[] files, IOVisitor visitor)
-  {
-    for (File file : files)
-    {
-      visitDepthFirst(file, visitor);
-    }
-  }
-
-  public static void visitBreadthFirst(File file, IOVisitor visitor) throws IORuntimeException
-  {
-    File[] files = { file };
-    visitBreadthFirst(files, visitor);
-  }
-
-  public static void visitBreadthFirst(File[] files, IOVisitor visitor) throws IORuntimeException
-  {
-    try
-    {
-      boolean[] recurse = new boolean[files.length];
-      for (int i = 0; i < files.length; i++)
-      {
-        File file = files[i];
-        recurse[i] = visitor.visit(file);
-      }
-
-      for (int i = 0; i < files.length; i++)
-      {
-        File file = files[i];
-        if (file.isDirectory() && recurse[i])
-        {
-          File[] children = file.listFiles();
-          for (File child : children)
-          {
-            visitBreadthFirst(child, visitor);
-          }
-        }
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static <IO extends Closeable> void safeRun(IO io, IORunnable<IO> runnable) throws IORuntimeException
-  {
-    try
-    {
-      runnable.run(io);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-    finally
-    {
-      close(io);
-    }
-  }
-
-  public static void safeInput(File file, IORunnable<FileInputStream> runnable) throws IORuntimeException
-  {
-    safeRun(openInputStream(file), runnable);
-  }
-
-  public static void safeOutput(File file, IORunnable<FileOutputStream> runnable) throws IORuntimeException
-  {
-    safeRun(openOutputStream(file), runnable);
-  }
-
-  public static void safeRead(File file, IORunnable<FileReader> runnable) throws IORuntimeException
-  {
-    safeRun(openReader(file), runnable);
-  }
-
-  public static void safeWrite(File file, IORunnable<FileWriter> runnable) throws IORuntimeException
-  {
-    safeRun(openWriter(file), runnable);
-  }
-
-  public static boolean equals(InputStream stream1, InputStream stream2) throws IORuntimeException
-  {
-    try
-    {
-      for (;;)
-      {
-        int byte1 = stream1.read();
-        int byte2 = stream2.read();
-
-        if (byte1 != byte2)
-        {
-          return false;
-        }
-
-        if (byte1 == -1)// Implies byte2 == -1
-        {
-          return true;
-        }
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public static boolean equals(File file1, File file2) throws IORuntimeException
-  {
-    if (file1.length() != file2.length())
-    {
-      return false;
-    }
-
-    FileInputStream stream1 = null;
-    FileInputStream stream2 = null;
-
-    try
-    {
-      stream1 = new FileInputStream(file1);
-      stream2 = new FileInputStream(file2);
-      return equals(stream1, stream2);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-    finally
-    {
-      closeSilent(stream1);
-      closeSilent(stream2);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class FileCollector implements IOVisitor
-  {
-    private List<File> files = new ArrayList<File>();
-
-    public FileCollector()
-    {
-    }
-
-    public List<File> getFiles()
-    {
-      return files;
-    }
-
-    public boolean visit(File file) throws IOException
-    {
-      files.add(file);
-      return true;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOVisitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOVisitor.java
deleted file mode 100644
index db38e12306..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOVisitor.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public interface IOVisitor
-{
-  public boolean visit(File file) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java
deleted file mode 100644
index 1062666cd7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public interface IStreamWrapper
-{
-  public InputStream wrapInputStream(InputStream in) throws IOException;
-
-  public OutputStream wrapOutputStream(OutputStream out) throws IOException;
-
-  public void finishInputStream(InputStream in) throws IOException;
-
-  public void finishOutputStream(OutputStream out) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
deleted file mode 100644
index 699bda1990..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import org.eclipse.net4j.util.ImplementationError;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-
-/**
- * @author Eike Stepper
- */
-public final class NIOUtil
-{
-  private NIOUtil()
-  {
-  }
-
-  /**
-   * TODO Look at {@link #copy(File, File, boolean)}
-   */
-  public static void copyFile(File source, File target)
-  {
-    // http://www.javalobby.org/java/forums/t17036.html
-    // http://java.sun.com/developer/JDCTechTips/2002/tt0507.html#tip1
-    FileChannel sourceChannel = null;
-    FileChannel targetChannel = null;
-
-    try
-    {
-      if (!target.getParentFile().exists())
-      {
-        target.getParentFile().mkdirs();
-      }
-
-      if (!target.exists())
-      {
-        target.createNewFile();
-      }
-
-      sourceChannel = new FileInputStream(source).getChannel();
-      targetChannel = new FileOutputStream(target).getChannel();
-
-      long size = sourceChannel.size();
-      long transfered = sourceChannel.transferTo(0, size, targetChannel);
-      if (transfered != size)
-      {
-        throw new ImplementationError("Seems as if a loop must be implemented here");
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-    finally
-    {
-      IOUtil.closeSilent(sourceChannel);
-      IOUtil.closeSilent(targetChannel);
-    }
-  }
-
-  /**
-   * Copy source file to destination. If destination is a path then source file name is appended. If destination file
-   * exists then: overwrite=true - destination file is replaced; overwite=false - exception is thrown.
-   * 
-   * @param src
-   *          source file
-   * @param dst
-   *          destination file or path
-   * @param overwrite
-   *          overwrite destination file
-   * @exception IOException
-   *              I/O problem
-   */
-  @SuppressWarnings("unused")
-  private static void copy(final File src, File dst, final boolean overwrite) throws IOException
-  {
-    long q = System.currentTimeMillis();
-    if (!src.isFile() || !src.exists())
-    {
-      throw new IllegalArgumentException("Source file '" + src.getAbsolutePath() + "' not found!");
-    }
-
-    if (dst.exists()) if (dst.isDirectory()) // Directory? -> use source file
-        // name
-        dst = new File(dst, src.getName());
-      else if (dst.isFile())
-      {
-        if (!overwrite)
-          throw new IllegalArgumentException("Destination file '" + dst.getAbsolutePath() + "' already exists!");
-      }
-      else
-        throw new IllegalArgumentException("Invalid destination object '" + dst.getAbsolutePath() + "'!");
-    File dstParent = dst.getParentFile();
-    if (!dstParent.exists())
-      if (!dstParent.mkdirs()) throw new IOException("Failed to create directory " + dstParent.getAbsolutePath());
-    long fileSize = src.length();
-    if (fileSize > 20971520l)
-    { // for larger files (20Mb) use streams
-      FileInputStream in = new FileInputStream(src);
-      FileOutputStream out = new FileOutputStream(dst);
-      try
-      {
-        int doneCnt = -1, bufSize = 32768;
-        byte buf[] = new byte[bufSize];
-        while ((doneCnt = in.read(buf, 0, bufSize)) >= 0)
-          if (doneCnt == 0)
-            Thread.yield();
-          else
-            out.write(buf, 0, doneCnt);
-        out.flush();
-      }
-      finally
-      {
-        try
-        {
-          in.close();
-        }
-        catch (IOException e)
-        {
-        }
-
-        try
-        {
-          out.close();
-        }
-        catch (IOException e)
-        {
-        }
-      }
-    }
-    else
-    { // smaller files, use channels
-      FileInputStream fis = new FileInputStream(src);
-      FileOutputStream fos = new FileOutputStream(dst);
-      FileChannel in = fis.getChannel(), out = fos.getChannel();
-
-      try
-      {
-        long offs = 0, doneCnt = 0, copyCnt = Math.min(65536, fileSize);
-        do
-        {
-          doneCnt = in.transferTo(offs, copyCnt, out);
-          offs += doneCnt;
-          fileSize -= doneCnt;
-        }
-
-        while (fileSize > 0);
-      }
-      finally
-      { // cleanup
-        try
-        {
-          in.close();
-        }
-        catch (IOException e)
-        {
-        }
-
-        try
-        {
-          out.close();
-        }
-        catch (IOException e)
-        {
-        }
-
-        try
-        {
-          fis.close();
-        }
-        catch (IOException e)
-        {
-        }
-
-        try
-        {
-          fos.close();
-        }
-        catch (IOException ex)
-        {
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java
deleted file mode 100644
index 54cb295444..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-/**
- * @author Eike Stepper
- */
-public abstract class SortedFileMap<K extends Comparable<K>, V> implements Closeable
-{
-  private File file;
-
-  private RandomAccessFile randomAccessFile;
-
-  private ExtendedDataInput input;
-
-  private ExtendedDataOutput output;
-
-  private long entrySize;
-
-  private long entryCount;
-
-  /**
-   * @see RandomAccessFile#RandomAccessFile(File, String)
-   */
-  public SortedFileMap(File file, String mode)
-  {
-    try
-    {
-      this.file = file;
-      randomAccessFile = new RandomAccessFile(file, mode);
-      input = new DataInputExtender(randomAccessFile);
-      output = new DataOutputExtender(randomAccessFile);
-      entrySize = getKeySize() + getValueSize();
-      entryCount = randomAccessFile.length() / entrySize;
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public void close() throws IOException
-  {
-    IOUtil.close(randomAccessFile);
-  }
-
-  public File getFile()
-  {
-    return file;
-  }
-
-  public RandomAccessFile getRandomAccessFile()
-  {
-    return randomAccessFile;
-  }
-
-  public long getEntryCount()
-  {
-    return entryCount;
-  }
-
-  public int getEntrySize()
-  {
-    return (int)entrySize;
-  }
-
-  public long getPosition(long index)
-  {
-    return index * entrySize;
-  }
-
-  public long getValuePosition(long index)
-  {
-    return getPosition(index) + getKeySize();
-  }
-
-  public K getMaxKey()
-  {
-    if (entryCount == 0)
-    {
-      return null;
-    }
-
-    return getKey(entryCount - 1);
-  }
-
-  public K getKey(long index)
-  {
-    try
-    {
-      long pos = getPosition(index);
-      randomAccessFile.seek(pos);
-      return readKey(input);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public V getValue(long index)
-  {
-    try
-    {
-      long pos = getValuePosition(index);
-      randomAccessFile.seek(pos);
-      return readValue(input);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public V get(K key)
-  {
-    try
-    {
-      long index = search(key);
-      if (index < 0)
-      {
-        return null;
-      }
-
-      return readValue(input);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public V put(K key, V value)
-  {
-    try
-    {
-      long index = search(key);
-      if (index >= 0)
-      {
-        long pos = getValuePosition(index);
-        randomAccessFile.seek(pos);
-        V oldValue = readValue(input);
-        randomAccessFile.seek(pos);
-        writeValue(output, value);
-        return oldValue;
-      }
-
-      index = -index - 1;
-      for (long i = entryCount; i > index; --i)
-      {
-        randomAccessFile.seek(getPosition(i - 1));
-        K k = readKey(input);
-        randomAccessFile.seek(getValuePosition(i - 1));
-        V v = readValue(input);
-
-        randomAccessFile.seek(getPosition(i));
-        writeKey(output, k);
-        randomAccessFile.seek(getValuePosition(i));
-        writeValue(output, v);
-      }
-
-      ++entryCount;
-      randomAccessFile.seek(getPosition(index));
-      writeKey(output, key);
-      randomAccessFile.seek(getValuePosition(index));
-      writeValue(output, value);
-      return null;
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  /**
-   * @return The index of the entry with the given key if the key exists, <code>-(insertionIndex + 1)</code>
-   *         otherwise.
-   */
-  protected long search(K key) throws IOException
-  {
-    long low = 0;
-    long high = entryCount - 1;
-
-    while (low <= high)
-    {
-      long mid = low + high >> 1;
-      randomAccessFile.seek(getPosition(mid));
-      Comparable<K> midVal = readKey(input);
-      int cmp = midVal.compareTo(key);
-
-      if (cmp < 0)
-      {
-        low = mid + 1;
-      }
-      else if (cmp > 0)
-      {
-        high = mid - 1;
-      }
-      else
-      {
-        return mid; // key found
-      }
-    }
-
-    return -(low + 1); // key not found.
-  }
-
-  public abstract int getKeySize();
-
-  protected abstract K readKey(ExtendedDataInput in) throws IOException;
-
-  protected abstract void writeKey(ExtendedDataOutput out, K key) throws IOException;
-
-  public abstract int getValueSize();
-
-  protected abstract V readValue(ExtendedDataInput in) throws IOException;
-
-  protected abstract void writeValue(ExtendedDataOutput out, V value) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java
deleted file mode 100644
index bb25039f59..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public class StreamWrapperChain extends DelegatingStreamWrapper
-{
-  private IStreamWrapper head;
-
-  public StreamWrapperChain(IStreamWrapper head, IStreamWrapper delegate)
-  {
-    super(delegate);
-    this.head = head;
-  }
-
-  public IStreamWrapper getHead()
-  {
-    return head;
-  }
-
-  @Override
-  protected InputStream doWrapInputStream(InputStream in) throws IOException
-  {
-    return head.wrapInputStream(in);
-  }
-
-  @Override
-  protected OutputStream doWrapOutputStream(OutputStream out) throws IOException
-  {
-    return head.wrapOutputStream(out);
-  }
-
-  @Override
-  protected void doFinishInputStream(InputStream in) throws IOException
-  {
-    head.finishInputStream(in);
-  }
-
-  @Override
-  protected void doFinishOutputStream(OutputStream out) throws IOException
-  {
-    head.finishOutputStream(out);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/TMPUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/TMPUtil.java
deleted file mode 100644
index 4a5356a551..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/TMPUtil.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-public final class TMPUtil
-{
-  private TMPUtil()
-  {
-  }
-
-  public static File createTempFolder() throws IORuntimeException
-  {
-    return createTempFolder("tmp");
-  }
-
-  public static File createTempFolder(String prefix) throws IORuntimeException
-  {
-    return createTempFolder(prefix, "");
-  }
-
-  public static File createTempFolder(String prefix, String suffix) throws IORuntimeException
-  {
-    return createTempFolder(prefix, suffix, null);
-  }
-
-  public static File createTempFolder(String prefix, String suffix, File directory) throws IORuntimeException
-  {
-    // TODO Consider servlets
-    // ServletContext context = session.getServletContext();
-    // File tempDir = (File)context.getAttribute("javax.servlet.context.tempdir");
-
-    try
-    {
-      File tmp = File.createTempFile(prefix, suffix, directory);
-      String tmpPath = tmp.getAbsolutePath();
-      tmp.delete();
-      tmp = new File(tmpPath);
-      tmp.mkdirs();
-      return tmp;
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORInputStream.java
deleted file mode 100644
index d1b7ae6bd6..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORInputStream.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author Eike Stepper
- */
-public class XORInputStream extends DelegatingInputStream
-{
-  private int[] key;
-
-  private int index;
-
-  public XORInputStream(InputStream in, int... key)
-  {
-    super(in);
-    this.key = key;
-  }
-
-  public int[] getKey()
-  {
-    return key;
-  }
-
-  @Override
-  public int read() throws IOException
-  {
-    int b = super.read();
-    if (b != -1)
-    {
-      if (key != null && key.length != 0)
-      {
-        if (index == key.length)
-        {
-          index = 0;
-        }
-
-        b = b & 0xFF ^ key[index++] & 0xFF;
-      }
-    }
-
-    return b;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XOROutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XOROutputStream.java
deleted file mode 100644
index 092d5969b5..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XOROutputStream.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public class XOROutputStream extends DelegatingOutputStream
-{
-  private int[] key;
-
-  private int index;
-
-  public XOROutputStream(OutputStream out, int... key)
-  {
-    super(out);
-    this.key = key;
-  }
-
-  public int[] getKey()
-  {
-    return key;
-  }
-
-  @Override
-  public void write(int b) throws IOException
-  {
-    if (key != null && key.length != 0)
-    {
-      if (index == key.length)
-      {
-        index = 0;
-      }
-
-      b = b & 0xFF ^ key[index++] & 0xFF;
-    }
-
-    super.write(b);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java
deleted file mode 100644
index 8506fd2e61..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public class XORStreamWrapper implements IStreamWrapper
-{
-  private int[] key;
-
-  public XORStreamWrapper(int[] key)
-  {
-    this.key = key;
-  }
-
-  public int[] getKey()
-  {
-    return key;
-  }
-
-  public XORInputStream wrapInputStream(InputStream in) throws IOException
-  {
-    if (in instanceof XORInputStream)
-    {
-      return (XORInputStream)in;
-    }
-
-    return new XORInputStream(in, key);
-  }
-
-  public XOROutputStream wrapOutputStream(OutputStream out) throws IOException
-  {
-    if (out instanceof XOROutputStream)
-    {
-      return (XOROutputStream)out;
-    }
-
-    return new XOROutputStream(out, key);
-  }
-
-  public void finishInputStream(InputStream in) throws IOException
-  {
-  }
-
-  public void finishOutputStream(OutputStream out) throws IOException
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java
deleted file mode 100644
index d700869874..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.io;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-/**
- * @author Eike Stepper
- */
-public final class ZIPUtil
-{
-  public static final int DEFALULT_BUFFER_SIZE = 4096;
-
-  private static final int ORDER_KEEP = -1;
-
-  private static final int ORDER_SWAP = 1;
-
-  private ZIPUtil()
-  {
-  }
-
-  public static void zip(ZipEntryHandler handler, File zipFile) throws IORuntimeException
-  {
-    final byte[] buffer = new byte[DEFALULT_BUFFER_SIZE];
-    final EntryContext context = new EntryContext();
-
-    FileOutputStream fos = IOUtil.openOutputStream(zipFile);
-    ZipOutputStream zos = null;
-    InputStream input = null;
-    ZipEntry entry = null;
-
-    try
-    {
-      zos = new ZipOutputStream(new BufferedOutputStream(fos, DEFALULT_BUFFER_SIZE));
-      for (;;)
-      {
-        handler.handleEntry(context);
-        if (context.isEmpty())
-        {
-          break;
-        }
-
-        try
-        {
-          String name = context.getName().replace(File.separatorChar, '/');
-          entry = new ZipEntry(name);
-          zos.putNextEntry(entry);
-
-          if (!context.isDirectory())
-          {
-            input = context.getInputStream();
-            if (input == null)
-            {
-              throw new IllegalStateException("Input is null for zip entry " + name);
-            }
-
-            IOUtil.copy(input, zos, buffer);
-          }
-        }
-        finally
-        {
-          IOUtil.closeSilent(input);
-          if (entry != null)
-          {
-            zos.closeEntry();
-          }
-
-          context.reset();
-        }
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-    finally
-    {
-      IOUtil.closeSilent(zos);
-      IOUtil.closeSilent(fos);
-    }
-  }
-
-  public static void zip(File sourceFolder, boolean excludeRoot, File zipFile)
-  {
-    zip(new FileSystemZipHandler(sourceFolder, excludeRoot), zipFile);
-  }
-
-  public static void unzip(File zipFile, UnzipHandler handler) throws IORuntimeException
-  {
-    FileInputStream fis = IOUtil.openInputStream(zipFile);
-    ZipInputStream zis = null;
-
-    try
-    {
-      zis = new ZipInputStream(new BufferedInputStream(fis, DEFALULT_BUFFER_SIZE));
-
-      ZipEntry entry;
-      while ((entry = zis.getNextEntry()) != null)
-      {
-        if (entry.isDirectory())
-        {
-          handler.unzipDirectory(entry.getName());
-        }
-        else
-        {
-          // TODO Provide delegating InputStream that ignores close()
-          handler.unzipFile(entry.getName(), zis);
-        }
-      }
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-    finally
-    {
-      IOUtil.closeSilent(zis);
-      IOUtil.closeSilent(fis);
-    }
-  }
-
-  public static void unzip(File zipFile, File targetFolder) throws IORuntimeException
-  {
-    unzip(zipFile, new FileSystemUnzipHandler(targetFolder, DEFALULT_BUFFER_SIZE));
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface ZipEntryHandler
-  {
-    public void handleEntry(EntryContext context) throws IOException;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface UnzipHandler
-  {
-    public void unzipDirectory(String name) throws IOException;
-
-    public void unzipFile(String name, InputStream zipStream) throws IOException;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class EntryContext
-  {
-    private static final String EMPTY = new String();
-
-    private String name = EMPTY;
-
-    private InputStream inputStream;
-
-    private boolean directory;
-
-    EntryContext()
-    {
-    }
-
-    void reset()
-    {
-      name = null;
-      inputStream = null;
-    }
-
-    boolean isEmpty()
-    {
-      return name == null;
-    }
-
-    boolean isDirectory()
-    {
-      return directory;
-    }
-
-    String getName()
-    {
-      return name;
-    }
-
-    InputStream getInputStream()
-    {
-      return inputStream;
-    }
-
-    public void setName(String name, boolean directory)
-    {
-      this.name = name + (directory ? "/" : "");
-      this.directory = directory;
-    }
-
-    public void setInputStream(InputStream inputStream)
-    {
-      this.inputStream = inputStream;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class FileSystemZipHandler implements ZipEntryHandler
-  {
-    private int sourceFolderLength;
-
-    private transient Iterator<File> files;
-
-    public FileSystemZipHandler(File sourceFolder, boolean excludeRoot)
-    {
-      File root = excludeRoot ? sourceFolder : sourceFolder.getParentFile();
-      sourceFolderLength = root.getAbsolutePath().length();
-      if (excludeRoot)
-      {
-        ++sourceFolderLength;
-      }
-
-      final int baseLength = sourceFolder.getAbsolutePath().length();
-      List<File> list = IOUtil.listBreadthFirst(sourceFolder);
-      Collections.sort(list, new Comparator<File>()
-      {
-        public int compare(File f1, File f2)
-        {
-          String path1 = getPath(f1, baseLength);
-          String path2 = getPath(f2, baseLength);
-          if (path1.length() == 0) return ORDER_KEEP;
-          if (path2.length() == 0) return ORDER_SWAP;
-
-          if (f1.isDirectory())
-          {
-            if (f2.isDirectory())
-            {
-              // f1=dir, f2=dir
-              if (path1.equalsIgnoreCase("/META-INF"))
-              {
-                return ORDER_KEEP;
-              }
-
-              if (path2.equalsIgnoreCase("/META-INF"))
-              {
-                return ORDER_SWAP;
-              }
-
-              return path1.compareTo(path2);
-            }
-
-            // f1=dir, f2=file
-            if (path1.equalsIgnoreCase("/META-INF"))
-            {
-              return ORDER_KEEP;
-            }
-
-            if (path2.equalsIgnoreCase("/META-INF/MANIFEST.MF"))
-            {
-              return ORDER_SWAP;
-            }
-
-            return ORDER_KEEP;
-          }
-
-          if (f2.isDirectory())
-          {
-            // f1=file, f2=dir
-            if (path2.equalsIgnoreCase("/META-INF"))
-            {
-              return ORDER_SWAP;
-            }
-
-            if (path1.equalsIgnoreCase("/META-INF/MANIFEST.MF"))
-            {
-              return ORDER_KEEP;
-            }
-
-            return ORDER_SWAP;
-          }
-
-          // f1=file, f2=file
-          if (path1.equalsIgnoreCase("/META-INF/MANIFEST.MF"))
-          {
-            return ORDER_KEEP;
-          }
-
-          if (path2.equalsIgnoreCase("/META-INF/MANIFEST.MF"))
-          {
-            return ORDER_SWAP;
-          }
-
-          return path1.compareTo(path2);
-        }
-
-        private String getPath(File file, int baseLength)
-        {
-          String absolutePath = file.getAbsolutePath();
-          String substring = absolutePath.substring(baseLength);
-          String replace = substring.replace(File.separatorChar, '/');
-          return replace;
-        }
-      });
-
-      files = list.iterator();
-      if (excludeRoot)
-      {
-        files.next();
-      }
-    }
-
-    public void handleEntry(EntryContext context) throws IOException
-    {
-      if (files.hasNext())
-      {
-        File file = files.next();
-        String name = getName(file);
-        if (name.length() != 0)
-        {
-          context.setName(name, file.isDirectory());
-
-          if (file.isFile())
-          {
-            context.setInputStream(IOUtil.openInputStream(file));
-          }
-        }
-      }
-    }
-
-    protected String getName(File file)
-    {
-      return file.getAbsolutePath().substring(sourceFolderLength);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class FileSystemUnzipHandler implements UnzipHandler
-  {
-    private File targetFolder;
-
-    private transient byte[] buffer;
-
-    public FileSystemUnzipHandler(File targetFolder, int bufferSize)
-    {
-      this.targetFolder = targetFolder;
-      buffer = new byte[bufferSize];
-    }
-
-    public File getTargetFolder()
-    {
-      return targetFolder;
-    }
-
-    public void unzipDirectory(String name)
-    {
-      File directory = new File(targetFolder, name);
-      if (!directory.exists())
-      {
-        directory.mkdirs();
-      }
-    }
-
-    public void unzipFile(String name, InputStream zipStream)
-    {
-      File targetFile = new File(targetFolder, name);
-      if (!targetFile.getParentFile().exists())
-      {
-        targetFile.getParentFile().mkdirs();
-      }
-
-      FileOutputStream out = IOUtil.openOutputStream(targetFile);
-
-      try
-      {
-        IOUtil.copy(zipStream, out, buffer);
-      }
-      finally
-      {
-        IOUtil.closeSilent(out);
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package.html
deleted file mode 100644
index bb5f9cf555..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Interfaces and classes for I/O.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java
deleted file mode 100644
index fd44921cca..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.lifecycle;
-
-/**
- * @author Eike Stepper
- */
-public interface ILifecycle
-{
-  public void activate() throws LifecycleException;
-
-  public Exception deactivate();
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface Introspection extends ILifecycle
-  {
-    public ILifecycleState getLifecycleState();
-
-    public boolean isActive();
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java
deleted file mode 100644
index ab3694d2ef..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.lifecycle;
-
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Eike Stepper
- */
-public interface ILifecycleEvent extends IEvent
-{
-  public ILifecycle getLifecycle();
-
-  public Kind getKind();
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum Kind
-  {
-    ABOUT_TO_ACTIVATE, ACTIVATED, ABOUT_TO_DEACTIVATE, DEACTIVATED
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleState.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleState.java
deleted file mode 100644
index a581c1907c..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleState.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.lifecycle;
-
-/**
- * @author Eike Stepper
- */
-public enum ILifecycleState
-{
-  ACTIVATING, ACTIVE, DEACTIVATING, INACTIVE
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java
deleted file mode 100644
index b00aec53f2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.lifecycle;
-
-/**
- * @author Eike Stepper
- */
-public class LifecycleException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public LifecycleException()
-  {
-  }
-
-  public LifecycleException(String message)
-  {
-    super(message);
-  }
-
-  public LifecycleException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public LifecycleException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
deleted file mode 100644
index c50ae42fe5..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.lifecycle;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.WrappedException;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.reflect.Method;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-public final class LifecycleUtil
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_LIFECYCLE, LifecycleUtil.class);
-
-  private LifecycleUtil()
-  {
-  }
-
-  public static ILifecycleState getLifecycleState(Object object)
-  {
-    if (object instanceof ILifecycle.Introspection)
-    {
-      return ((ILifecycle.Introspection)object).getLifecycleState();
-    }
-
-    return ILifecycleState.ACTIVE;
-  }
-
-  public static boolean isActive(Object object)
-  {
-    if (object instanceof ILifecycle.Introspection)
-    {
-      return ((ILifecycle.Introspection)object).isActive();
-    }
-
-    return object != null;
-  }
-
-  public static void activate(Object object) throws LifecycleException
-  {
-    activate(object, false);
-  }
-
-  /**
-   * @see Activator
-   */
-  public static void activate(Object object, boolean useAnnotation) throws LifecycleException
-  {
-    if (object instanceof ILifecycle)
-    {
-      ((ILifecycle)object).activate();
-    }
-    else if (object != null && useAnnotation)
-    {
-      invokeAnnotation(object, Activator.class);
-    }
-  }
-
-  public static Exception activateSilent(Object object)
-  {
-    return activateSilent(object, false);
-  }
-
-  /**
-   * @see Activator
-   */
-  public static Exception activateSilent(Object object, boolean useAnnotation)
-  {
-    try
-    {
-      activate(object, useAnnotation);
-      return null;
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      return ex;
-    }
-  }
-
-  public static boolean waitForActive(Object object, long millis)
-  {
-    try
-    {
-      if (object instanceof ILifecycle)
-      {
-        Lifecycle lifecycle = (Lifecycle)object;
-        if (lifecycle.isActive())
-        {
-          return true;
-        }
-
-        final CountDownLatch latch = new CountDownLatch(1);
-        LifecycleEventAdapter adapter = new LifecycleEventAdapter()
-        {
-          @Override
-          protected void onActivated(ILifecycle lifecycle)
-          {
-            latch.countDown();
-          }
-        };
-
-        try
-        {
-          lifecycle.addListener(adapter);
-          latch.await(millis, TimeUnit.MILLISECONDS);
-        }
-        finally
-        {
-          lifecycle.removeListener(adapter);
-        }
-
-        return lifecycle.isActive();
-      }
-
-      return true;
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  public static Exception deactivate(Object object)
-  {
-    return deactivate(object, false);
-  }
-
-  /**
-   * @see Deactivator
-   */
-  public static Exception deactivate(Object object, boolean useAnnotation)
-  {
-    if (object instanceof ILifecycle)
-    {
-      return ((ILifecycle)object).deactivate();
-    }
-    else if (object != null && useAnnotation)
-    {
-      // TODO Handle evtl. return value (exception)
-      invokeAnnotation(object, Deactivator.class);
-    }
-
-    return null;
-  }
-
-  public static void deactivateNoisy(Object object) throws LifecycleException
-  {
-    deactivateNoisy(object, false);
-  }
-
-  public static void deactivateNoisy(Object object, boolean useAnnotation) throws LifecycleException
-  {
-    Exception ex = deactivate(object, useAnnotation);
-    if (ex instanceof RuntimeException)
-    {
-      throw (RuntimeException)ex;
-    }
-    else if (ex != null)
-    {
-      throw new LifecycleException(ex);
-    }
-  }
-
-  private static <T extends Annotation> void invokeAnnotation(Object object, Class<T> annotationClass)
-  {
-    Class<?> c = object.getClass();
-    while (c != Object.class)
-    {
-      final Method[] methods = c.getDeclaredMethods();
-      for (Method method : methods)
-      {
-        if (method.getParameterTypes().length == 0)
-        {
-          Annotation annotation = method.getAnnotation(annotationClass);
-          if (annotation != null)
-          {
-            invokeMethod(object, method);
-            boolean propagate = annotationClass == Activator.class ? ((Activator)annotation).propagate()
-                : ((Deactivator)annotation).propagate();
-            if (!propagate)
-            {
-              break;
-            }
-          }
-        }
-      }
-
-      c = c.getSuperclass();
-    }
-  }
-
-  private static Object invokeMethod(Object object, Method method)
-  {
-    try
-    {
-      return method.invoke(object, (Object[])null);
-    }
-    catch (IllegalAccessException iae)
-    {
-      try
-      {
-        method.setAccessible(true);
-        return method.invoke(object, (Object[])null);
-      }
-      catch (Exception ex)
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace(ex);
-        }
-      }
-    }
-    catch (Exception ex)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace(ex);
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  @Retention(RetentionPolicy.RUNTIME)
-  @Target(ElementType.METHOD)
-  public @interface Activator
-  {
-    boolean propagate() default true;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  @Retention(RetentionPolicy.RUNTIME)
-  @Target(ElementType.METHOD)
-  public @interface Deactivator
-  {
-    boolean propagate() default true;
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/package.html
deleted file mode 100644
index e7e55a0ba2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/package.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-A framework for components with a simple lifecycle.
-Interfaces that describe the behaviour of objects with respect to their lifecycle. 
-A utility class to interact with such objects and an abstract class that can be
-used to implement such objects are provided as well.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
deleted file mode 100644
index e5c222d6a1..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om;
-
-import org.eclipse.net4j.internal.util.om.LegacyBundle;
-
-/**
- * @author Eike Stepper
- */
-public final class LegacyUtil
-{
-  private LegacyUtil()
-  {
-  }
-
-  public static void startBundles(OMBundle[] bundles) throws Exception
-  {
-    for (int i = 0; i < bundles.length; i++)
-    {
-      ((LegacyBundle)bundles[i]).start();
-    }
-  }
-
-  public static void stopBundles(OMBundle[] bundles) throws Exception
-  {
-    for (int i = bundles.length - 1; i >= 0; i--)
-    {
-      ((LegacyBundle)bundles[i]).stop();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java
deleted file mode 100644
index 91ca5cfc30..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om;
-
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.pref.OMPreferences;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-/**
- * @author Eike Stepper
- */
-public interface OMBundle
-{
-  public OMPlatform getPlatform();
-
-  public String getBundleID();
-
-  public URL getBaseURL();
-
-  public void setBundleContext(Object bundleContext);
-
-  public OMTracer tracer(String name);
-
-  public OMLogger logger();
-
-  public OMPreferences preferences();
-
-  public File getConfigFile();
-
-  public Properties getConfigProperties();
-
-  public String getStateLocation();
-
-  public InputStream getInputStream(String path) throws IOException;
-
-  public DebugSupport getDebugSupport();
-
-  public TranslationSupport getTranslationSupport();
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface DebugSupport
-  {
-    public boolean isDebugging();
-
-    public void setDebugging(boolean debugging);
-
-    public String getDebugOption(String option);
-
-    public void setDebugOption(String option, String value);
-
-    public String getDebugOption(String option, String defaultValue);
-
-    public boolean getDebugOption(String option, boolean defaultValue);
-
-    public void setDebugOption(String option, boolean value);
-
-    public int getDebugOption(String option, int defaultValue);
-
-    public void setDebugOption(String option, int value);
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface TranslationSupport
-  {
-    /**
-     * Indicates whether strings should be translated by default.
-     * 
-     * @return <code>true</code> if strings should be translated by default; <code>false</code> otherwise.
-     */
-    public boolean shouldTranslate();
-
-    /**
-     * Sets whether strings should be translated by default.
-     * 
-     * @param shouldTranslate
-     *          whether strings should be translated by default.
-     */
-    public void setShouldTranslate(boolean shouldTranslate);
-
-    /**
-     * Returns the string resource associated with the key.
-     * 
-     * @param key
-     *          the key of the string resource.
-     * @return the string resource associated with the key.
-     */
-    String getString(String key);
-
-    /**
-     * Returns the string resource associated with the key.
-     * 
-     * @param key
-     *          the key of the string resource.
-     * @param translate
-     *          whether the result is to be translated to the current locale.
-     * @return the string resource associated with the key.
-     */
-    String getString(String key, boolean translate);
-
-    /**
-     * Returns a string resource associated with the key, and performs substitutions.
-     * 
-     * @param key
-     *          the key of the string.
-     * @param args
-     *          the message substitutions.
-     * @return a string resource associated with the key.
-     * @see #getString(String)
-     * @see java.text.MessageFormat#format(String, Object...)
-     */
-    String getString(String key, Object... args);
-
-    /**
-     * Returns a string resource associated with the key, and performs substitutions.
-     * 
-     * @param key
-     *          the key of the string.
-     * @param translate
-     *          whether the result is to be translated to the current locale.
-     * @param args
-     *          the message substitutions.
-     * @return a string resource associated with the key.
-     * @see #getString(String)
-     * @see java.text.MessageFormat#format(String, Object[])
-     */
-    String getString(String key, boolean translate, Object... args);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
deleted file mode 100644
index 0a54cf9caa..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om;
-
-import org.eclipse.net4j.internal.util.bundle.AbstractPlatform;
-import org.eclipse.net4j.util.om.log.OMLogHandler;
-import org.eclipse.net4j.util.om.trace.OMTraceHandler;
-
-import java.io.File;
-import java.util.Properties;
-
-/**
- * @author Eike Stepper
- */
-public interface OMPlatform
-{
-  // @Singleton
-  public static final OMPlatform INSTANCE = AbstractPlatform.createPlatform();
-
-  public OMBundle bundle(String bundleID, Class<?> accessor);
-
-  public boolean isOSGiRunning();
-
-  public boolean isDebugging();
-
-  public void setDebugging(boolean debugging);
-
-  public void addLogHandler(OMLogHandler logHandler);
-
-  public void removeLogHandler(OMLogHandler logHandler);
-
-  public void addTraceHandler(OMTraceHandler traceHandler);
-
-  public void removeTraceHandler(OMTraceHandler traceHandler);
-
-  public File getStateFolder();
-
-  public File getConfigFolder();
-
-  public File getConfigFile(String name);
-
-  public Properties getConfigProperties(String name);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
deleted file mode 100644
index 0a5b996c0e..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.om.OSGiBundle;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Eike Stepper
- */
-public abstract class OSGiActivator implements BundleActivator
-{
-  private OMBundle omBundle;
-
-  public OSGiActivator(OMBundle omBundle)
-  {
-    this.omBundle = omBundle;
-  }
-
-  public final OMBundle getOMBundle()
-  {
-    return omBundle;
-  }
-
-  public void start(BundleContext context) throws Exception
-  {
-    startBundle(context, (OSGiBundle)getOMBundle());
-  }
-
-  public void stop(BundleContext context) throws Exception
-  {
-    stopBundle(context, (OSGiBundle)getOMBundle());
-  }
-
-  @Override
-  public final boolean equals(Object obj)
-  {
-    return super.equals(obj);
-  }
-
-  @Override
-  public final int hashCode()
-  {
-    return super.hashCode();
-  }
-
-  @Override
-  public final String toString()
-  {
-    return super.toString();
-  }
-
-  @Override
-  protected final Object clone() throws CloneNotSupportedException
-  {
-    return super.clone();
-  }
-
-  @Override
-  protected final void finalize() throws Throwable
-  {
-    super.finalize();
-  }
-
-  public static void startBundle(BundleContext context, OSGiBundle bundle) throws Error, Exception
-  {
-    OM.Activator.traceStart(context);
-    if (bundle == null)
-    {
-      throw new IllegalStateException("bundle == null");
-    }
-
-    try
-    {
-      bundle.setBundleContext(context);
-      bundle.start();
-    }
-    catch (Error error)
-    {
-      bundle.logger().error(error);
-      throw error;
-    }
-    catch (Exception ex)
-    {
-      bundle.logger().error(ex);
-      throw ex;
-    }
-  }
-
-  public static void stopBundle(BundleContext context, OSGiBundle bundle) throws Error, Exception
-  {
-    OM.Activator.traceStop(context);
-    if (bundle == null)
-    {
-      throw new IllegalStateException("bundle == null");
-    }
-
-    try
-    {
-      bundle.stop();
-      bundle.setBundleContext(null);
-    }
-    catch (Error error)
-    {
-      bundle.logger().error(error);
-      throw error;
-    }
-    catch (Exception ex)
-    {
-      bundle.logger().error(ex);
-      throw ex;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
deleted file mode 100644
index 08f9037d94..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-
-import java.util.concurrent.CountDownLatch;
-
-/**
- * @author Eike Stepper
- */
-public class OSGiApplication implements IApplication
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OM, OSGiApplication.class);
-
-  private String applicationID;
-
-  private IApplicationContext context;
-
-  private CountDownLatch stopLatch;
-
-  public OSGiApplication(String applicationID)
-  {
-    this.applicationID = applicationID;
-  }
-
-  public String getApplicationID()
-  {
-    return applicationID;
-  }
-
-  public IApplicationContext getApplicationContext()
-  {
-    return context;
-  }
-
-  public boolean isRunning()
-  {
-    return stopLatch != null;
-  }
-
-  public final Object start(IApplicationContext context) throws Exception
-  {
-    this.context = context;
-    traceStart(applicationID);
-
-    try
-    {
-      doStart();
-    }
-    catch (Error error)
-    {
-      OM.LOG.error(error);
-      throw error;
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      throw ex;
-    }
-
-    context.applicationRunning();
-    stopLatch = new CountDownLatch(1);
-    stopLatch.await();
-    stopLatch = null;
-    return EXIT_OK;
-  }
-
-  public final void stop()
-  {
-    traceStop(applicationID);
-
-    try
-    {
-      doStop();
-    }
-    catch (Error error)
-    {
-      OM.LOG.error(error);
-      throw error;
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-    }
-
-    context = null;
-    if (stopLatch != null)
-    {
-      stopLatch.countDown();
-    }
-  }
-
-  protected void doStart() throws Exception
-  {
-  }
-
-  protected void doStop() throws Exception
-  {
-  }
-
-  public static void traceStart(String applicationID)
-  {
-    try
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.format("Starting application {0}", applicationID);
-      }
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-
-  public static void traceStop(String applicationID)
-  {
-    try
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.format("Stopping application {0}", applicationID);
-      }
-    }
-    catch (RuntimeException ignore)
-    {
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogHandler.java
deleted file mode 100644
index 3897eaa384..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.log;
-
-import org.eclipse.net4j.util.om.log.OMLogger.Level;
-
-/**
- * @author Eike Stepper
- */
-public interface OMLogHandler
-{
-  public void logged(OMLogger logger, Level level, String msg, Throwable t);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogger.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogger.java
deleted file mode 100644
index da92e1c693..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogger.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.log;
-
-import org.eclipse.net4j.util.om.OMBundle;
-
-/**
- * @author Eike Stepper
- */
-public interface OMLogger
-{
-  public OMBundle getBundle();
-
-  public void log(Level level, String msg, Throwable t);
-
-  public void error(String msg, Throwable t);
-
-  public void warn(String msg, Throwable t);
-
-  public void info(String msg, Throwable t);
-
-  public void debug(String msg, Throwable t);
-
-  public void log(Level level, String msg);
-
-  public void error(String msg);
-
-  public void warn(String msg);
-
-  public void info(String msg);
-
-  public void debug(String msg);
-
-  public void log(Level level, Throwable t);
-
-  public void error(Throwable t);
-
-  public void warn(Throwable t);
-
-  public void info(Throwable t);
-
-  public void debug(Throwable t);
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum Level
-  {
-    ERROR, WARN, INFO, DEBUG
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/package.html
deleted file mode 100644
index 7465feddbb..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Interfaces and classes for environment independent logging.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/IllegalMonitorNestingException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/IllegalMonitorNestingException.java
deleted file mode 100644
index 92dbda2735..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/IllegalMonitorNestingException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public class IllegalMonitorNestingException extends MonitorException
-{
-  private static final long serialVersionUID = 1L;
-
-  public IllegalMonitorNestingException()
-  {
-  }
-
-  public IllegalMonitorNestingException(String s)
-  {
-    super(s);
-  }
-
-  public IllegalMonitorNestingException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public IllegalMonitorNestingException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorAlreadyBegunException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorAlreadyBegunException.java
deleted file mode 100644
index 19f44dea46..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorAlreadyBegunException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public class MonitorAlreadyBegunException extends MonitorException
-{
-  private static final long serialVersionUID = 1L;
-
-  public MonitorAlreadyBegunException()
-  {
-  }
-
-  public MonitorAlreadyBegunException(String s)
-  {
-    super(s);
-  }
-
-  public MonitorAlreadyBegunException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public MonitorAlreadyBegunException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java
deleted file mode 100644
index 92f3224f61..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public class MonitorCanceledException extends MonitorException
-{
-  private static final long serialVersionUID = 1L;
-
-  public MonitorCanceledException()
-  {
-  }
-
-  public MonitorCanceledException(String s)
-  {
-    super(s);
-  }
-
-  public MonitorCanceledException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public MonitorCanceledException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorException.java
deleted file mode 100644
index c39fb00426..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public class MonitorException extends IllegalStateException
-{
-  private static final long serialVersionUID = 1L;
-
-  public MonitorException()
-  {
-  }
-
-  public MonitorException(String s)
-  {
-    super(s);
-  }
-
-  public MonitorException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public MonitorException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorNotBegunException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorNotBegunException.java
deleted file mode 100644
index e4d31e6269..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorNotBegunException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public class MonitorNotBegunException extends MonitorException
-{
-  private static final long serialVersionUID = 1L;
-
-  public MonitorNotBegunException()
-  {
-  }
-
-  public MonitorNotBegunException(String s)
-  {
-    super(s);
-  }
-
-  public MonitorNotBegunException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public MonitorNotBegunException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorUtil.java
deleted file mode 100644
index b139567a18..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorUtil.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.om.monitor.EclipseMonitor;
-import org.eclipse.net4j.internal.util.om.monitor.LegacyMonitor;
-import org.eclipse.net4j.internal.util.om.monitor.MON;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * @author Eike Stepper
- */
-public final class MonitorUtil
-{
-  private MonitorUtil()
-  {
-  }
-
-  public static boolean isCanceled()
-  {
-    return MON.isCanceled();
-  }
-
-  public static OMMonitor begin()
-  {
-    return MON.begin(OMMonitor.UNKNOWN, null);
-  }
-
-  public static OMMonitor begin(int totalWork)
-  {
-    return MON.begin(totalWork, null);
-  }
-
-  public static OMMonitor begin(String task)
-  {
-    return MON.begin(OMMonitor.UNKNOWN, task);
-  }
-
-  public static OMMonitor begin(int totalWork, String task)
-  {
-    return MON.begin(totalWork, task);
-  }
-
-  static void handleTrace(final OMMonitorHandler messageHandler, String msg, int level, boolean isTask)
-  {
-    if (messageHandler != null)
-    {
-      try
-      {
-        if (isTask)
-        {
-          messageHandler.handleTask(msg, level);
-        }
-        else
-        {
-          messageHandler.handleMessage(msg, level);
-        }
-      }
-      catch (RuntimeException ex)
-      {
-        OM.LOG.error(ex);
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Eclipse
-  {
-    public static void startMonitoring(IProgressMonitor progressMonitor, final OMMonitorHandler messageHandler)
-    {
-      MON.startMonitoring(new EclipseMonitor(progressMonitor)
-      {
-        @Override
-        protected void trace(String msg, int level, boolean isTask)
-        {
-          super.trace(msg, level, isTask);
-          handleTrace(messageHandler, msg, level, isTask);
-        }
-      });
-    }
-
-    public static void startMonitoring(IProgressMonitor progressMonitor)
-    {
-      startMonitoring(progressMonitor, null);
-    }
-
-    public static void stopMonitoring()
-    {
-      MON.stopMonitoring();
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Legacy
-  {
-    public static void startMonitoring(final OMMonitorHandler messageHandler)
-    {
-      MON.startMonitoring(new LegacyMonitor()
-      {
-        @Override
-        protected void trace(String msg, int level, boolean isTask)
-        {
-          super.trace(msg, level, isTask);
-          handleTrace(messageHandler, msg, level, isTask);
-        }
-      });
-    }
-
-    public static void startMonitoring()
-    {
-      startMonitoring(null);
-    }
-
-    public static void stopMonitoring()
-    {
-      MON.stopMonitoring();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitoredJob.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitoredJob.java
deleted file mode 100644
index abf85017fc..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitoredJob.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.internal.util.om.monitor.MON;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-
-/**
- * @author Eike Stepper
- */
-public abstract class MonitoredJob extends Job
-{
-  private String bundleID;
-
-  public MonitoredJob(String bundleID, String name)
-  {
-    super(name);
-    this.bundleID = bundleID;
-  }
-
-  @Override
-  protected void canceling()
-  {
-    MON.setCanceled(true);
-    super.canceling();
-  }
-
-  @Override
-  protected final IStatus run(IProgressMonitor monitor)
-  {
-    MonitorUtil.Eclipse.startMonitoring(monitor);
-
-    try
-    {
-      run();
-      return Status.OK_STATUS;
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-      return new Status(IStatus.ERROR, bundleID, ex.getMessage(), ex);
-    }
-    finally
-    {
-      MonitorUtil.Eclipse.stopMonitoring();
-    }
-  }
-
-  protected abstract void run() throws Exception;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitor.java
deleted file mode 100644
index 6da225e1b5..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public interface OMMonitor
-{
-  public static final int UNKNOWN = -1;
-
-  public String getTask();
-
-  public void setTask(String task);
-
-  public int getTotalWork();
-
-  public boolean hasBegun();
-
-  public void message(String msg);
-
-  public void worked(int work, String msg);
-
-  public void worked(int work);
-
-  public void worked(String msg);
-
-  public void worked();
-
-  public void fork(int workFromParent, Runnable runnable, String msg);
-
-  public void fork(int workFromParent, Runnable runnable);
-
-  public void fork(Runnable runnable, String msg);
-
-  public void fork(Runnable runnable);
-
-  public OMSubMonitor fork(int workFromParent);
-
-  public OMSubMonitor fork();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitorHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitorHandler.java
deleted file mode 100644
index 6f7be296ea..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitorHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public interface OMMonitorHandler
-{
-  public void handleTask(String task, int level);
-
-  public void handleMessage(String msg, int level);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMSubMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMSubMonitor.java
deleted file mode 100644
index 08c0e10d58..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMSubMonitor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public interface OMSubMonitor
-{
-  public void join(String msg);
-
-  public void join();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TotalWorkExceededException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TotalWorkExceededException.java
deleted file mode 100644
index 6fbdeeb10d..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TotalWorkExceededException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.monitor;
-
-/**
- * @author Eike Stepper
- */
-public class TotalWorkExceededException extends MonitorException
-{
-  private static final long serialVersionUID = 1L;
-
-  public TotalWorkExceededException()
-  {
-  }
-
-  public TotalWorkExceededException(String s)
-  {
-    super(s);
-  }
-
-  public TotalWorkExceededException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public TotalWorkExceededException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/package.html
deleted file mode 100644
index 841b0426d9..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Interfaces and classes for environment independent progress monitoring.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/package.html
deleted file mode 100644
index 77ce765784..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Interfaces and classes for environment independent operations and maintenance (O&amp;M).
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreference.java
deleted file mode 100644
index abc14cc6d7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.pref;
-
-/**
- * @author Eike Stepper
- */
-public interface OMPreference<T>
-{
-  public OMPreferences getPreferences();
-
-  public String getName();
-
-  public Type getType();
-
-  public T getDefaultValue();
-
-  public T getValue();
-
-  public T setValue(T value);
-
-  public T unSet();
-
-  public boolean isSet();
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum Type
-  {
-    BOOLEAN, INTEGER, LONG, FLOAT, DOUBLE, STRING, ARRAY, BYTES
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
deleted file mode 100644
index 09aaf2d79b..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.pref;
-
-import org.eclipse.net4j.util.event.INotifier;
-import org.eclipse.net4j.util.om.OMBundle;
-
-/**
- * @author Eike Stepper
- */
-public interface OMPreferences extends INotifier
-{
-  public static final boolean DEFAULT_BOOLEAN = false;
-
-  public static final int DEFAULT_INTEGER = 0;
-
-  public static final long DEFAULT_LONG = 0L;
-
-  public static final float DEFAULT_FLOAT = 0.0f;
-
-  public static final double DEFAULT_DOUBLE = 0.0d;
-
-  public static final String DEFAULT_STRING = "";
-
-  public static final String[] DEFAULT_ARRAY = {};
-
-  public static final byte[] DEFAULT_BYTES = {};
-
-  public OMBundle getBundle();
-
-  public boolean isDirty();
-
-  public void save();
-
-  public OMPreference<Boolean> init(String name, boolean defaultValue);
-
-  public OMPreference<Integer> init(String name, int defaultValue);
-
-  public OMPreference<Long> init(String name, long defaultValue);
-
-  public OMPreference<Float> init(String name, float defaultValue);
-
-  public OMPreference<Double> init(String name, double defaultValue);
-
-  public OMPreference<String> init(String name, String defaultValue);
-
-  public OMPreference<String[]> init(String name, String[] defaultValue);
-
-  public OMPreference<byte[]> init(String name, byte[] defaultValue);
-
-  public OMPreference<Boolean> initBoolean(String name);
-
-  public OMPreference<Integer> initInteger(String name);
-
-  public OMPreference<Long> initLong(String name);
-
-  public OMPreference<Float> initFloat(String name);
-
-  public OMPreference<Double> initDouble(String name);
-
-  public OMPreference<String> initString(String name);
-
-  public OMPreference<String[]> initArray(String name);
-
-  public OMPreference<byte[]> initBytes(String name);
-
-  public boolean contains(String name);
-
-  public OMPreference<?> get(String name);
-
-  public OMPreference<Boolean> getBoolean(String name);
-
-  public OMPreference<Integer> getInteger(String name);
-
-  public OMPreference<Long> getLong(String name);
-
-  public OMPreference<Float> getFloat(String name);
-
-  public OMPreference<Double> getDouble(String name);
-
-  public OMPreference<String> getString(String name);
-
-  public OMPreference<String[]> getArray(String name);
-
-  public OMPreference<byte[]> getBytes(String name);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java
deleted file mode 100644
index 3eafc6fad9..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.pref;
-
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Eike Stepper
- */
-public interface OMPreferencesChangeEvent<T> extends IEvent
-{
-  public OMPreference<T> getPreference();
-
-  public T getOldValue();
-
-  public T getNewValue();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/package.html
deleted file mode 100644
index 1cf8d695fd..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Interfaces and classes for environment independent preference management.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandler.java
deleted file mode 100644
index e9368cb7f3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.trace;
-
-/**
- * @author Eike Stepper
- */
-public interface OMTraceHandler
-{
-  public void traced(OMTraceHandlerEvent event);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java
deleted file mode 100644
index 348afc6a9a..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.trace;
-
-/**
- * @author Eike Stepper
- */
-public interface OMTraceHandlerEvent
-{
-  public long getTimeStamp();
-
-  public OMTracer getTracer();
-
-  public Class<?> getContext();
-
-  public String getMessage();
-
-  public Throwable getThrowable();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
deleted file mode 100644
index ea78f467e2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.om.trace;
-
-import org.eclipse.net4j.util.om.OMBundle;
-
-/**
- * @author Eike Stepper
- */
-public interface OMTracer
-{
-  public OMBundle getBundle();
-
-  public OMTracer getParent();
-
-  public String getName();
-
-  public String getFullName();
-
-  public boolean isEnabled();
-
-  public void setEnabled(boolean enabled);
-
-  public void trace(OMTraceHandlerEvent traceRecord);
-
-  public OMTraceHandlerEvent format(Class<?> context, String pattern, Object... args);
-
-  public OMTraceHandlerEvent format(Class<?> context, String pattern, Throwable t, Object... args);
-
-  public OMTraceHandlerEvent trace(Class<?> context, String msg, Throwable t);
-
-  public OMTraceHandlerEvent trace(Class<?> context, String msg);
-
-  public OMTraceHandlerEvent trace(Class<?> context, Throwable t);
-
-  public OMTracer tracer(String name);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/package.html
deleted file mode 100644
index 735df4ada7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Interfaces and classes for environment independent tracing.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/package.html
deleted file mode 100644
index 00377b0855..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Utility classes.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java
deleted file mode 100644
index 65c5acc0d8..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ref;
-
-import java.lang.ref.PhantomReference;
-import java.lang.ref.ReferenceQueue;
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class KeyedPhantomReference<K, T> extends PhantomReference<T> implements KeyedReference<K, T>
-{
-  private K key;
-
-  public KeyedPhantomReference(K key, T ref, ReferenceQueue<T> queue)
-  {
-    super(ref, queue);
-    this.key = key;
-  }
-
-  public ReferenceType getType()
-  {
-    return ReferenceType.PHANTOM;
-  }
-
-  public K getKey()
-  {
-    return key;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("KeyedPhantomReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java
deleted file mode 100644
index d91a63d65a..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ref;
-
-import java.lang.ref.Reference;
-
-/**
- * @see Reference
- * @author Eike Stepper
- */
-public interface KeyedReference<K, T>
-{
-  public ReferenceType getType();
-
-  public K getKey();
-
-  /**
-   * @see Reference#get()
-   */
-  public T get();
-
-  /**
-   * @see Reference#clear()
-   */
-  public void clear();
-
-  /**
-   * @see Reference#isEnqueued()
-   */
-  public boolean isEnqueued();
-
-  /**
-   * @see Reference#enqueue()
-   */
-  public boolean enqueue();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java
deleted file mode 100644
index 721a83c9a8..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ref;
-
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class KeyedSoftReference<K, T> extends SoftReference<T> implements KeyedReference<K, T>
-{
-  private K key;
-
-  public KeyedSoftReference(K key, T ref)
-  {
-    super(ref);
-    this.key = key;
-  }
-
-  public KeyedSoftReference(K key, T ref, ReferenceQueue<T> queue)
-  {
-    super(ref, queue);
-    this.key = key;
-  }
-
-  public ReferenceType getType()
-  {
-    return ReferenceType.SOFT;
-  }
-
-  public K getKey()
-  {
-    return key;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("KeyedSoftReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java
deleted file mode 100644
index d8c5071e83..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ref;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class KeyedStrongReference<K, T> implements KeyedReference<K, T>
-{
-  private K key;
-
-  private T ref;
-
-  public KeyedStrongReference(K key, T ref)
-  {
-    this.key = key;
-    this.ref = ref;
-  }
-
-  public ReferenceType getType()
-  {
-    return ReferenceType.STRONG;
-  }
-
-  public K getKey()
-  {
-    return key;
-  }
-
-  public T get()
-  {
-    return ref;
-  }
-
-  public void clear()
-  {
-    ref = null;
-  }
-
-  public boolean isEnqueued()
-  {
-    return false;
-  }
-
-  public boolean enqueue()
-  {
-    return false;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("KeyedStrongReference[{0} -> {1}]", key, ref);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java
deleted file mode 100644
index b20029ded1..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ref;
-
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class KeyedWeakReference<K, T> extends WeakReference<T> implements KeyedReference<K, T>
-{
-  private K key;
-
-  public KeyedWeakReference(K key, T ref)
-  {
-    super(ref);
-    this.key = key;
-  }
-
-  public KeyedWeakReference(K key, T ref, ReferenceQueue<T> queue)
-  {
-    super(ref, queue);
-    this.key = key;
-  }
-
-  public ReferenceType getType()
-  {
-    return ReferenceType.WEAK;
-  }
-
-  public K getKey()
-  {
-    return key;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("KeyedWeakReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get());
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceType.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceType.java
deleted file mode 100644
index 2ee8adad51..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceType.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ref;
-
-/**
- * @author Eike Stepper
- */
-public enum ReferenceType
-{
-  STRONG, SOFT, WEAK, PHANTOM;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java
deleted file mode 100644
index 0c65251985..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.ref;
-
-import org.eclipse.net4j.util.collection.MapEntry;
-
-import java.lang.ref.ReferenceQueue;
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * A {@link ConcurrentMap} implementation that uses {@link KeyedReference} instances ({@link KeyedStrongReference},
- * {@link KeyedSoftReference}, {@link KeyedWeakReference} or {@link KeyedPhantomReference}) as its values.
- * <p>
- * A <code>ReferenceValueMap</code> can be used to cache mappings until the <em>value</em> of the mapping is no
- * longer reachable from outside of the map
- * <p>
- * <b>Note:</b> This map is not synchronized. If it is to be used by multiple threads concurrently the user is
- * responsible for applying proper external synchronization!
- * 
- * @author Eike Stepper
- */
-public abstract class ReferenceValueMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V>
-{
-  private ConcurrentMap<K, KeyedReference<K, V>> map;
-
-  private ReferenceQueue<V> queue;
-
-  private EntrySet entrySet;
-
-  public ReferenceValueMap()
-  {
-    this(new ConcurrentHashMap<K, KeyedReference<K, V>>());
-  }
-
-  public ReferenceValueMap(ConcurrentMap<K, KeyedReference<K, V>> map)
-  {
-    if (!map.isEmpty())
-    {
-      throw new IllegalArgumentException("!map.isEmpty()");
-    }
-
-    this.map = map;
-    queue = createQueue();
-  }
-
-  @Override
-  public int size()
-  {
-    purgeQueue();
-    return map.size();
-  }
-
-  @Override
-  public boolean isEmpty()
-  {
-    purgeQueue();
-    return map.isEmpty();
-  }
-
-  @Override
-  public boolean containsKey(Object key)
-  {
-    KeyedReference<K, V> ref = map.get(key);
-    if (ref != null)
-    {
-      if (ref.get() == null)
-      {
-        // ref.enqueue();
-        return false;
-      }
-
-      return true;
-    }
-
-    return false;
-  }
-
-  @Override
-  public boolean containsValue(Object value)
-  {
-    if (value == null)
-    {
-      throw new IllegalArgumentException("value == null");
-    }
-
-    for (KeyedReference<K, V> ref : map.values())
-    {
-      V v = ref.get();
-      if (v == null)
-      {
-        // ref.enqueue();
-        return false;
-      }
-
-      if (value.equals(v))
-      {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  @Override
-  public V get(Object key)
-  {
-    KeyedReference<K, V> ref = map.get(key);
-    return dereference(ref);
-  }
-
-  @Override
-  public V put(K key, V value)
-  {
-    try
-    {
-      KeyedReference<K, V> ref = createReference(key, value, queue);
-      KeyedReference<K, V> oldRef = map.put(key, ref);
-      return dereference(oldRef);
-    }
-    finally
-    {
-      purgeQueue();
-    }
-  }
-
-  public V putIfAbsent(K key, V value)
-  {
-    try
-    {
-      KeyedReference<K, V> ref = createReference(key, value, queue);
-      KeyedReference<K, V> oldRef = map.putIfAbsent(key, ref);
-      return dereference(oldRef);
-    }
-    finally
-    {
-      purgeQueue();
-    }
-  }
-
-  public V replace(K key, V value)
-  {
-    try
-    {
-      KeyedReference<K, V> ref = createReference(key, value, queue);
-      KeyedReference<K, V> oldRef = map.replace(key, ref);
-      return dereference(oldRef);
-    }
-    finally
-    {
-      purgeQueue();
-    }
-  }
-
-  public boolean replace(K key, V oldValue, V newValue)
-  {
-    try
-    {
-      // TODO Consider a dummy KeyedReference class for oldRef
-      KeyedReference<K, V> oldRef = createReference(key, oldValue, queue);
-      KeyedReference<K, V> newRef = createReference(key, newValue, queue);
-      return map.replace(key, oldRef, newRef);
-    }
-    finally
-    {
-      purgeQueue();
-    }
-  }
-
-  @Override
-  public V remove(Object key)
-  {
-    KeyedReference<K, V> ref = map.remove(key);
-    return dereference(ref);
-  }
-
-  public boolean remove(Object key, Object value)
-  {
-    // TODO Consider a dummy KeyedReference class for value
-    return map.remove(key, value);
-  }
-
-  @Override
-  public void clear()
-  {
-    purgeQueue();
-    map.clear();
-  }
-
-  @Override
-  public Set<Map.Entry<K, V>> entrySet()
-  {
-    if (entrySet == null)
-    {
-      purgeQueue();
-      entrySet = new EntrySet();
-    }
-
-    return entrySet;
-  }
-
-  protected ReferenceQueue<V> createQueue()
-  {
-    return new ReferenceQueue<V>();
-  }
-
-  @SuppressWarnings("unchecked")
-  protected void purgeQueue()
-  {
-    if (queue != null)
-    {
-      KeyedReference<K, V> ref;
-      while ((ref = (KeyedReference<K, V>)queue.poll()) != null)
-      {
-        // Slightly faster than map.get() + map.remove()
-        map.remove(ref.getKey(), ref);
-      }
-    }
-  }
-
-  protected V dereference(KeyedReference<K, V> ref)
-  {
-    if (ref == null)
-    {
-      return null;
-    }
-
-    return ref.get();
-  }
-
-  protected abstract KeyedReference<K, V> createReference(K key, V value, ReferenceQueue<V> queue);
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class Strong<K, V> extends ReferenceValueMap<K, V>
-  {
-    public Strong()
-    {
-    }
-
-    public Strong(ConcurrentMap<K, KeyedReference<K, V>> map)
-    {
-      super(map);
-    }
-
-    @Override
-    protected KeyedReference<K, V> createReference(K key, V value, ReferenceQueue<V> queue)
-    {
-      return new KeyedStrongReference<K, V>(key, value);
-    }
-
-    @Override
-    protected ReferenceQueue<V> createQueue()
-    {
-      return null;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class Soft<K, V> extends ReferenceValueMap<K, V>
-  {
-    public Soft()
-    {
-    }
-
-    public Soft(ConcurrentMap<K, KeyedReference<K, V>> map)
-    {
-      super(map);
-    }
-
-    @Override
-    protected KeyedReference<K, V> createReference(K key, V value, ReferenceQueue<V> queue)
-    {
-      return new KeyedSoftReference<K, V>(key, value, queue);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static class Weak<K, V> extends ReferenceValueMap<K, V>
-  {
-    public Weak()
-    {
-    }
-
-    public Weak(ConcurrentMap<K, KeyedReference<K, V>> map)
-    {
-      super(map);
-    }
-
-    @Override
-    protected KeyedReference<K, V> createReference(K key, V value, ReferenceQueue<V> queue)
-    {
-      return new KeyedWeakReference<K, V>(key, value, queue);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private class EntrySet extends AbstractSet<Map.Entry<K, V>>
-  {
-    public EntrySet()
-    {
-    }
-
-    @Override
-    public int size()
-    {
-      return map.size();
-    }
-
-    @Override
-    public boolean isEmpty()
-    {
-      return map.isEmpty();
-    }
-
-    @Override
-    public boolean contains(Object object)
-    {
-      if (object == null)
-      {
-        throw new IllegalArgumentException("object == null");
-      }
-
-      if (object instanceof Map.Entry<?, ?>)
-      {
-        Map.Entry<?, ?> entry = (Map.Entry<?, ?>)object;
-        Object key = entry.getKey();
-        Object value = entry.getValue();
-        return key != null && value != null && value.equals(get(key));
-      }
-
-      return false;
-    }
-
-    @Override
-    public Iterator<Map.Entry<K, V>> iterator()
-    {
-      return new EntrySetIterator();
-    }
-
-    @Override
-    public Object[] toArray()
-    {
-      Object[] a = new Object[size()];
-      int i = 0;
-      for (Map.Entry<K, V> entry : this)
-      {
-        a[i++] = entry;
-      }
-
-      return a;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> T[] toArray(T[] a)
-    {
-      if (a == null)
-      {
-        throw new IllegalArgumentException("array == null");
-      }
-
-      int size = size();
-      if (a.length < size)
-      {
-        a = (T[])java.lang.reflect.Array.newInstance(a.getClass().getComponentType(), size);
-      }
-
-      int i = 0;
-      for (Map.Entry<K, V> entry : this)
-      {
-        a[i++] = (T)entry;
-      }
-
-      if (a.length > size)
-      {
-        a[size] = null;
-      }
-
-      return a;
-    }
-
-    @Override
-    public boolean remove(Object object)
-    {
-      if (object == null)
-      {
-        throw new IllegalArgumentException("object == null");
-      }
-
-      if (object instanceof Map.Entry<?, ?>)
-      {
-        Map.Entry<?, ?> entry = (Map.Entry<?, ?>)object;
-        return map.remove(entry.getKey(), entry.getValue());
-      }
-
-      return false;
-    }
-
-    @Override
-    public void clear()
-    {
-      map.clear();
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private class EntrySetIterator implements Iterator<Map.Entry<K, V>>
-  {
-    private Iterator<Entry<K, KeyedReference<K, V>>> it = map.entrySet().iterator();
-
-    private MapEntry<K, V> nextEntry;
-
-    private K lastKey;
-
-    public EntrySetIterator()
-    {
-    }
-
-    public boolean hasNext()
-    {
-      if (nextEntry != null)
-      {
-        return true;
-      }
-
-      while (it.hasNext())
-      {
-        Entry<K, KeyedReference<K, V>> entry = it.next();
-        lastKey = entry.getKey();
-        V value = dereference(entry.getValue());
-        if (value != null)
-        {
-          nextEntry = new MapEntry<K, V>(lastKey, value);
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    public Entry<K, V> next()
-    {
-      if (nextEntry == null)
-      {
-        if (!hasNext())
-        {
-          throw new NoSuchElementException();
-        }
-      }
-
-      try
-      {
-        return nextEntry;
-      }
-      finally
-      {
-        nextEntry = null;
-      }
-    }
-
-    public void remove()
-    {
-      if (lastKey == null)
-      {
-        throw new IllegalStateException("lastKey == null");
-      }
-
-      map.remove(lastKey);
-      lastKey = null;
-      nextEntry = null;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistry.java
deleted file mode 100644
index 7b23898231..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistry.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.registry;
-
-import org.eclipse.net4j.util.container.IContainer;
-
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public interface IRegistry<K, V> extends Map<K, V>, IContainer<Map.Entry<K, V>>
-{
-  public boolean isAutoCommit();
-
-  public void setAutoCommit(boolean on);
-
-  public void commit(boolean notifications);
-
-  public void commit();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
deleted file mode 100644
index df8c7be09b..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.registry;
-
-import org.eclipse.net4j.internal.util.registry.UnmodifiableRegistry;
-
-/**
- * @author Eike Stepper
- */
-public final class RegistryUtil
-{
-  private RegistryUtil()
-  {
-  }
-
-  public <K, V> IRegistry<K, V> unmodifiableRegistry(IRegistry<K, V> registry)
-  {
-    if (registry instanceof UnmodifiableRegistry)
-    {
-      return registry;
-    }
-
-    return new UnmodifiableRegistry<K, V>(registry);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/package.html
deleted file mode 100644
index a012d849fb..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/package.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-Interfaces and classes for general purpose registries.
-A registry is like a <code>Map</code> but has some additional features:
-<ul>
-  <li>It provides a descriptor framework for registry elements that 
-  	  are to be instantiated lazily 
-  <li>It provides a notification framework that enables clients to 
-      react on events (including the resolution of a lazy descriptor)
-<ul>
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IChallengeResponse.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IChallengeResponse.java
deleted file mode 100644
index 5097308af0..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IChallengeResponse.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-/**
- * @author Eike Stepper
- */
-public interface IChallengeResponse
-{
-  public static final byte ACKNOWLEDGE_SUCCESS = 1;
-
-  public static final byte ACKNOWLEDGE_FAILURE = 0;
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum State
-  {
-    INITIAL, CHALLENGE, RESPONSE, SUCCESS, FAILURE
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum Event
-  {
-    START, BUFFER
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentials.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentials.java
deleted file mode 100644
index 84823b6534..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentials.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-/**
- * @author Eike Stepper
- */
-public interface ICredentials
-{
-  public String getUserID();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentialsProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentialsProvider.java
deleted file mode 100644
index 45a14ed9c2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentialsProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-/**
- * @author Eike Stepper
- */
-public interface ICredentialsProvider
-{
-  public boolean isInteractive();
-
-  public ICredentials getCredentials();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiationContext.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiationContext.java
deleted file mode 100644
index ec6d722eb3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiationContext.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-import java.nio.ByteBuffer;
-
-/**
- * @author Eike Stepper
- */
-public interface INegotiationContext
-{
-  public ByteBuffer getBuffer();
-
-  public void transmitBuffer(ByteBuffer buffer);
-
-  public Receiver getReceiver();
-
-  public void setReceiver(Receiver receiver);
-
-  public Enum<?> getState();
-
-  public void setState(Enum<?> state);
-
-  public void setUserID(String userID);
-
-  public void setFinished(boolean success);
-
-  public Object getInfo();
-
-  public void setInfo(Object info);
-
-  /**
-   * @author Eike Stepper
-   */
-  public interface Receiver
-  {
-    public void receiveBuffer(INegotiationContext context, ByteBuffer buffer);
-  }
-
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiator.java
deleted file mode 100644
index 61c2d5554f..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-/**
- * @author Eike Stepper
- */
-public interface INegotiator
-{
-  public void negotiate(INegotiationContext context);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentials.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentials.java
deleted file mode 100644
index e712cfee44..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentials.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-/**
- * @author Eike Stepper
- */
-public interface IPasswordCredentials extends ICredentials
-{
-  public String getUserID();
-
-  public char[] getPassword();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsProvider.java
deleted file mode 100644
index bcb49521a3..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-/**
- * @author Eike Stepper
- */
-public interface IPasswordCredentialsProvider extends ICredentialsProvider
-{
-  public IPasswordCredentials getCredentials();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IRandomizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IRandomizer.java
deleted file mode 100644
index ca2f7b4129..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IRandomizer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-/**
- * @author Eike Stepper
- */
-public interface IRandomizer
-{
-  public boolean nextBoolean();
-
-  public double nextDouble();
-
-  public float nextFloat();
-
-  public double nextGaussian();
-
-  public int nextInt();
-
-  public int nextInt(int n);
-
-  public long nextLong();
-
-  public byte[] generateSeed(int numBytes);
-
-  public void nextBytes(byte[] bytes);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserManager.java
deleted file mode 100644
index ea4a35b407..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserManager.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-/**
- * @author Eike Stepper
- */
-public interface IUserManager
-{
-  public void addUser(String userID, char[] password);
-
-  public void removeUser(String userID);
-
-  public byte[] encrypt(String userID, byte[] data, String algorithmName) throws SecurityException;
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
deleted file mode 100644
index ddb773711d..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.security;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-
-/**
- * @author Eike Stepper
- */
-public final class SecurityUtil
-{
-  public static final String PBE_WITH_MD5_AND_DES = "PBEWithMD5AndDES";
-
-  private SecurityUtil()
-  {
-  }
-
-  public static byte[] encrypt(byte[] data, char[] password, String algorithmName) throws NoSuchAlgorithmException,
-      InvalidKeySpecException, NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException,
-      IllegalBlockSizeException, BadPaddingException
-  {
-    // Salt
-    final byte[] salt = { (byte)0xc7, (byte)0x73, (byte)0x21, (byte)0x8c, (byte)0x7e, (byte)0xc8, (byte)0xee,
-        (byte)0x99 }; // TODO Make configurable
-
-    // Iteration count
-    final int count = 20; // TODO Make configurable
-
-    // Create PBE parameter set
-    PBEParameterSpec pbeParamSpec = new PBEParameterSpec(salt, count);
-    PBEKeySpec pbeKeySpec = new PBEKeySpec(password);
-    SecretKeyFactory keyFac = SecretKeyFactory.getInstance(algorithmName);
-    SecretKey pbeKey = keyFac.generateSecret(pbeKeySpec);
-
-    // Create PBE Cipher
-    Cipher pbeCipher = Cipher.getInstance(algorithmName);
-
-    // Initialize PBE Cipher with key and parameters
-    pbeCipher.init(Cipher.ENCRYPT_MODE, pbeKey, pbeParamSpec);
-
-    return pbeCipher.doFinal(data);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransaction.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransaction.java
deleted file mode 100644
index c4118dca89..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransaction.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.transaction;
-
-/**
- * @author Eike Stepper
- */
-public interface ITransaction<CONTEXT>
-{
-  public boolean isActive();
-
-  public CONTEXT getContext();
-
-  public void execute(ITransactionalOperation<CONTEXT> operation) throws TransactionException;
-
-  public void commit();
-
-  public void rollback();
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransactionalOperation.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransactionalOperation.java
deleted file mode 100644
index 7cdef365f7..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransactionalOperation.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.transaction;
-
-/**
- * @author Eike Stepper
- */
-public interface ITransactionalOperation<CONTEXT>
-{
-  public void phase1(CONTEXT context) throws Exception;
-
-  public void phase2(CONTEXT context);
-
-  public void undoPhase1(CONTEXT context);
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionException.java
deleted file mode 100644
index 5fea066300..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.transaction;
-
-/**
- * @author Eike Stepper
- */
-public class TransactionException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public TransactionException()
-  {
-  }
-
-  public TransactionException(String message)
-  {
-    super(message);
-  }
-
-  public TransactionException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public TransactionException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java
deleted file mode 100644
index 356fb835dd..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.util.transaction;
-
-import org.eclipse.net4j.internal.util.transaction.Transaction;
-
-/**
- * @author Eike Stepper
- */
-public final class TransactionUtil
-{
-  private TransactionUtil()
-  {
-  }
-
-  public static <CONTEXT> ITransaction<CONTEXT> createTransaction(CONTEXT context)
-  {
-    return new Transaction<CONTEXT>(context);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/package.html
deleted file mode 100644
index d58f8b34e2..0000000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-A framework for transactional operations.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j/.classpath b/plugins/org.eclipse.net4j/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.net4j/.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/.cvsignore b/plugins/org.eclipse.net4j/.cvsignore
deleted file mode 100644
index 25b27ca2f0..0000000000
--- a/plugins/org.eclipse.net4j/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-doc
-.ispace
diff --git a/plugins/org.eclipse.net4j/.options b/plugins/org.eclipse.net4j/.options
deleted file mode 100644
index 9d659517f5..0000000000
--- a/plugins/org.eclipse.net4j/.options
+++ /dev/null
@@ -1,12 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.net4j/debug = true
-org.eclipse.net4j/debug.buffer = true
-org.eclipse.net4j/debug.buffer.stream = false
-org.eclipse.net4j/debug.channel = true
-org.eclipse.net4j/debug.selector = true
-org.eclipse.net4j/debug.acceptor = true
-org.eclipse.net4j/debug.connector = true
-org.eclipse.net4j/debug.signal = true
-
-org.eclipse.net4j/set.signal.thread.name = false
diff --git a/plugins/org.eclipse.net4j/.project b/plugins/org.eclipse.net4j/.project
deleted file mode 100644
index fd0305df1a..0000000000
--- a/plugins/org.eclipse.net4j/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.net4j</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.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 27ec6f8d05..0000000000
--- a/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,271 +0,0 @@
-#Sat Feb 23 10:42:01 CET 2008
-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.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-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_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_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_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.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=true
-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.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.format_guardian_clause_on_one_line=false
-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_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_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_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_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_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_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_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.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=true
-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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index a19b2908d2..0000000000
--- a/plugins/org.eclipse.net4j/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,66 +0,0 @@
-#Sat Feb 23 10:42:01 CET 2008
-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_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_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
-formatter_profile=_EMFT
-formatter_settings_version=11
-internal.default.compliance=default
-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 - 2008 Eike Stepper, Germany.\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>
diff --git a/plugins/org.eclipse.net4j/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.net4j/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 7f1832044c..0000000000
--- a/plugins/org.eclipse.net4j/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.net4j/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.net4j/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index e72b02b02f..0000000000
--- a/plugins/org.eclipse.net4j/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Mar 09 19:15:26 CET 2008
-commit.comment.template=[${task.id}]  ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
deleted file mode 100644
index dc4f4f703f..0000000000
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.net4j;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.internal.net4j.bundle.OM$Activator
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.net4j.util;visibility:=reexport
-Export-Package: org.eclipse.internal.net4j;version="0.8.0",
- org.eclipse.internal.net4j.acceptor;version="0.8.0",
- org.eclipse.internal.net4j.buffer;version="0.8.0",
- org.eclipse.internal.net4j.bundle;version="0.8.0";x-internal:=true,
- org.eclipse.internal.net4j.channel;version="0.8.0",
- org.eclipse.internal.net4j.connector;version="0.8.0",
- org.eclipse.internal.net4j.protocol;version="0.8.0",
- org.eclipse.net4j;version="0.8.0",
- org.eclipse.net4j.acceptor;version="0.8.0",
- org.eclipse.net4j.buffer;version="0.8.0",
- org.eclipse.net4j.channel;version="0.8.0",
- org.eclipse.net4j.connector;version="0.8.0",
- org.eclipse.net4j.protocol;version="0.8.0",
- org.eclipse.net4j.signal;version="0.8.0",
- org.eclipse.net4j.signal.failover;version="0.8.0",
- org.eclipse.net4j.signal.wrapping;version="0.8.0"
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j/about.html b/plugins/org.eclipse.net4j/about.html
deleted file mode 100644
index f2decc3a0d..0000000000
--- a/plugins/org.eclipse.net4j/about.html
+++ /dev/null
@@ -1,70 +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>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-
-  <head>
-
-    <meta content="text/html; charset=ISO-8859-1"
-     http-equiv="Content-Type"/>
-
-    <title>About</title>
-
-  </head>
-
-  <body lang="EN-US">
-
-    <h2>About This Content</h2>
-
-    <p>May 17, 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&apos;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.</p>
-
-  </body>
-
-</html>
-
diff --git a/plugins/org.eclipse.net4j/about.ini b/plugins/org.eclipse.net4j/about.ini
deleted file mode 100644
index b7e87ca285..0000000000
--- a/plugins/org.eclipse.net4j/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/about.mappings b/plugins/org.eclipse.net4j/about.mappings
deleted file mode 100644
index bddaab4310..0000000000
--- a/plugins/org.eclipse.net4j/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/about.properties b/plugins/org.eclipse.net4j/about.properties
deleted file mode 100644
index 85655fd426..0000000000
--- a/plugins/org.eclipse.net4j/about.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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 (Incubation)
-featureText = Net4j \n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2008 Eike Stepper, Germany. All rights reserved.\n\
-\n\
-Visit http://wiki.eclipse.org/Net4j
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j/build.properties b/plugins/org.eclipse.net4j/build.properties
deleted file mode 100644
index e4b9c17dbb..0000000000
--- a/plugins/org.eclipse.net4j/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               .options,\
-               about.html,\
-               copyright.txt,\
-               epl-v10.html,\
-               license.html,\
-               plugin.xml,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
diff --git a/plugins/org.eclipse.net4j/copyright.txt b/plugins/org.eclipse.net4j/copyright.txt
deleted file mode 100644
index 529118d99e..0000000000
--- a/plugins/org.eclipse.net4j/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-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
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j/epl-v10.html b/plugins/org.eclipse.net4j/epl-v10.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j/epl-v10.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j/javadoc.xml b/plugins/org.eclipse.net4j/javadoc.xml
deleted file mode 100644
index 871a94aa07..0000000000
--- a/plugins/org.eclipse.net4j/javadoc.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="javadoc">
-	<target name="javadoc">
-		<javadoc access="protected"
-		         author="true"
-		         classpath="C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.equinox.preferences_3.2.100.v20070312.jar;C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.core.contenttype_3.2.100.v20070319.jar;C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.equinox.registry_3.3.0.v20070318.jar;C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.core.jobs_3.3.0.v20070319.jar;C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.core.runtime_3.3.100.v20070319.jar;C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316\runtime_registry_compatibility.jar;C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.equinox.app_1.0.0.v20070318.jar;C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.osgi.services_3.1.100.v20060918.jar;C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.equinox.common_3.3.0.v20070318.jar;C:\develop\eclipse-3.3\eclipse\plugins\org.eclipse.osgi_3.3.0.v20070321.jar"
-		         destdir="doc"
-		         nodeprecated="false"
-		         nodeprecatedlist="false"
-		         noindex="false"
-		         nonavbar="false"
-		         notree="false"
-		         packagenames="org.eclipse.net4j.util.stream,org.eclipse.net4j.util.lifecycle,org.eclipse.net4j.util.om.log,org.eclipse.net4j.transport,org.eclipse.net4j.util.container.delegate,org.eclipse.net4j.remote,org.eclipse.net4j.util,org.eclipse.net4j.util.concurrent,org.eclipse.net4j.signal,org.eclipse.net4j.user,org.eclipse.net4j.util.om.trace,org.eclipse.net4j.util.registry,org.eclipse.net4j.util.factory,org.eclipse.net4j.stream,org.eclipse.net4j.message,org.eclipse.net4j.util.container,org.eclipse.net4j.util.event,org.eclipse.net4j.util.om"
-		         source="1.5"
-		         sourcepath="src"
-		         splitindex="true"
-		         use="true"
-		         version="true">
-			<link href="jar:file:/C:/develop/eclipse-3.3/eclipse/plugins/org.eclipse.platform.doc.isv_3.3.0.v20070321-1800.jar!/reference/api" />
-			<link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
-		</javadoc>
-	</target>
-</project>
diff --git a/plugins/org.eclipse.net4j/license.html b/plugins/org.eclipse.net4j/license.html
deleted file mode 100644
index d7b88e9416..0000000000
--- a/plugins/org.eclipse.net4j/license.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<meta name="ProgId" content="Word.Document">
-<meta name="Generator" content="Microsoft Word 9">
-<meta name="Originator" content="Microsoft Word 9">
-<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-
-
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style></head>
-
-<body style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear="left">
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style="font-size: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style="color: blue;"> </span></span></p>
-
-<p><span style="font-size: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style="font-size: 10pt;">For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style="font-size: 10pt;">If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class="MsoNormal"><!--[if !supportEmptyParas]-->&nbsp;<!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j/modeling32.png b/plugins/org.eclipse.net4j/modeling32.png
deleted file mode 100644
index 6b08de2ada..0000000000
--- a/plugins/org.eclipse.net4j/modeling32.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/plugin.properties b/plugins/org.eclipse.net4j/plugin.properties
deleted file mode 100644
index a1afa8a4d0..0000000000
--- a/plugins/org.eclipse.net4j/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-# 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.
-# ==============================================================================
-
-pluginName = Net4j (Incubation)
-providerName = Eclipse.org
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/org.eclipse.net4j/plugin.xml b/plugins/org.eclipse.net4j/plugin.xml
deleted file mode 100644
index e433671a5e..0000000000
--- a/plugins/org.eclipse.net4j/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<!--
-	<copyright>
-	
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-	
-	</copyright>
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.net4j.util.factories">
-      <factory
-            class="org.eclipse.internal.net4j.ExecutorServiceFactory"
-            productGroup="org.eclipse.net4j.executorServices"
-            type="default"/>
-      <factory
-            class="org.eclipse.internal.net4j.buffer.BufferProviderFactory"
-            productGroup="org.eclipse.net4j.bufferProviders"
-            type="default"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.net4j.util.elementProcessors">
-      <elementProcessor
-            class="org.eclipse.internal.net4j.Net4jTransportInjector">
-      </elementProcessor>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/DescriptionUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/DescriptionUtil.java
deleted file mode 100644
index 3e7381e0e9..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/DescriptionUtil.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j;
-
-/**
- * @author Eike Stepper
- */
-@Deprecated
-public final class DescriptionUtil
-{
-  public static final String SEPARATOR = ":"; //$NON-NLS-1$
-
-  public static final int TYPE_INDEX = 0;
-
-  private DescriptionUtil()
-  {
-  }
-
-  public static String getType(String description)
-  {
-    return getElement(description, TYPE_INDEX);
-  }
-
-  public static String getElement(String description, int index)
-  {
-    String[] elements = getElements(description);
-    return elements[index];
-  }
-
-  public static String[] getElements(String description)
-  {
-    return description.split(SEPARATOR);
-  }
-
-  public static String getDescription(String type, Object[] elements)
-  {
-    StringBuilder builder = new StringBuilder();
-    builder.append(type);
-
-    for (Object element : elements)
-    {
-      builder.append(":");
-      if (element != null)
-      {
-        builder.append(element);
-      }
-    }
-
-    return builder.toString();
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java
deleted file mode 100644
index bd04ee9824..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j;
-
-import org.eclipse.net4j.internal.util.factory.Factory;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
-/**
- * @author Eike Stepper
- */
-public class ExecutorServiceFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.executorServices";
-
-  public static final String TYPE = "default";
-
-  public static final String DEFAULT_THREAD_GROUP_NAME = "net4j";
-
-  public ExecutorServiceFactory()
-  {
-    super(PRODUCT_GROUP, TYPE);
-  }
-
-  public ExecutorService create(String threadGroupName)
-  {
-    if (threadGroupName == null)
-    {
-      threadGroupName = DEFAULT_THREAD_GROUP_NAME;
-    }
-
-    final ThreadGroup threadGroup = new ThreadGroup(threadGroupName);
-    return Executors.newCachedThreadPool(new ThreadFactory()
-    {
-      public Thread newThread(Runnable r)
-      {
-        Thread thread = new Thread(threadGroup, r);
-        thread.setDaemon(true);
-        return thread;
-      }
-    });
-  }
-
-  public static ExecutorService get(IManagedContainer container)
-  {
-    return (ExecutorService)container.getElement(PRODUCT_GROUP, TYPE, null);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java
deleted file mode 100644
index 5413a39dde..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j;
-
-import org.eclipse.net4j.acceptor.IAcceptor;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.internal.util.security.NegotiatorFactory;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.security.INegotiator;
-
-import org.eclipse.internal.net4j.acceptor.Acceptor;
-import org.eclipse.internal.net4j.acceptor.AcceptorFactory;
-import org.eclipse.internal.net4j.bundle.OM;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eike Stepper
- */
-public class Net4jConfigurator
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, Net4jConfigurator.class);
-
-  private IManagedContainer container;
-
-  public Net4jConfigurator(IManagedContainer container)
-  {
-    this.container = container;
-  }
-
-  public IManagedContainer getContainer()
-  {
-    return container;
-  }
-
-  public IAcceptor[] configure(File configFile) throws ParserConfigurationException, SAXException, IOException,
-      CoreException
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Configuring Net4j server from " + configFile.getAbsolutePath());
-    }
-
-    List<IAcceptor> acceptors = new ArrayList<IAcceptor>();
-    Document document = getDocument(configFile);
-    NodeList acceptorConfigs = document.getElementsByTagName("acceptor");
-    for (int i = 0; i < acceptorConfigs.getLength(); i++)
-    {
-      Element acceptorConfig = (Element)acceptorConfigs.item(i);
-      IAcceptor acceptor = configureAcceptor(acceptorConfig);
-      acceptors.add(acceptor);
-    }
-
-    return acceptors.toArray(new IAcceptor[acceptors.size()]);
-  }
-
-  protected IAcceptor configureAcceptor(Element acceptorConfig)
-  {
-    String type = acceptorConfig.getAttribute("type");
-    // TODO Make the following dependent on the "type" attribute value
-    String listenAddr = acceptorConfig.getAttribute("listenAddr");
-    String port = acceptorConfig.getAttribute("port");
-    String description = (listenAddr == null ? "" : listenAddr) + (port == null ? "" : ":" + port);
-    Acceptor acceptor = (Acceptor)container.getElement(AcceptorFactory.PRODUCT_GROUP, type, description);
-
-    NodeList negotiatorConfigs = acceptorConfig.getElementsByTagName("negotiator");
-    if (negotiatorConfigs.getLength() > 1)
-    {
-      throw new IllegalStateException("A maximum of one negotiator can be configured for acceptor " + acceptor);
-    }
-
-    if (negotiatorConfigs.getLength() == 1)
-    {
-      Element negotiatorConfig = (Element)negotiatorConfigs.item(0);
-      INegotiator negotiator = configureNegotiator(negotiatorConfig);
-      acceptor.setNegotiator(negotiator);
-    }
-
-    return acceptor;
-  }
-
-  protected INegotiator configureNegotiator(Element negotiatorConfig)
-  {
-    String type = negotiatorConfig.getAttribute("type");
-    String description = negotiatorConfig.getAttribute("description");
-    INegotiator negotiator = (INegotiator)container.getElement(NegotiatorFactory.PRODUCT_GROUP, type, description);
-    return negotiator;
-  }
-
-  protected Document getDocument(File configFile) throws ParserConfigurationException, SAXException, IOException
-  {
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-    DocumentBuilder builder = factory.newDocumentBuilder();
-    return builder.parse(configFile);
-  }
-
-  protected Element getStoreConfig(Element repositoryConfig)
-  {
-    NodeList storeConfigs = repositoryConfig.getElementsByTagName("store");
-    if (storeConfigs.getLength() != 1)
-    {
-      String repositoryName = repositoryConfig.getAttribute("name");
-      throw new IllegalStateException("Exactly one store must be configured for repository " + repositoryName);
-    }
-
-    return (Element)storeConfigs.item(0);
-  }
-
-  public static Map<String, String> getProperties(Element element, int levels)
-  {
-    Map<String, String> properties = new HashMap<String, String>();
-    collectProperties(element, "", properties, levels);
-    return properties;
-  }
-
-  private static void collectProperties(Element element, String prefix, Map<String, String> properties, int levels)
-  {
-    if ("property".equals(element.getNodeName()))
-    {
-      String name = element.getAttribute("name");
-      String value = element.getAttribute("value");
-      properties.put(prefix + name, value);
-      prefix += name + ".";
-    }
-
-    if (levels > 0)
-    {
-      NodeList childNodes = element.getChildNodes();
-      for (int i = 0; i < childNodes.getLength(); i++)
-      {
-        Node childNode = childNodes.item(i);
-        if (childNode instanceof Element)
-        {
-          collectProperties((Element)childNode, prefix, properties, levels - 1);
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jTransportInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jTransportInjector.java
deleted file mode 100644
index de0d2d36cc..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jTransportInjector.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j;
-
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.security.INegotiator;
-
-import org.eclipse.internal.net4j.acceptor.Acceptor;
-import org.eclipse.internal.net4j.buffer.BufferProvider;
-import org.eclipse.internal.net4j.buffer.BufferProviderFactory;
-import org.eclipse.internal.net4j.connector.Connector;
-
-import java.util.concurrent.ExecutorService;
-
-/**
- * @author Eike Stepper
- */
-public class Net4jTransportInjector implements IElementProcessor
-{
-  public static INegotiator serverNegotiator;
-
-  public static INegotiator clientNegotiator;
-
-  public Net4jTransportInjector()
-  {
-  }
-
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
-  {
-    if (element instanceof Acceptor)
-    {
-      Acceptor acceptor = (Acceptor)element;
-      processAcceptor(container, factoryType, description, acceptor);
-    }
-    else if (element instanceof Connector)
-    {
-      Connector connector = (Connector)element;
-      processConnector(container, factoryType, description, connector);
-    }
-
-    return element;
-  }
-
-  protected void processAcceptor(IManagedContainer container, String factoryType, String description, Acceptor acceptor)
-  {
-    if (acceptor.getBufferProvider() == null)
-    {
-      acceptor.setBufferProvider(getBufferProvider(container));
-    }
-
-    if (acceptor.getReceiveExecutor() == null)
-    {
-      acceptor.setReceiveExecutor(getExecutorService(container));
-    }
-
-    if (acceptor.getProtocolFactoryRegistry() == null)
-    {
-      acceptor.setProtocolFactoryRegistry(container.getFactoryRegistry());
-    }
-
-    if (acceptor.getProtocolPostProcessors() == null)
-    {
-      acceptor.setProtocolPostProcessors(container.getPostProcessors());
-    }
-
-    if (serverNegotiator != null && acceptor.getNegotiator() == null)
-    {
-      acceptor.setNegotiator(serverNegotiator);
-    }
-  }
-
-  protected void processConnector(IManagedContainer container, String factoryType, String description,
-      Connector connector)
-  {
-    if (connector.getBufferProvider() == null)
-    {
-      connector.setBufferProvider(getBufferProvider(container));
-    }
-
-    if (connector.getReceiveExecutor() == null)
-    {
-      connector.setReceiveExecutor(getExecutorService(container));
-    }
-
-    if (connector.getProtocolFactoryRegistry() == null)
-    {
-      connector.setProtocolFactoryRegistry(container.getFactoryRegistry());
-    }
-
-    if (connector.getProtocolPostProcessors() == null)
-    {
-      connector.setProtocolPostProcessors(container.getPostProcessors());
-    }
-
-    if (clientNegotiator != null && connector.isClient() && connector.getNegotiator() == null)
-    {
-      connector.setNegotiator(clientNegotiator);
-    }
-  }
-
-  protected BufferProvider getBufferProvider(IManagedContainer container)
-  {
-    return (BufferProvider)container.getElement(BufferProviderFactory.PRODUCT_GROUP, BufferProviderFactory.TYPE, null);
-  }
-
-  protected ExecutorService getExecutorService(IManagedContainer container)
-  {
-    return (ExecutorService)container.getElement(ExecutorServiceFactory.PRODUCT_GROUP, ExecutorServiceFactory.TYPE,
-        null);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/acceptor/Acceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/acceptor/Acceptor.java
deleted file mode 100644
index 088d7547af..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/acceptor/Acceptor.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.acceptor;
-
-import org.eclipse.net4j.acceptor.IAcceptor;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.util.container.Container;
-import org.eclipse.net4j.internal.util.container.LifecycleEventConverter;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.container.IContainerDelta.Kind;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.factory.IFactory;
-import org.eclipse.net4j.util.factory.IFactoryKey;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.registry.IRegistry;
-import org.eclipse.net4j.util.security.INegotiator;
-
-import org.eclipse.internal.net4j.bundle.OM;
-import org.eclipse.internal.net4j.connector.Connector;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Acceptor extends Container<IConnector> implements IAcceptor
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_ACCEPTOR, Acceptor.class);
-
-  private INegotiator negotiator;
-
-  private IBufferProvider bufferProvider;
-
-  private IRegistry<IFactoryKey, IFactory> protocolFactoryRegistry;
-
-  private List<IElementProcessor> protocolPostProcessors;
-
-  private ExecutorService receiveExecutor;
-
-  /**
-   * Is registered with each {@link IConnector} of this {@link IAcceptor}.
-   */
-  private transient IListener lifecycleEventConverter = new LifecycleEventConverter<IConnector>(this)
-  {
-    @Override
-    protected IContainerEvent<IConnector> createContainerEvent(IContainer<IConnector> container, IConnector element,
-        Kind kind)
-    {
-      return newContainerEvent(element, kind);
-    }
-  };
-
-  private Set<IConnector> acceptedConnectors = new HashSet<IConnector>(0);
-
-  public Acceptor()
-  {
-  }
-
-  public INegotiator getNegotiator()
-  {
-    return negotiator;
-  }
-
-  public void setNegotiator(INegotiator negotiator)
-  {
-    this.negotiator = negotiator;
-  }
-
-  public IBufferProvider getBufferProvider()
-  {
-    return bufferProvider;
-  }
-
-  public void setBufferProvider(IBufferProvider bufferProvider)
-  {
-    this.bufferProvider = bufferProvider;
-  }
-
-  public ExecutorService getReceiveExecutor()
-  {
-    return receiveExecutor;
-  }
-
-  public void setReceiveExecutor(ExecutorService receiveExecutor)
-  {
-    this.receiveExecutor = receiveExecutor;
-  }
-
-  public IRegistry<IFactoryKey, IFactory> getProtocolFactoryRegistry()
-  {
-    return protocolFactoryRegistry;
-  }
-
-  public void setProtocolFactoryRegistry(IRegistry<IFactoryKey, IFactory> protocolFactoryRegistry)
-  {
-    this.protocolFactoryRegistry = protocolFactoryRegistry;
-  }
-
-  public List<IElementProcessor> getProtocolPostProcessors()
-  {
-    return protocolPostProcessors;
-  }
-
-  public void setProtocolPostProcessors(List<IElementProcessor> protocolPostProcessors)
-  {
-    this.protocolPostProcessors = protocolPostProcessors;
-  }
-
-  public IConnector[] getAcceptedConnectors()
-  {
-    synchronized (acceptedConnectors)
-    {
-      return acceptedConnectors.toArray(new IConnector[acceptedConnectors.size()]);
-    }
-  }
-
-  @Override
-  public boolean isEmpty()
-  {
-    return acceptedConnectors.isEmpty();
-  }
-
-  public IConnector[] getElements()
-  {
-    return getAcceptedConnectors();
-  }
-
-  public void prepareConnector(Connector connector)
-  {
-    connector.setNegotiator(negotiator);
-    connector.setBufferProvider(bufferProvider);
-    connector.setReceiveExecutor(receiveExecutor);
-    connector.setProtocolFactoryRegistry(protocolFactoryRegistry);
-    connector.setProtocolPostProcessors(protocolPostProcessors);
-  }
-
-  public void addConnector(Connector connector)
-  {
-    synchronized (acceptedConnectors)
-    {
-      acceptedConnectors.add(connector);
-    }
-
-    connector.addListener(lifecycleEventConverter);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Added connector " + connector); //$NON-NLS-1$
-    }
-
-    fireElementAddedEvent(connector);
-  }
-
-  public void removeConnector(IConnector connector)
-  {
-    connector.removeListener(lifecycleEventConverter);
-    synchronized (acceptedConnectors)
-    {
-      acceptedConnectors.remove(connector);
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Removed connector " + connector); //$NON-NLS-1$
-    }
-
-    fireElementRemovedEvent(connector);
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (bufferProvider == null)
-    {
-      throw new IllegalStateException("bufferProvider == null"); //$NON-NLS-1$
-    }
-
-    if (protocolFactoryRegistry == null && TRACER.isEnabled())
-    {
-      // Just a reminder during development
-      TRACER.trace("factoryRegistry == null"); //$NON-NLS-1$
-    }
-
-    if (protocolPostProcessors == null && TRACER.isEnabled())
-    {
-      // Just a reminder during development
-      TRACER.trace("protocolPostProcessors == null"); //$NON-NLS-1$
-    }
-
-    if (receiveExecutor == null && TRACER.isEnabled())
-    {
-      // Just a reminder during development
-      TRACER.trace("receiveExecutor == null"); //$NON-NLS-1$
-    }
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    for (IConnector connector : getAcceptedConnectors())
-    {
-      LifecycleUtil.deactivate(connector);
-    }
-
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/acceptor/AcceptorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/acceptor/AcceptorFactory.java
deleted file mode 100644
index 7d95c9c96d..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/acceptor/AcceptorFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.acceptor;
-
-import org.eclipse.net4j.internal.util.factory.Factory;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AcceptorFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.acceptors";
-
-  public AcceptorFactory(String type)
-  {
-    super(PRODUCT_GROUP, type);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
deleted file mode 100644
index 5732770a48..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.buffer;
-
-import org.eclipse.net4j.buffer.BufferState;
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.HexUtil;
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.StringUtil;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.SocketChannel;
-
-/**
- * @author Eike Stepper
- */
-public class Buffer implements IBuffer
-{
-  public static final short HEADER_SIZE = 4;
-
-  private static final int EOS_OFFSET = 1;
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER, Buffer.class);
-
-  private IBufferProvider bufferProvider;
-
-  private short channelIndex;
-
-  private boolean eos;
-
-  private BufferState state = BufferState.INITIAL;
-
-  private ByteBuffer byteBuffer;
-
-  public Buffer(IBufferProvider provider, short capacity)
-  {
-    this.bufferProvider = provider;
-    byteBuffer = ByteBuffer.allocateDirect(capacity);
-  }
-
-  public boolean isEOS()
-  {
-    return eos;
-  }
-
-  public void setEOS(boolean eos)
-  {
-    this.eos = eos;
-  }
-
-  public IBufferProvider getBufferProvider()
-  {
-    return bufferProvider;
-  }
-
-  public void setBufferProvider(IBufferProvider bufferProvider)
-  {
-    this.bufferProvider = bufferProvider;
-  }
-
-  public short getChannelIndex()
-  {
-    if (state == BufferState.INITIAL || state == BufferState.READING_HEADER)
-    {
-      throw new IllegalStateException("state == " + state); //$NON-NLS-1$
-    }
-
-    return channelIndex;
-  }
-
-  public short getCapacity()
-  {
-    return (short)byteBuffer.capacity();
-  }
-
-  public ByteBuffer getByteBuffer()
-  {
-    if (state != BufferState.GETTING && state != BufferState.PUTTING)
-    {
-      throw new IllegalStateException("state == " + state); //$NON-NLS-1$
-    }
-
-    return byteBuffer;
-  }
-
-  public BufferState getState()
-  {
-    return state;
-  }
-
-  /**
-   * TODO Check for multiply released buffers?
-   */
-  public void release()
-  {
-    if (bufferProvider != null)
-    {
-      bufferProvider.retainBuffer(this);
-    }
-  }
-
-  public void clear()
-  {
-    byteBuffer.clear();
-    state = BufferState.INITIAL;
-    channelIndex = NO_CHANNEL;
-    eos = false;
-  }
-
-  public void dispose()
-  {
-    bufferProvider = null;
-    byteBuffer = null;
-  }
-
-  public ByteBuffer startGetting(SocketChannel socketChannel) throws IOException
-  {
-    if (state != BufferState.INITIAL && state != BufferState.READING_HEADER && state != BufferState.READING_BODY)
-    {
-      throw new IllegalStateException("state == " + state); //$NON-NLS-1$
-    }
-
-    if (state == BufferState.INITIAL)
-    {
-      byteBuffer.limit(Buffer.HEADER_SIZE);
-      state = BufferState.READING_HEADER;
-    }
-
-    if (state == BufferState.READING_HEADER)
-    {
-      int num = socketChannel.read(byteBuffer);
-      if (num == -1)
-      {
-        throw new ClosedChannelException();
-      }
-
-      if (byteBuffer.hasRemaining())
-      {
-        return null;
-      }
-
-      byteBuffer.flip();
-      channelIndex = byteBuffer.getShort();
-      short payloadSize = byteBuffer.getShort();
-      if (payloadSize < 0)
-      {
-        eos = true;
-        payloadSize = (short)-payloadSize;
-      }
-
-      payloadSize -= EOS_OFFSET;
-
-      byteBuffer.clear();
-      byteBuffer.limit(payloadSize);
-      state = BufferState.READING_BODY;
-    }
-
-    // state == State.READING_BODY
-    if (socketChannel.read(byteBuffer) == -1)
-    {
-      throw new ClosedChannelException();
-    }
-
-    if (byteBuffer.hasRemaining())
-    {
-      return null;
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Read " + byteBuffer.limit() + " bytes" //$NON-NLS-1$ //$NON-NLS-2$
-          + (eos ? " (EOS)" : "") + StringUtil.NL + formatContent(false)); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    byteBuffer.flip();
-    state = BufferState.GETTING;
-    return byteBuffer;
-  }
-
-  public ByteBuffer startPutting(short channelIndex)
-  {
-    if (state == BufferState.PUTTING)
-    {
-      if (channelIndex != this.channelIndex)
-      {
-        throw new IllegalArgumentException("channelIndex != this.channelIndex"); //$NON-NLS-1$
-      }
-    }
-    else if (state != BufferState.INITIAL)
-    {
-      throw new IllegalStateException("state == " + state); //$NON-NLS-1$
-    }
-    else
-    {
-      state = BufferState.PUTTING;
-      this.channelIndex = channelIndex;
-
-      byteBuffer.clear();
-      byteBuffer.position(Buffer.HEADER_SIZE);
-    }
-
-    return byteBuffer;
-  }
-
-  /**
-   * @return <code>true</code> if the buffer has been completely written, <code>false</code> otherwise.
-   */
-  public boolean write(SocketChannel socketChannel) throws IOException
-  {
-    if (state != BufferState.PUTTING && state != BufferState.WRITING)
-    {
-      throw new IllegalStateException("state == " + state); //$NON-NLS-1$
-    }
-
-    if (state == BufferState.PUTTING)
-    {
-      if (channelIndex == NO_CHANNEL)
-      {
-        throw new IllegalStateException("channelIndex == NO_CHANNEL"); //$NON-NLS-1$
-      }
-
-      int payloadSize = byteBuffer.position() - Buffer.HEADER_SIZE + EOS_OFFSET;
-      if (eos)
-      {
-        payloadSize = -payloadSize;
-      }
-
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Writing " + (Math.abs(payloadSize) - 1) + " bytes" //$NON-NLS-1$ //$NON-NLS-2$
-            + (eos ? " (EOS)" : "") + StringUtil.NL + formatContent(false)); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-
-      byteBuffer.flip();
-      byteBuffer.putShort(channelIndex);
-      byteBuffer.putShort((short)payloadSize);
-      byteBuffer.position(0);
-      state = BufferState.WRITING;
-    }
-
-    int numBytes = socketChannel.write(byteBuffer);
-    if (numBytes == -1)
-    {
-      throw new IOException("Channel closed"); //$NON-NLS-1$
-    }
-
-    if (byteBuffer.hasRemaining())
-    {
-      return false;
-    }
-
-    clear();
-    return true;
-  }
-
-  public void flip()
-  {
-    if (state != BufferState.PUTTING)
-    {
-      throw new IllegalStateException("state == " + state); //$NON-NLS-1$
-    }
-
-    byteBuffer.flip();
-    byteBuffer.position(HEADER_SIZE);
-    state = BufferState.GETTING;
-  }
-
-  @Override
-  public String toString()
-  {
-    return "Buffer@" + ReflectUtil.getID(this); //$NON-NLS-1$
-  }
-
-  @SuppressWarnings("deprecation")
-  public String formatContent(boolean showHeader)
-  {
-    final int oldPosition = byteBuffer.position();
-    final int oldLimit = byteBuffer.limit();
-
-    try
-    {
-      if (state != BufferState.GETTING)
-      {
-        byteBuffer.flip();
-      }
-
-      if (state == BufferState.PUTTING && !showHeader)
-      {
-        byteBuffer.position(HEADER_SIZE);
-      }
-
-      StringBuilder builder = new StringBuilder();
-      while (byteBuffer.hasRemaining())
-      {
-        byte b = byteBuffer.get();
-        HexUtil.appendHex(builder, b < 0 ? ~b : b);
-        builder.append(' ');
-      }
-
-      return builder.toString();
-    }
-    finally
-    {
-      byteBuffer.position(oldPosition);
-      byteBuffer.limit(oldLimit);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferFactory.java
deleted file mode 100644
index f0844daf2c..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.buffer;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public class BufferFactory extends BufferProvider
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER, BufferFactory.class);
-
-  public BufferFactory(short bufferCapacity)
-  {
-    super(bufferCapacity);
-  }
-
-  @Override
-  protected IBuffer doProvideBuffer()
-  {
-    Buffer buffer = new Buffer(this, getBufferCapacity());
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Created " + buffer); //$NON-NLS-1$
-    }
-
-    return buffer;
-  }
-
-  @Override
-  protected void doRetainBuffer(IBuffer buffer)
-  {
-    if (buffer instanceof Buffer)
-    {
-      ((Buffer)buffer).dispose();
-    }
-
-    buffer = null;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("BufferFactory[{0}]", getBufferCapacity()); //$NON-NLS-1$ 
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferPool.java
deleted file mode 100644
index a8c2387647..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferPool.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.buffer;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferPool;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.ReflectUtil.ExcludeFromDump;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.text.MessageFormat;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-/**
- * @author Eike Stepper
- */
-public class BufferPool extends BufferProvider implements IBufferPool, IBufferPool.Introspection
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER, BufferPool.class);
-
-  private final IBufferProvider provider;
-
-  private int pooledBuffers;
-
-  @ExcludeFromDump
-  private final Queue<BufferRef> buffers = new ConcurrentLinkedQueue<BufferRef>();
-
-  @ExcludeFromDump
-  private final ReferenceQueue<IBuffer> referenceQueue = new ReferenceQueue<IBuffer>();
-
-  @ExcludeFromDump
-  private Monitor monitor;
-
-  public BufferPool(IBufferProvider provider)
-  {
-    super(provider.getBufferCapacity());
-    this.provider = provider;
-  }
-
-  public IBufferProvider getProvider()
-  {
-    return provider;
-  }
-
-  public ReferenceQueue<IBuffer> getReferenceQueue()
-  {
-    return referenceQueue;
-  }
-
-  public int getPooledBuffers()
-  {
-    return pooledBuffers;
-  }
-
-  public boolean evictOne()
-  {
-    for (;;)
-    {
-      BufferRef bufferRef = buffers.poll();
-      if (bufferRef == null)
-      {
-        return false;
-      }
-
-      IBuffer buffer = bufferRef.get();
-      if (buffer != null)
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Evicting " + buffer); //$NON-NLS-1$
-        }
-
-        provider.retainBuffer(buffer);
-        --pooledBuffers;
-        return true;
-      }
-    }
-  }
-
-  public int evict(int survivors)
-  {
-    int evictedBuffers = 0;
-    while (pooledBuffers > survivors)
-    {
-      if (evictOne())
-      {
-        ++evictedBuffers;
-      }
-      else
-      {
-        break;
-      }
-    }
-
-    return evictedBuffers;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("BufferPool[{0}]", getBufferCapacity()); //$NON-NLS-1$ 
-  }
-
-  protected BufferRef createBufferRef(IBuffer buffer)
-  {
-    return new BufferRef(buffer, referenceQueue);
-  }
-
-  @Override
-  protected IBuffer doProvideBuffer()
-  {
-    IBuffer buffer = null;
-    BufferRef bufferRef = buffers.poll();
-    if (bufferRef != null)
-    {
-      buffer = bufferRef.get();
-    }
-
-    if (buffer == null)
-    {
-      buffer = provider.provideBuffer();
-      ((Buffer)buffer).setBufferProvider(this);
-    }
-    else
-    {
-      --pooledBuffers;
-    }
-
-    buffer.clear();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Obtained " + buffer); //$NON-NLS-1$
-    }
-
-    return buffer;
-  }
-
-  @Override
-  protected void doRetainBuffer(IBuffer buffer)
-  {
-    if (buffer.getCapacity() != getBufferCapacity())
-    {
-      throw new IllegalArgumentException("buffer.getCapacity() != getBufferCapacity()"); //$NON-NLS-1$
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Retaining " + buffer); //$NON-NLS-1$
-    }
-
-    BufferRef bufferRef = createBufferRef(buffer);
-    buffers.add(bufferRef);
-    ++pooledBuffers;
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    monitor = new Monitor();
-    monitor.start();
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    monitor.interrupt();
-    monitor = null;
-    super.doDeactivate();
-  }
-
-  private static final class BufferRef extends SoftReference<IBuffer>
-  {
-    public BufferRef(IBuffer buffer, ReferenceQueue<IBuffer> queue)
-    {
-      super(buffer, queue);
-    }
-  }
-
-  private final class Monitor extends Thread
-  {
-    public Monitor()
-    {
-      setName("BufferPoolMonitor");
-      setDaemon(true);
-    }
-
-    @Override
-    public void run()
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Start monitoring"); //$NON-NLS-1$
-      }
-
-      try
-      {
-        while (isActive() && !isInterrupted())
-        {
-          Reference<? extends IBuffer> bufferRef = referenceQueue.remove(200);
-          if (bufferRef != null)
-          {
-            if (buffers.remove(bufferRef))
-            {
-              --pooledBuffers;
-              if (TRACER.isEnabled())
-              {
-                TRACER.trace("Collected buffer"); //$NON-NLS-1$
-              }
-            }
-          }
-        }
-      }
-      catch (InterruptedException ex)
-      {
-        return;
-      }
-      finally
-      {
-        if (TRACER.isEnabled())
-        {
-          TRACER.trace("Stop monitoring"); //$NON-NLS-1$
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProvider.java
deleted file mode 100644
index 7a9f2c67fe..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProvider.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.buffer;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-
-/**
- * @author Eike Stepper
- */
-public abstract class BufferProvider extends Lifecycle implements IBufferProvider, IBufferProvider.Introspection
-{
-  private short bufferCapacity;
-
-  private long providedBuffers;
-
-  private long retainedBuffers;
-
-  public BufferProvider(short bufferCapacity)
-  {
-    this.bufferCapacity = bufferCapacity;
-  }
-
-  public final long getProvidedBuffers()
-  {
-    return providedBuffers;
-  }
-
-  public final long getRetainedBuffers()
-  {
-    return retainedBuffers;
-  }
-
-  public final short getBufferCapacity()
-  {
-    return bufferCapacity;
-  }
-
-  public final IBuffer provideBuffer()
-  {
-    ++providedBuffers;
-    return doProvideBuffer();
-  }
-
-  public final void retainBuffer(IBuffer buffer)
-  {
-    ++retainedBuffers;
-    doRetainBuffer(buffer);
-  }
-
-  @Override
-  public String toString()
-  {
-    return "BufferProvider[capacity=" + bufferCapacity + "]"; //$NON-NLS-1$ //$NON-NLS-2$
-  }
-
-  protected abstract IBuffer doProvideBuffer();
-
-  protected abstract void doRetainBuffer(IBuffer buffer);
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java
deleted file mode 100644
index f7b16d9f28..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.buffer;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.internal.util.factory.Factory;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public class BufferProviderFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.bufferProviders";
-
-  public static final String TYPE = "default";
-
-  public static final short BUFFER_CAPACITY = 4096;
-
-  public BufferProviderFactory()
-  {
-    super(PRODUCT_GROUP, TYPE);
-  }
-
-  public IBufferProvider create(String description)
-  {
-    return Net4jUtil.createBufferPool(BUFFER_CAPACITY);
-  }
-
-  public static IBufferProvider get(IManagedContainer container)
-  {
-    return (IBufferProvider)container.getElement(PRODUCT_GROUP, TYPE, null);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferUtil.java
deleted file mode 100644
index 0f432ef75b..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferUtil.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.buffer;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-
-/**
- * @author Eike Stepper
- */
-public final class BufferUtil
-{
-  private static final byte FALSE = (byte)0;
-
-  private static final byte TRUE = (byte)1;
-
-  public static final String UTF8_CHAR_SET_NAME = "UTF-8"; //$NON-NLS-1$
-
-  private BufferUtil()
-  {
-  }
-
-  public static byte[] toUTF8(String str)
-  {
-    if (str == null)
-    {
-      return new byte[0];
-    }
-
-    try
-    {
-      byte[] bytes = str.getBytes(UTF8_CHAR_SET_NAME);
-      String test = new String(bytes, UTF8_CHAR_SET_NAME);
-      if (!str.equals(test))
-      {
-        throw new IllegalArgumentException("String not encodable: " + str); //$NON-NLS-1$
-      }
-
-      return bytes;
-    }
-    catch (UnsupportedEncodingException ex)
-    {
-      // This should really not happen
-      throw new RuntimeException(ex);
-    }
-  }
-
-  public static String fromUTF8(byte[] bytes)
-  {
-    try
-    {
-      return new String(bytes, UTF8_CHAR_SET_NAME);
-    }
-    catch (UnsupportedEncodingException ex)
-    {
-      // This should really not happen
-      throw new RuntimeException(ex);
-    }
-  }
-
-  public static void putObject(ByteBuffer byteBuffer, Object object) throws IOException
-  {
-    if (object != null)
-    {
-      byteBuffer.put(TRUE);
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      ObjectOutputStream stream = new ObjectOutputStream(baos);
-      stream.writeObject(object);
-
-      byte[] array = baos.toByteArray();
-      putByteArray(byteBuffer, array);
-    }
-    else
-    {
-      byteBuffer.put(FALSE);
-    }
-  }
-
-  public static Object getObject(ByteBuffer byteBuffer) throws IOException, ClassNotFoundException
-  {
-    boolean nonNull = byteBuffer.get() == TRUE;
-    if (nonNull)
-    {
-      byte[] array = getByteArray(byteBuffer);
-      ByteArrayInputStream bais = new ByteArrayInputStream(array);
-      ObjectInputStream stream = new ObjectInputStream(bais);
-      return stream.readObject();
-    }
-
-    return null;
-  }
-
-  public static void putByteArray(ByteBuffer byteBuffer, byte[] array)
-  {
-    byteBuffer.putShort((short)array.length);
-    if (array.length != 0)
-    {
-      byteBuffer.put(array);
-    }
-  }
-
-  public static byte[] getByteArray(ByteBuffer byteBuffer)
-  {
-    short length = byteBuffer.getShort();
-    byte[] array = new byte[length];
-    if (length != 0)
-    {
-      byteBuffer.get(array);
-    }
-
-    return array;
-  }
-
-  public static void putUTF8(ByteBuffer byteBuffer, String str)
-  {
-    byte[] bytes = BufferUtil.toUTF8(str);
-    if (bytes.length > byteBuffer.remaining())
-    {
-      throw new IllegalArgumentException("String too long: " + str); //$NON-NLS-1$
-    }
-
-    putByteArray(byteBuffer, bytes);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
deleted file mode 100644
index 01fbec240b..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.net4j"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_BUFFER = DEBUG.tracer("buffer"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_BUFFER_STREAM = DEBUG_BUFFER.tracer("stream"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_CHANNEL = DEBUG.tracer("channel"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_SELECTOR = DEBUG.tracer("selector"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_ACCEPTOR = DEBUG.tracer("acceptor"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_CONNECTOR = DEBUG.tracer("connector"); //$NON-NLS-1$
-
-  public static final OMTracer DEBUG_SIGNAL = DEBUG.tracer("signal"); //$NON-NLS-1$
-
-  public static final boolean SET_SIGNAL_THREAD_NAME = BUNDLE.getDebugSupport().getDebugOption(
-      "set.signal.thread.name", false); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/channel/Channel.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/channel/Channel.java
deleted file mode 100644
index b3c9df0f1b..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/channel/Channel.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.channel;
-
-import org.eclipse.net4j.buffer.BufferState;
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferHandler;
-import org.eclipse.net4j.channel.IChannelMultiplexer;
-import org.eclipse.net4j.internal.util.concurrent.QueueWorkerWorkSerializer;
-import org.eclipse.net4j.internal.util.concurrent.SynchronousWorkSerializer;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.concurrent.IWorkSerializer;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import org.eclipse.internal.net4j.buffer.Buffer;
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.text.MessageFormat;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorService;
-
-/**
- * @author Eike Stepper
- */
-public class Channel extends Lifecycle implements InternalChannel
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CHANNEL, Channel.class);
-
-  private int channelID;
-
-  private IChannelMultiplexer channelMultiplexer;
-
-  private short channelIndex = Buffer.NO_CHANNEL;
-
-  private ExecutorService receiveExecutor;
-
-  /**
-   * The external handler for buffers passed from the {@link #connector}.
-   */
-  private IBufferHandler receiveHandler;
-
-  private IWorkSerializer receiveSerializer;
-
-  private Queue<IBuffer> sendQueue;
-
-  public Channel()
-  {
-  }
-
-  public int getChannelID()
-  {
-    return channelID;
-  }
-
-  public void setChannelID(int channelID)
-  {
-    this.channelID = channelID;
-  }
-
-  public IChannelMultiplexer getChannelMultiplexer()
-  {
-    return channelMultiplexer;
-  }
-
-  public void setChannelMultiplexer(IChannelMultiplexer channelMultiplexer)
-  {
-    this.channelMultiplexer = channelMultiplexer;
-  }
-
-  public short getChannelIndex()
-  {
-    return channelIndex;
-  }
-
-  public void setChannelIndex(short channelIndex)
-  {
-    if (channelIndex == Buffer.NO_CHANNEL)
-    {
-      throw new IllegalArgumentException("channelIndex == INVALID_CHANNEL_ID"); //$NON-NLS-1$
-    }
-
-    this.channelIndex = channelIndex;
-  }
-
-  public ExecutorService getReceiveExecutor()
-  {
-    return receiveExecutor;
-  }
-
-  public void setReceiveExecutor(ExecutorService receiveExecutor)
-  {
-    this.receiveExecutor = receiveExecutor;
-  }
-
-  public IBufferHandler getReceiveHandler()
-  {
-    return receiveHandler;
-  }
-
-  public void setReceiveHandler(IBufferHandler receiveHandler)
-  {
-    this.receiveHandler = receiveHandler;
-  }
-
-  public Queue<IBuffer> getSendQueue()
-  {
-    return sendQueue;
-  }
-
-  public void close()
-  {
-    deactivate();
-  }
-
-  public void sendBuffer(IBuffer buffer)
-  {
-    handleBuffer(buffer);
-  }
-
-  public void handleBuffer(IBuffer buffer)
-  {
-    BufferState state = buffer.getState();
-    if (state != BufferState.PUTTING)
-    {
-      OM.LOG.warn("Ignoring buffer in state == " + state + ": " + this); //$NON-NLS-1$ //$NON-NLS-2$
-      return;
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Handling buffer from client: {0} --> {1}", buffer, this); //$NON-NLS-1$
-    }
-
-    if (sendQueue == null)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Ignoring buffer because sendQueue == null: " + this); //$NON-NLS-1$
-      }
-
-      buffer.release();
-    }
-    else
-    {
-      sendQueue.add(buffer);
-      channelMultiplexer.multiplexChannel(this);
-    }
-  }
-
-  public void handleBufferFromMultiplexer(final IBuffer buffer)
-  {
-    if (receiveHandler != null)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.format("Handling buffer from multiplexer: {0} --> {1}", buffer, this); //$NON-NLS-1$
-      }
-
-      receiveSerializer.addWork(new ReceiverWork(buffer));
-    }
-    else
-    {
-      // Shutting down
-      buffer.release();
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("Channel[{0}]", channelIndex); //$NON-NLS-1$
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    checkState(channelIndex != Buffer.NO_CHANNEL, "channelIndex == NO_CHANNEL"); //$NON-NLS-1$
-    checkState(channelMultiplexer, "channelMultiplexer"); //$NON-NLS-1$
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    sendQueue = new ConcurrentLinkedQueue<IBuffer>();
-    if (receiveExecutor == null)
-    {
-      receiveSerializer = new SynchronousWorkSerializer();
-    }
-    else
-    {
-      // CompletionWorkSerializer throws "One command already pending"
-      // receiveSerializer = new CompletionWorkSerializer();
-      // receiveSerializer = new AsynchronousWorkSerializer(receiveExecutor);
-      // receiveSerializer = new SynchronousWorkSerializer();
-
-      class ChannelReceiveSerializer extends QueueWorkerWorkSerializer
-      {
-        @Override
-        protected String getThreadName()
-        {
-          return "ReceiveSerializer" + channelIndex;
-        }
-      }
-
-      receiveSerializer = new ChannelReceiveSerializer();
-    }
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    LifecycleUtil.deactivate(receiveHandler);
-    receiveHandler = null;
-
-    channelMultiplexer.removeChannel(this);
-    if (receiveSerializer != null)
-    {
-      receiveSerializer.dispose();
-      receiveSerializer = null;
-    }
-
-    if (sendQueue != null)
-    {
-      sendQueue.clear();
-      sendQueue = null;
-    }
-
-    super.doDeactivate();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class ReceiverWork implements Runnable
-  {
-    private final IBuffer buffer;
-
-    private ReceiverWork(IBuffer buffer)
-    {
-      this.buffer = buffer;
-    }
-
-    public void run()
-    {
-      if (receiveHandler != null)
-      {
-        receiveHandler.handleBuffer(buffer);
-      }
-      else
-      {
-        // Shutting down
-        buffer.release();
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/channel/InternalChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/channel/InternalChannel.java
deleted file mode 100644
index 192ecaf243..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/channel/InternalChannel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.channel;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
-
-import java.util.Queue;
-import java.util.concurrent.ExecutorService;
-
-/**
- * @author Eike Stepper
- */
-public interface InternalChannel extends IChannel, ILifecycle.Introspection
-{
-  public void setChannelID(int channelID);
-
-  public void setChannelIndex(short channelIndex);
-
-  public ExecutorService getReceiveExecutor();
-
-  public Queue<IBuffer> getSendQueue();
-
-  public void handleBufferFromMultiplexer(IBuffer buffer);
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/Connector.java
deleted file mode 100644
index 7b211dce8c..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/Connector.java
+++ /dev/null
@@ -1,800 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.connector;
-
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.channel.IChannelMultiplexer;
-import org.eclipse.net4j.connector.ConnectorException;
-import org.eclipse.net4j.connector.ConnectorLocation;
-import org.eclipse.net4j.connector.ConnectorState;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.connector.IConnectorStateEvent;
-import org.eclipse.net4j.internal.util.container.Container;
-import org.eclipse.net4j.internal.util.container.LifecycleEventConverter;
-import org.eclipse.net4j.internal.util.event.Event;
-import org.eclipse.net4j.internal.util.factory.FactoryKey;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.protocol.IProtocol;
-import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.concurrent.RWLock;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.container.IContainerDelta.Kind;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.event.INotifier;
-import org.eclipse.net4j.util.factory.IFactory;
-import org.eclipse.net4j.util.factory.IFactoryKey;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.om.monitor.MonitorUtil;
-import org.eclipse.net4j.util.registry.IRegistry;
-import org.eclipse.net4j.util.security.INegotiationContext;
-import org.eclipse.net4j.util.security.INegotiator;
-
-import org.eclipse.internal.net4j.bundle.OM;
-import org.eclipse.internal.net4j.channel.Channel;
-import org.eclipse.internal.net4j.channel.InternalChannel;
-import org.eclipse.internal.net4j.protocol.ClientProtocolFactory;
-import org.eclipse.internal.net4j.protocol.ServerProtocolFactory;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Connector extends Container<IChannel> implements IConnector, IChannelMultiplexer
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CONNECTOR, Connector.class);
-
-  private String userID;
-
-  private IRegistry<IFactoryKey, IFactory> protocolFactoryRegistry;
-
-  private List<IElementProcessor> protocolPostProcessors;
-
-  private INegotiator negotiator;
-
-  private INegotiationContext negotiationContext;
-
-  private IBufferProvider bufferProvider;
-
-  /**
-   * An optional executor to be used by the {@link IChannel}s to process their receive queues instead of the current
-   * thread. If not <code>null</code> the sender and the receiver peers become decoupled.
-   * <p>
-   */
-  private ExecutorService receiveExecutor;
-
-  private int nextChannelID;
-
-  private List<InternalChannel> channels = new ArrayList<InternalChannel>(0);
-
-  private RWLock channelsLock = new RWLock(2500);
-
-  private ConnectorState connectorState = ConnectorState.DISCONNECTED;
-
-  /**
-   * Is registered with each {@link IChannel} of this {@link IConnector}.
-   */
-  private transient IListener channelListener = new LifecycleEventConverter<IChannel>(this)
-  {
-    @Override
-    protected IContainerEvent<IChannel> createContainerEvent(IContainer<IChannel> container, IChannel element, Kind kind)
-    {
-      return newContainerEvent(element, kind);
-    }
-  };
-
-  private transient CountDownLatch finishedConnecting;
-
-  private transient CountDownLatch finishedNegotiating;
-
-  public Connector()
-  {
-  }
-
-  public ExecutorService getReceiveExecutor()
-  {
-    return receiveExecutor;
-  }
-
-  public void setReceiveExecutor(ExecutorService receiveExecutor)
-  {
-    this.receiveExecutor = receiveExecutor;
-  }
-
-  public IRegistry<IFactoryKey, IFactory> getProtocolFactoryRegistry()
-  {
-    return protocolFactoryRegistry;
-  }
-
-  public void setProtocolFactoryRegistry(IRegistry<IFactoryKey, IFactory> protocolFactoryRegistry)
-  {
-    this.protocolFactoryRegistry = protocolFactoryRegistry;
-  }
-
-  public List<IElementProcessor> getProtocolPostProcessors()
-  {
-    return protocolPostProcessors;
-  }
-
-  public void setProtocolPostProcessors(List<IElementProcessor> protocolPostProcessors)
-  {
-    this.protocolPostProcessors = protocolPostProcessors;
-  }
-
-  public IBufferProvider getBufferProvider()
-  {
-    return bufferProvider;
-  }
-
-  public INegotiator getNegotiator()
-  {
-    return negotiator;
-  }
-
-  public void setNegotiator(INegotiator negotiator)
-  {
-    this.negotiator = negotiator;
-  }
-
-  public INegotiationContext getNegotiationContext()
-  {
-    return negotiationContext;
-  }
-
-  public void setBufferProvider(IBufferProvider bufferProvider)
-  {
-    this.bufferProvider = bufferProvider;
-  }
-
-  public boolean isClient()
-  {
-    return getLocation() == ConnectorLocation.CLIENT;
-  }
-
-  public boolean isServer()
-  {
-    return getLocation() == ConnectorLocation.SERVER;
-  }
-
-  public String getUserID()
-  {
-    return userID;
-  }
-
-  public void setUserID(String userID)
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Setting userID {0} for {1}", userID, this); //$NON-NLS-1$ 
-    }
-
-    this.userID = userID;
-  }
-
-  public ConnectorState getState()
-  {
-    return connectorState;
-  }
-
-  public void setState(ConnectorState newState) throws ConnectorException
-  {
-    ConnectorState oldState = getState();
-    if (newState != oldState)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.format("Setting state {0} (was {1}) for {2}", newState, oldState.toString().toLowerCase(), this); //$NON-NLS-1$ 
-      }
-
-      connectorState = newState;
-      switch (newState)
-      {
-      case DISCONNECTED:
-        if (finishedConnecting != null)
-        {
-          finishedConnecting.countDown();
-          finishedConnecting = null;
-        }
-
-        if (finishedNegotiating != null)
-        {
-          finishedNegotiating.countDown();
-          finishedNegotiating = null;
-        }
-        break;
-
-      case CONNECTING:
-        finishedConnecting = new CountDownLatch(1);
-        finishedNegotiating = new CountDownLatch(1);
-        // The concrete implementation must advance state to NEGOTIATING or CONNECTED
-        break;
-
-      case NEGOTIATING:
-        finishedConnecting.countDown();
-        negotiationContext = createNegotiationContext();
-        negotiator.negotiate(negotiationContext);
-        break;
-
-      case CONNECTED:
-        negotiationContext = null;
-        deferredActivate();
-        finishedConnecting.countDown();
-        finishedNegotiating.countDown();
-        break;
-      }
-
-      fireEvent(new ConnectorStateEvent(this, oldState, newState));
-    }
-  }
-
-  public boolean isDisconnected()
-  {
-    return connectorState == ConnectorState.DISCONNECTED;
-  }
-
-  public boolean isConnecting()
-  {
-    return connectorState == ConnectorState.CONNECTING;
-  }
-
-  public boolean isNegotiating()
-  {
-    return connectorState == ConnectorState.NEGOTIATING;
-  }
-
-  public boolean isConnected()
-  {
-    return connectorState == ConnectorState.CONNECTED;
-  }
-
-  public void connectAsync() throws ConnectorException
-  {
-    try
-    {
-      activate();
-    }
-    catch (ConnectorException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new ConnectorException(ex);
-    }
-  }
-
-  public boolean waitForConnection(long timeout) throws ConnectorException
-  {
-    try
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Waiting for connection..."); //$NON-NLS-1$
-      }
-
-      do
-      {
-        if (finishedNegotiating == null)
-        {
-          break;
-        }
-
-        if (finishedNegotiating.await(Math.min(100L, timeout), TimeUnit.MILLISECONDS))
-        {
-          break;
-        }
-
-        if (MonitorUtil.isCanceled())
-        {
-          break;
-        }
-
-        timeout -= 100L;
-      } while (timeout > 0);
-
-      return isConnected();
-    }
-    catch (InterruptedException ex)
-    {
-      return false;
-    }
-  }
-
-  public boolean connect(long timeout) throws ConnectorException
-  {
-    connectAsync();
-    return waitForConnection(timeout);
-  }
-
-  public ConnectorException disconnect()
-  {
-    Exception ex = deactivate();
-    if (ex == null)
-    {
-      return null;
-    }
-
-    if (ex instanceof ConnectorException)
-    {
-      return (ConnectorException)ex;
-    }
-
-    return new ConnectorException(ex);
-  }
-
-  public IChannel[] getChannels()
-  {
-    final List<IChannel> result = new ArrayList<IChannel>(0);
-    channelsLock.read(new Runnable()
-    {
-      public void run()
-      {
-        for (InternalChannel channel : channels)
-        {
-          if (channel != null)
-          {
-            result.add(channel);
-          }
-        }
-      }
-    });
-
-    return result.toArray(new IChannel[result.size()]);
-  }
-
-  @Override
-  public boolean isEmpty()
-  {
-    return getElements().length == 0;
-  }
-
-  public IChannel[] getElements()
-  {
-    return getChannels();
-  }
-
-  public IChannel openChannel() throws ConnectorException
-  {
-    return openChannel((IProtocol)null);
-  }
-
-  public IChannel openChannel(String protocolID, Object infraStructure) throws ConnectorException
-  {
-    IProtocol protocol = createProtocol(protocolID, infraStructure);
-    if (protocol == null)
-    {
-      throw new IllegalArgumentException("Unknown protocolID: " + protocolID);
-    }
-
-    return openChannel(protocol);
-  }
-
-  public IChannel openChannel(IProtocol protocol) throws ConnectorException
-  {
-    if (!waitForConnection(Long.MAX_VALUE))
-    {
-      throw new ConnectorException("Connector not connected");
-    }
-
-    int channelID = getNextChannelID();
-    InternalChannel channel = createChannel(channelID, protocol);
-    registerChannelWithPeer(channelID, channel.getChannelIndex(), protocol);
-
-    try
-    {
-      channel.activate();
-    }
-    catch (ConnectorException ex)
-    {
-      throw ex;
-    }
-    catch (Exception ex)
-    {
-      throw new ConnectorException(ex);
-    }
-
-    return channel;
-  }
-
-  public InternalChannel createChannel(int channelID, short channelIndex, String protocolID)
-  {
-    IProtocol protocol = createProtocol(protocolID, null);
-    return createAndAddChannel(channelID, channelIndex, protocol);
-  }
-
-  protected InternalChannel createChannelWithoutChannelIndex(int channelID, IProtocol protocol)
-  {
-    InternalChannel channel = createChannel();
-    channel.setChannelID(channelID);
-
-    if (protocol != null)
-    {
-      protocol.setChannel(channel);
-      LifecycleUtil.activate(protocol);
-      if (TRACER.isEnabled())
-      {
-        String protocolType = protocol == null ? null : protocol.getType();
-        TRACER.format("Opening channel ID {0} with protocol {1}", channelID, protocolType); //$NON-NLS-1$
-      }
-    }
-    else
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.format("Opening channel ID {0} without protocol", channelID); //$NON-NLS-1$
-      }
-    }
-    channel.setReceiveHandler(protocol);
-    channel.addListener(channelListener);
-    return channel;
-  }
-
-  public InternalChannel createAndAddChannel(int channelID, short channelIndex, IProtocol protocol)
-  {
-    InternalChannel channel = createChannelWithoutChannelIndex(channelID, protocol);
-    channel.setChannelIndex(channelIndex);
-    addChannelWithIndex(channel);
-    return channel;
-  }
-
-  public InternalChannel createChannel(int channelID, IProtocol protocol)
-  {
-    InternalChannel channel = createChannelWithoutChannelIndex(channelID, protocol);
-    addChannelWithoutIndex(channel);
-    return channel;
-  }
-
-  protected InternalChannel createChannel()
-  {
-    Channel channel = new Channel();
-    channel.setChannelMultiplexer(this);
-    channel.setReceiveExecutor(receiveExecutor);
-    return channel;
-  }
-
-  public InternalChannel getChannel(final short channelIndex)
-  {
-    return channelsLock.read(new Callable<InternalChannel>()
-    {
-      public InternalChannel call() throws Exception
-      {
-        return channels.get(channelIndex);
-      }
-    });
-  }
-
-  protected int getNextChannelID()
-  {
-    return nextChannelID++;
-  }
-
-  protected void addChannelWithIndex(final InternalChannel channel)
-  {
-    channelsLock.write(new Runnable()
-    {
-      public void run()
-      {
-        short channelIndex = channel.getChannelIndex();
-        while (channelIndex >= channels.size())
-        {
-          channels.add(null);
-        }
-
-        channels.set(channelIndex, channel);
-      }
-    });
-  }
-
-  protected void addChannelWithoutIndex(final InternalChannel channel)
-  {
-    channelsLock.write(new Runnable()
-    {
-      public void run()
-      {
-        int size = channels.size();
-        for (short i = 0; i < size; i++)
-        {
-          if (channels.get(i) == null)
-          {
-            channels.set(i, channel);
-            channel.setChannelIndex(i);
-            return;
-          }
-        }
-
-        channel.setChannelIndex((short)size);
-        channels.add(channel);
-      }
-    });
-  }
-
-  /**
-   * @return <code>true</code> if the channel was removed, <code>false</code> otherwise.
-   */
-  public boolean removeChannel(final IChannel channel)
-  {
-    if (channel == null)
-    {
-      throw new IllegalArgumentException("channel == null");
-    }
-
-    if (!isConnected())
-    {
-      return false;
-    }
-
-    final int channelIndex = channel.getChannelIndex();
-    boolean removed = false;
-    try
-    {
-      removed = channelsLock.write(new Callable<Boolean>()
-      {
-        public Boolean call() throws Exception
-        {
-          if (channelIndex < channels.size() && channels.get(channelIndex) == channel)
-          {
-            if (TRACER.isEnabled())
-            {
-              TRACER.trace("Removing channel " + channelIndex); //$NON-NLS-1$
-            }
-
-            channels.set(channelIndex, null);
-            return true;
-          }
-
-          return false;
-        }
-      });
-
-      if (removed)
-      {
-        channel.close();
-      }
-    }
-    catch (RuntimeException ex)
-    {
-      Exception unwrapped = WrappedException.unwrap(ex);
-      if (unwrapped instanceof TimeoutException)
-      {
-        if (channelIndex < channels.size())
-        {
-          InternalChannel c = channels.get(channelIndex);
-          if (c != null && c.isActive())
-          {
-            throw ex;
-          }
-        }
-      }
-      else
-      {
-        throw ex;
-      }
-    }
-
-    return removed;
-  }
-
-  public void inverseRemoveChannel(int channelID, short channelIndex)
-  {
-    try
-    {
-      InternalChannel channel = getChannel(channelIndex);
-      if (channel != null)
-      {
-        if (channel.getChannelID() != channelID)
-        {
-          if (TRACER.isEnabled())
-          {
-            TRACER.format("Ignoring concurrent atempt to remove channel {0} (channelID={1}", channelIndex, channelID);
-          }
-        }
-        else
-        {
-          removeChannel(channel);
-        }
-      }
-    }
-    catch (RuntimeException ex)
-    {
-      OM.LOG.warn(ex);
-    }
-  }
-
-  protected void leaveConnecting()
-  {
-    if (getNegotiator() == null)
-    {
-      setState(ConnectorState.CONNECTED);
-    }
-    else
-    {
-      setState(ConnectorState.NEGOTIATING);
-    }
-  }
-
-  protected abstract INegotiationContext createNegotiationContext();
-
-  /**
-   * TODO Use IProtocolProvider and make the protocols real container elements, so that the post processors can reach
-   * them. The protocol description can be used to store unique protocol IDs so that always new protocols are created in
-   * the container.
-   */
-  protected IProtocol createProtocol(String type, Object infraStructure)
-  {
-    IRegistry<IFactoryKey, IFactory> registry = getProtocolFactoryRegistry();
-    if (StringUtil.isEmpty(type) || registry == null)
-    {
-      return null;
-    }
-
-    // Get protocol factory
-    IFactoryKey key = createProtocolFactoryKey(type);
-    IFactory factory = registry.get(key);
-    if (factory == null)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Unknown protocol " + type); //$NON-NLS-1$
-      }
-
-      return null;
-    }
-
-    // Create protocol
-    String description = null;
-    IProtocol protocol = (IProtocol)factory.create(description);
-    protocol.setBufferProvider(bufferProvider);
-    protocol.setExecutorService(receiveExecutor);
-    if (infraStructure != null)
-    {
-      protocol.setInfraStructure(infraStructure);
-    }
-
-    // Post process protocol
-    List<IElementProcessor> processors = getProtocolPostProcessors();
-    if (processors != null)
-    {
-      for (IElementProcessor processor : processors)
-      {
-        protocol = (IProtocol)processor.process(null, key.getProductGroup(), key.getType(), description, protocol);
-      }
-    }
-
-    return protocol;
-  }
-
-  protected IFactoryKey createProtocolFactoryKey(String type)
-  {
-    switch (getLocation())
-    {
-    case SERVER:
-      return new FactoryKey(ServerProtocolFactory.PRODUCT_GROUP, type);
-    case CLIENT:
-      return new FactoryKey(ClientProtocolFactory.PRODUCT_GROUP, type);
-    default:
-      throw new IllegalStateException();
-    }
-  }
-
-  @Override
-  protected boolean isDeferredActivation()
-  {
-    return true;
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    if (bufferProvider == null)
-    {
-      throw new IllegalStateException("bufferProvider == null"); //$NON-NLS-1$
-    }
-
-    if (protocolFactoryRegistry == null && TRACER.isEnabled())
-    {
-      // Just a reminder during development
-      TRACER.trace("No factoryRegistry!"); //$NON-NLS-1$
-    }
-
-    if (receiveExecutor == null && TRACER.isEnabled())
-    {
-      // Just a reminder during development
-      TRACER.trace("No receiveExecutor!"); //$NON-NLS-1$
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    setState(ConnectorState.CONNECTING);
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    setState(ConnectorState.DISCONNECTED);
-    channelsLock.write(new Runnable()
-    {
-      public void run()
-      {
-        for (short i = 0; i < channels.size(); i++)
-        {
-          InternalChannel channel = channels.get(i);
-          if (channel != null)
-          {
-            LifecycleUtil.deactivate(channel);
-          }
-        }
-
-        channels.clear();
-      }
-    });
-
-    super.doDeactivate();
-  }
-
-  protected abstract void registerChannelWithPeer(int channelID, short channelIndex, IProtocol protocol)
-      throws ConnectorException;
-
-  /**
-   * @author Eike Stepper
-   */
-  private static class ConnectorStateEvent extends Event implements IConnectorStateEvent
-  {
-    private static final long serialVersionUID = 1L;
-
-    private ConnectorState oldState;
-
-    private ConnectorState newState;
-
-    public ConnectorStateEvent(INotifier notifier, ConnectorState oldState, ConnectorState newState)
-    {
-      super(notifier);
-      this.oldState = oldState;
-      this.newState = newState;
-    }
-
-    public IConnector getConnector()
-    {
-      return (IConnector)getSource();
-    }
-
-    public ConnectorState getOldState()
-    {
-      return oldState;
-    }
-
-    public ConnectorState getNewState()
-    {
-      return newState;
-    }
-
-    @Override
-    public String toString()
-    {
-      return MessageFormat.format("ConnectorStateEvent[source={0}, oldState={1}, newState={2}]", getSource(),
-          getOldState(), getNewState());
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/ConnectorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/ConnectorFactory.java
deleted file mode 100644
index 909099ab4a..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/ConnectorFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.connector;
-
-import org.eclipse.net4j.internal.util.factory.Factory;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ConnectorFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.connectors";
-
-  public ConnectorFactory(String type)
-  {
-    super(PRODUCT_GROUP, type);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/protocol/ClientProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/protocol/ClientProtocolFactory.java
deleted file mode 100644
index 792d4241ab..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/protocol/ClientProtocolFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.protocol;
-
-import org.eclipse.net4j.internal.util.factory.Factory;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ClientProtocolFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.clientProtocols";
-
-  public ClientProtocolFactory(String type)
-  {
-    super(PRODUCT_GROUP, type);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/protocol/Protocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/protocol/Protocol.java
deleted file mode 100644
index f61e83893a..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/protocol/Protocol.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.protocol;
-
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.protocol.IProtocol;
-
-import java.util.concurrent.ExecutorService;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Protocol extends Lifecycle implements IProtocol
-{
-  private IChannel channel;
-
-  private IBufferProvider bufferProvider;
-
-  private ExecutorService executorService;
-
-  private Object infraStructure;
-
-  public Protocol()
-  {
-  }
-
-  public IChannel getChannel()
-  {
-    return channel;
-  }
-
-  public void setChannel(IChannel channel)
-  {
-    this.channel = channel;
-  }
-
-  public IBufferProvider getBufferProvider()
-  {
-    return bufferProvider;
-  }
-
-  public void setBufferProvider(IBufferProvider bufferProvider)
-  {
-    this.bufferProvider = bufferProvider;
-  }
-
-  public ExecutorService getExecutorService()
-  {
-    return executorService;
-  }
-
-  public void setExecutorService(ExecutorService executorService)
-  {
-    this.executorService = executorService;
-  }
-
-  public Object getInfraStructure()
-  {
-    return infraStructure;
-  }
-
-  public void setInfraStructure(Object infraStructure)
-  {
-    this.infraStructure = infraStructure;
-  }
-
-  @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-    checkState(channel, "channel");
-    checkState(bufferProvider, "bufferProvider");
-    checkState(executorService, "executorService");
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    channel = null;
-    super.doDeactivate();
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/protocol/ServerProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/protocol/ServerProtocolFactory.java
deleted file mode 100644
index 575e35b116..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/protocol/ServerProtocolFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.internal.net4j.protocol;
-
-import org.eclipse.net4j.internal.util.factory.Factory;
-
-/**
- * @author Eike Stepper
- */
-public abstract class ServerProtocolFactory extends Factory
-{
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.serverProtocols";
-
-  public ServerProtocolFactory(String type)
-  {
-    super(PRODUCT_GROUP, type);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
deleted file mode 100644
index 226f180ae0..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j;
-
-import org.eclipse.net4j.acceptor.IAcceptor;
-import org.eclipse.net4j.buffer.IBufferPool;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.util.security.RandomizerFactory;
-import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-import org.eclipse.internal.net4j.ExecutorServiceFactory;
-import org.eclipse.internal.net4j.Net4jTransportInjector;
-import org.eclipse.internal.net4j.acceptor.AcceptorFactory;
-import org.eclipse.internal.net4j.buffer.BufferFactory;
-import org.eclipse.internal.net4j.buffer.BufferPool;
-import org.eclipse.internal.net4j.buffer.BufferProviderFactory;
-import org.eclipse.internal.net4j.connector.ConnectorFactory;
-
-import java.util.concurrent.ExecutorService;
-
-/**
- * @author Eike Stepper
- */
-public final class Net4jUtil
-{
-  public static final String SCHEME_SEPARATOR = "://";
-
-  public static final short DEFAULT_BUFFER_CAPACITY = 4096;
-
-  private Net4jUtil()
-  {
-  }
-
-  public static void prepareContainer(IManagedContainer container)
-  {
-    container.registerFactory(new ExecutorServiceFactory());
-    container.registerFactory(new BufferProviderFactory());
-    container.registerFactory(new RandomizerFactory());
-    container.addPostProcessor(new Net4jTransportInjector());
-  }
-
-  public static ExecutorService getExecutorService(IManagedContainer container)
-  {
-    return ExecutorServiceFactory.get(container);
-  }
-
-  public static IBufferProvider getBufferProvider(IManagedContainer container)
-  {
-    return BufferProviderFactory.get(container);
-  }
-
-  public static IAcceptor getAcceptor(IManagedContainer container, String type, String description)
-  {
-    return (IAcceptor)container.getElement(AcceptorFactory.PRODUCT_GROUP, type, description);
-  }
-
-  public static IConnector getConnector(IManagedContainer container, String type, String description)
-  {
-    return (IConnector)container.getElement(ConnectorFactory.PRODUCT_GROUP, type, description);
-  }
-
-  public static IConnector getConnector(IManagedContainer container, String description)
-  {
-    int pos = description.indexOf(SCHEME_SEPARATOR);
-    if (pos <= 0)
-    {
-      throw new IllegalArgumentException("Connector type (scheme) missing: " + description);
-    }
-
-    String factoryType = description.substring(0, pos);
-
-    String connectorDescription = description.substring(pos + SCHEME_SEPARATOR.length());
-    if (StringUtil.isEmpty(connectorDescription))
-    {
-      throw new IllegalArgumentException("Illegal connector description: " + description);
-    }
-
-    return (IConnector)container.getElement(ConnectorFactory.PRODUCT_GROUP, factoryType, connectorDescription);
-  }
-
-  public static IBufferProvider createBufferFactory(short bufferCapacity)
-  {
-    return new BufferFactory(bufferCapacity);
-  }
-
-  public static IBufferProvider createBufferFactory()
-  {
-    return createBufferFactory(DEFAULT_BUFFER_CAPACITY);
-  }
-
-  public static IBufferPool createBufferPool(IBufferProvider factory)
-  {
-    return new BufferPool(factory);
-  }
-
-  public static IBufferPool createBufferPool(short bufferCapacity)
-  {
-    return createBufferPool(createBufferFactory(bufferCapacity));
-  }
-
-  public static IBufferPool createBufferPool()
-  {
-    return createBufferPool(createBufferFactory());
-  }
-
-  public static long getProvidedBuffers(IBufferProvider bufferProvider)
-  {
-    if (bufferProvider instanceof IBufferProvider.Introspection)
-    {
-      return ((IBufferProvider.Introspection)bufferProvider).getProvidedBuffers();
-    }
-
-    return -1L;
-  }
-
-  public static long getRetainedBuffers(IBufferProvider bufferProvider)
-  {
-    if (bufferProvider instanceof IBufferProvider.Introspection)
-    {
-      return ((IBufferProvider.Introspection)bufferProvider).getRetainedBuffers();
-    }
-
-    return -1L;
-  }
-
-  public static int getPooledBuffers(IBufferPool bufferPool)
-  {
-    if (bufferPool instanceof IBufferPool.Introspection)
-    {
-      return ((IBufferPool.Introspection)bufferPool).getPooledBuffers();
-    }
-
-    return -1;
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/IAcceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/IAcceptor.java
deleted file mode 100644
index e974dec4ea..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/IAcceptor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.acceptor;
-
-import org.eclipse.net4j.connector.ConnectorLocation;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.factory.IFactory;
-import org.eclipse.net4j.util.factory.IFactoryKey;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import org.eclipse.internal.net4j.acceptor.Acceptor;
-
-import java.util.List;
-
-/**
- * Accepts incoming connection requests from {@link ConnectorLocation#CLIENT client} {@link IConnector connectors} and
- * creates the appropriate {@link ConnectorLocation#SERVER server} connectors.
- * <p>
- * Since the process of accepting connection requests is heavily dependent on the implementation of the respective
- * connectors the only public API is introspection and notification.
- * <p>
- * This interface is <b>not</b> intended to be implemented by clients. Service providers <b>must</b> extend the
- * abstract {@link Acceptor} class.
- * <p>
- * <dt><b>Class Diagram:</b></dt>
- * <dd> <img src="doc-files/Acceptors.png" title="Diagram Acceptors" border="0" usemap="#Acceptors.png"/></dd>
- * <p>
- * <MAP NAME="Acceptors.png"> <AREA SHAPE="RECT" COORDS="10,8,99,58" HREF="IAcceptor.html"> <AREA SHAPE="RECT"
- * COORDS="289,8,378,58" HREF="IConnector.html"> </MAP>
- * <p>
- * <dt><b>Sequence Diagram:</b></dt>
- * <dd> <img src="doc-files/ConnectionProcess.jpg" title="Connection Process" border="0"
- * usemap="#ConnectionProcess.jpg"/></dd>
- * <p>
- * <MAP NAME="ConnectionProcess.jpg"> <AREA SHAPE="RECT" COORDS="146,136,265,165" HREF="IConnector.html"> <AREA
- * SHAPE="RECT" COORDS="485,75,564,105" HREF="IAcceptor.html"> <AREA SHAPE="RECT" COORDS="296,325,414,355"
- * HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="64,426,444,506" HREF="ConnectorState.html#CONNECTING"> <AREA
- * SHAPE="RECT" COORDS="64,516,444,596" HREF="ConnectorState.html#NEGOTIATING"> </MAP>
- * 
- * @author Eike Stepper
- */
-public interface IAcceptor extends IContainer<IConnector>
-{
-  /**
-   * Returns the factory registry used by this acceptor to prepare newly accepted connectors.
-   */
-  public IRegistry<IFactoryKey, IFactory> getProtocolFactoryRegistry();
-
-  /**
-   * Returns the post processors used by this acceptor to prepare newly accepted connectors.
-   */
-  public List<IElementProcessor> getProtocolPostProcessors();
-
-  /**
-   * Returns an array of the connectors that have been accepted by this acceptor and not been closed since.
-   */
-  public IConnector[] getAcceptedConnectors();
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java
deleted file mode 100644
index e952e662ad..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buffer;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.HexUtil;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-public class BufferInputStream extends InputStream implements IBufferHandler
-{
-  public static final long NO_TIMEOUT = -1;
-
-  public static final long DEFAULT_MILLIS_BEFORE_TIMEOUT = NO_TIMEOUT;
-
-  public static final long DEFAULT_MILLIS_INTERRUPT_CHECK = 100;
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER_STREAM, BufferInputStream.class);
-
-  private BlockingQueue<IBuffer> buffers = new LinkedBlockingQueue<IBuffer>();
-
-  private IBuffer currentBuffer;
-
-  private boolean eos;
-
-  public BufferInputStream()
-  {
-  }
-
-  public void handleBuffer(IBuffer buffer)
-  {
-    buffers.add(buffer);
-  }
-
-  @SuppressWarnings("deprecation")
-  @Override
-  public int read() throws IOException
-  {
-    if (currentBuffer == null)
-    {
-      if (eos)
-      {
-        // End of stream
-        return -1;
-      }
-
-      if (!ensureBuffer())
-      {
-        // Timeout or interrupt
-        return -1;
-      }
-    }
-
-    final int result = currentBuffer.getByteBuffer().get() & 0xFF;
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("<-- " + HexUtil.formatByte(result) //$NON-NLS-1$
-          + (result >= 32 ? " " + Character.toString((char)result) : "")); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    if (!currentBuffer.getByteBuffer().hasRemaining())
-    {
-      currentBuffer.release();
-      currentBuffer = null;
-    }
-
-    return result;
-  }
-
-  @Override
-  public void close() throws IOException
-  {
-    buffers = null;
-    currentBuffer = null;
-    super.close();
-  }
-
-  @Override
-  public String toString()
-  {
-    return "BufferInputStream"; //$NON-NLS-1$
-  }
-
-  protected boolean ensureBuffer() throws IOException
-  {
-    final long check = getMillisInterruptCheck();
-    final long timeout = getMillisBeforeTimeout();
-
-    try
-    {
-      if (timeout == NO_TIMEOUT)
-      {
-        while (currentBuffer == null)
-        {
-          if (buffers == null)
-          {
-            // Stream has been closed - shutting down
-            return false;
-          }
-
-          currentBuffer = buffers.poll(check, TimeUnit.MILLISECONDS);
-        }
-      }
-      else
-      {
-        // TODO Consider something faster than currentTimeMillis(), maybe less accurate?
-        final long stop = System.currentTimeMillis() + timeout;
-        while (currentBuffer == null)
-        {
-          if (buffers == null)
-          {
-            // Stream has been closed - shutting down
-            return false;
-          }
-
-          final long remaining = stop - System.currentTimeMillis();
-          if (remaining <= 0)
-          {
-            return false;
-          }
-
-          currentBuffer = buffers.poll(Math.min(remaining, check), TimeUnit.MILLISECONDS);
-        }
-      }
-    }
-    catch (InterruptedException ex)
-    {
-      throw new IOException("Interrupted"); //$NON-NLS-1$
-    }
-
-    eos = currentBuffer.isEOS();
-    return true;
-  }
-
-  public long getMillisBeforeTimeout()
-  {
-    return DEFAULT_MILLIS_BEFORE_TIMEOUT;
-  }
-
-  public long getMillisInterruptCheck()
-  {
-    return DEFAULT_MILLIS_INTERRUPT_CHECK;
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferOutputStream.java
deleted file mode 100644
index bac09e3b59..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferOutputStream.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buffer;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.HexUtil;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * @author Eike Stepper
- */
-public class BufferOutputStream extends OutputStream
-{
-  public static final boolean DEFAULT_PROPAGATE_CLOSE = false;
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER_STREAM, BufferOutputStream.class);
-
-  private IBufferHandler bufferHandler;
-
-  private IBufferProvider bufferProvider;
-
-  private IBuffer currentBuffer;
-
-  private short channelIndex;
-
-  public BufferOutputStream(IBufferHandler bufferHandler, IBufferProvider bufferProvider, short channelIndex)
-  {
-    if (bufferHandler == null)
-    {
-      throw new IllegalArgumentException("bufferHandler == null"); //$NON-NLS-1$
-    }
-
-    if (bufferProvider == null)
-    {
-      throw new IllegalArgumentException("bufferProvider == null"); //$NON-NLS-1$
-    }
-
-    this.bufferHandler = bufferHandler;
-    this.bufferProvider = bufferProvider;
-    this.channelIndex = channelIndex;
-  }
-
-  public BufferOutputStream(IBufferHandler bufferHandler, short channelIndex)
-  {
-    this(bufferHandler, extractBufferProvider(bufferHandler), channelIndex);
-  }
-
-  @SuppressWarnings("deprecation")
-  @Override
-  public void write(int b) throws IOException
-  {
-    ensureBuffer();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("--> " + HexUtil.formatByte(b) //$NON-NLS-1$
-          + (b >= 32 ? " " + Character.toString((char)b) : "")); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    ByteBuffer buffer = currentBuffer.getByteBuffer();
-    buffer.put((byte)b);
-
-    if (!buffer.hasRemaining())
-    {
-      flush();
-    }
-  }
-
-  @Override
-  public void flush() throws IOException
-  {
-    if (currentBuffer != null)
-    {
-      bufferHandler.handleBuffer(currentBuffer);
-      currentBuffer = null;
-    }
-  }
-
-  public void flushWithEOS() throws IOException
-  {
-    ensureBuffer();
-    currentBuffer.setEOS(true);
-    flush();
-  }
-
-  @Override
-  public void close() throws IOException
-  {
-    try
-    {
-      if (isPropagateClose())
-      {
-        LifecycleUtil.deactivate(bufferHandler);
-      }
-    }
-    finally
-    {
-      bufferHandler = null;
-      bufferProvider = null;
-      currentBuffer = null;
-      super.close();
-    }
-  }
-
-  @Override
-  public String toString()
-  {
-    return "BufferOutputStream"; //$NON-NLS-1$
-  }
-
-  protected void ensureBuffer()
-  {
-    if (currentBuffer == null)
-    {
-      currentBuffer = bufferProvider.provideBuffer();
-      currentBuffer.startPutting(channelIndex);
-    }
-  }
-
-  protected boolean isPropagateClose()
-  {
-    return DEFAULT_PROPAGATE_CLOSE;
-  }
-
-  private static IBufferProvider extractBufferProvider(IBufferHandler bufferHandler)
-  {
-    if (bufferHandler instanceof IBufferProvider)
-    {
-      return (IBufferProvider)bufferHandler;
-    }
-
-    throw new IllegalArgumentException("Buffer handler unable to provide buffers"); //$NON-NLS-1$
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferState.java
deleted file mode 100644
index 870beb0df0..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferState.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buffer;
-
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-
-/**
- * Enumerates the internal states of an {@link IBuffer}.
- * <p>
- * <dt><b>State Machine Diagram:</b></dt>
- * <dd><img src="doc-files/BufferStates.png" title="Diagram Buffer States" border="0" usemap="#BufferStates.png"/></dd>
- * <p>
- * <MAP NAME="BufferStates.png"> <AREA SHAPE="RECT" COORDS="300,8,449,34" HREF="BufferState.html#INITIAL"> <AREA
- * SHAPE="RECT" COORDS="46,115,195,139" HREF="BufferState.html#PUTTING"> <AREA SHAPE="RECT" COORDS="48,271,195,295"
- * HREF="BufferState.html#WRITING"> <AREA SHAPE="RECT" COORDS="533,112,681,140" HREF="BufferState.html#READING_HEADER">
- * <AREA SHAPE="RECT" COORDS="533,271,680,295" HREF="BufferState.html#READING_BODY"> <AREA SHAPE="RECT"
- * COORDS="532,428,682,451" HREF="BufferState.html#GETTING"> </MAP>
- * 
- * @author Eike Stepper
- */
-public enum BufferState
-{
-  /**
-   * Indicates that the {@link IBuffer} has just been provided by its {@link IBufferProvider}} or that is has been used
-   * and subsequently {@link IBuffer#clear() cleared}.
-   * <p>
-   * A transition to {@link #PUTTING} can be triggered by calling {@link IBuffer#startPutting(short)} once. If the
-   * buffer is intended to be passed to an {@link org.eclipse.net4j.channel.IChannel IChannel} later the
-   * {@link org.eclipse.net4j.channel.IChannel#getChannelIndex() channel index} of that Channel has to be passed because
-   * it is part of the buffer's header. A {@link ByteBuffer} is returned that can be used for putting data.
-   * <p>
-   * A transition to {@link #GETTING} can be triggered by calling {@link IBuffer#startGetting(SocketChannel)} repeatedly
-   * until it finally returns a {@link ByteBuffer} that can be used for getting data.
-   */
-  INITIAL,
-
-  /**
-   * Indicates that the {@link IBuffer} can provide a {@link ByteBuffer} that can be used for putting data.
-   * <p>
-   * A transition to {@link #WRITING} can be triggered by calling {@link IBuffer#write(SocketChannel)}.
-   * <p>
-   * A transition to {@link #GETTING} can be triggered by calling {@link IBuffer#flip()}.
-   * <p>
-   * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}.
-   * <p>
-   */
-  PUTTING,
-
-  /**
-   * Indicates that the {@link IBuffer} is currently writing its data to a {@link SocketChannel}.
-   * <p>
-   * Self transitions to {@link #WRITING} can be triggered by repeatedly calling {@link IBuffer#write(SocketChannel)}
-   * until it returns <code>true</code>.
-   * <p>
-   * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}.
-   * <p>
-   */
-  WRITING,
-
-  /**
-   * Indicates that the {@link IBuffer} is currently reading its header from a {@link SocketChannel}.
-   * <p>
-   * Transitions to {@link #READING_HEADER}, {@link #READING_BODY} or {@link #GETTING} can be triggered by repeatedly
-   * calling {@link IBuffer#startGetting(SocketChannel)} until it returns a {@link ByteBuffer} that can be used for
-   * getting data.
-   * <p>
-   * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}.
-   * <p>
-   */
-  READING_HEADER,
-
-  /**
-   * Indicates that the {@link IBuffer} is currently reading its body from a {@link SocketChannel}.
-   * <p>
-   * Transitions to {@link #READING_BODY} or {@link #GETTING} can be triggered by repeatedly calling
-   * {@link IBuffer#startGetting(SocketChannel)} until it returns a {@link ByteBuffer} that can be used for getting
-   * data.
-   * <p>
-   * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}.
-   * <p>
-   */
-  READING_BODY,
-
-  /**
-   * Indicates that the {@link IBuffer} can provide a {@link ByteBuffer} that can be used for getting data.
-   * <p>
-   * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}.
-   * <p>
-   */
-  GETTING
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java
deleted file mode 100644
index 60ecc2004d..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buffer;
-
-import org.eclipse.net4j.channel.IChannel;
-
-import org.eclipse.internal.net4j.buffer.Buffer;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-
-/**
- * Basic <b>unit of transport</b> in Net4j.
- * <p>
- * A buffer is well prepared for the usage with asynchronous {@link IChannel}s but can also be used with pure
- * {@link SocketChannel}s. All methods of <code>IBuffer</code> are non-blocking.
- * <p>
- * Usually buffers are obtained from a {@link IBufferProvider}. Buffers can be accessed, passed around and finally
- * {@link #release() released} to their original provider. The capacity of a buffer is determined by its provider.
- * <p>
- * In addition to its payload data each buffer contains an internal header of four bytes, two of them representing a
- * channel identifier the other two of them denoting the length of the payload data. The payload data may be accessed
- * through a {@link #getByteBuffer() ByteBuffer}.
- * <p>
- * This interface is <b>not</b> intended to be implemented by clients.
- * <p>
- * <dt><b>Class Diagram:</b></dt>
- * <dd> <img src="doc-files/Buffers.png" title="Diagram Buffers" border="0" usemap="#Buffers.png"/></dd>
- * <p>
- * <MAP NAME="Buffers.png"> <AREA SHAPE="RECT" COORDS="303,12,403,72" HREF="IBufferHandler.html"> <AREA SHAPE="RECT"
- * COORDS="533,199,619,249" HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/nio/ByteBuffer.html"> <AREA SHAPE="RECT"
- * COORDS="283,126,422,322" HREF="IBuffer.html"> <AREA SHAPE="RECT" COORDS="9,180,155,268" HREF="IBufferProvider.html">
- * <AREA SHAPE="RECT" COORDS="33,321,132,399" HREF="IBufferPool.html"></MAP>
- * <p>
- * <dt><b>State Machine Diagram:</b></dt>
- * <dd><img src="doc-files/BufferStates.png" title="Diagram Buffer States" border="0" usemap="#BufferStates.png"/></dd>
- * <p>
- * <MAP NAME="BufferStates.png"> <AREA SHAPE="RECT" COORDS="300,8,449,34" HREF="BufferState.html#INITIAL"> <AREA
- * SHAPE="RECT" COORDS="46,115,195,139" HREF="BufferState.html#PUTTING"> <AREA SHAPE="RECT" COORDS="48,271,195,295"
- * HREF="BufferState.html#WRITING"> <AREA SHAPE="RECT" COORDS="533,112,681,140" HREF="BufferState.html#READING_HEADER">
- * <AREA SHAPE="RECT" COORDS="533,271,680,295" HREF="BufferState.html#READING_BODY"> <AREA SHAPE="RECT"
- * COORDS="532,428,682,451" HREF="BufferState.html#GETTING"> </MAP>
- * <p>
- * An example for <b>putting</b> values into a buffer and writing it to a {@link SocketChannel}:
- * <p>
- * 
- * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
- * // Obtain a fresh buffer 
- * Buffer buffer = bufferProvider.getBuffer();
- * 
- * // Start filling the buffer for channelIndex 4711
- * ByteBuffer byteBuffer = buffer.startPutting(4711);
- * byteBuffer.putDouble(15.47);
- * 
- * // Write the contents of the Buffer to a 
- * // SocketChannel without blocking 
- * while (!buffer.write(socketChannel))
- * {
- *   // Do something else
- * }
- * </pre>
- * 
- * An example for reading a buffer from a {@link SocketChannel} and <b>getting</b> values from it:
- * <p>
- * 
- * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
- * // Obtain a fresh buffer 
- * Buffer buffer = bufferProvider.getBuffer();
- * 
- * // Read the contents of the Buffer from a 
- * // SocketChannel without blocking 
- * ByteBuffer byteBuffer;
- * while ((byteBuffer = buffer.startGetting(socketChannel)) == null)
- * {
- *   // Do something else
- * }
- * 
- * // Access the contents of the buffer and 
- * // release it to its provider
- * double value = byteBuffer.getDouble();
- * buffer.release();
- * </pre>
- * 
- * @see IBufferProvider
- * @see IChannel#sendBuffer(IBuffer)
- * @see IChannel#setReceiveHandler(IBufferHandler)
- * @see IBufferHandler#handleBuffer(IBuffer)
- * @see Buffer
- * @author Eike Stepper
- */
-public interface IBuffer
-{
-  /**
-   * Possible argument value of {@link #startPutting(short)} and possible return value of {@link #getChannelIndex()}
-   * that indicates that this buffer is not intended to be passed to a {@link SocketChannel}.
-   */
-  public static final short NO_CHANNEL = Short.MIN_VALUE;
-
-  /**
-   * Returns the {@link IBufferProvider} that has provided this buffer and that this buffer will be returned to when its
-   * {@link #release()} method is called.
-   */
-  public IBufferProvider getBufferProvider();
-
-  /**
-   * Returns the channel index value stored in the header of this buffer.
-   */
-  public short getChannelIndex();
-
-  /**
-   * Returns the capacity of this buffer.
-   * <p>
-   * The capacity of this buffer is equal to the {@link IBufferProvider#getBufferCapacity() capacity} of the
-   * {@link IBufferProvider} that has provided this buffer.
-   */
-  public short getCapacity();
-
-  /**
-   * Returns the internal state of this buffer.
-   */
-  public BufferState getState();
-
-  /**
-   * Tries to read a {@link ByteBuffer} from a {@link SocketChannel} that can be used for getting data.
-   * <p>
-   * This method is non-blocking and it can be necessary to repeatedly call it. If it was not possible to read a
-   * complete header from the <code>SocketChannel</code> <code>null</code> is returned and the state of this buffer
-   * is {@link BufferState#READING_HEADER READING_HEADER}. If it was not possible to read a complete body from the
-   * <code>SocketChannel</code> <code>null</code> is returned and the state of this buffer is
-   * {@link BufferState#READING_BODY READING_BODY}.
-   * <p>
-   * If a <code>ByteBuffer</code> is returned it <b>may only</b> be used for getting data. It is left to the
-   * responsibility of the caller that only the following methods of that <code>ByteBuffer</code> are used:
-   * <ul>
-   * <li> {@link ByteBuffer#get()}
-   * <li> {@link ByteBuffer#get(byte[])}
-   * <li> {@link ByteBuffer#get(int)}
-   * <li> {@link ByteBuffer#get(byte[], int, int)}
-   * <li> {@link ByteBuffer#getChar()}
-   * <li> {@link ByteBuffer#getChar(int)}
-   * <li> {@link ByteBuffer#getDouble()}
-   * <li> {@link ByteBuffer#getDouble(int)}
-   * <li> {@link ByteBuffer#getFloat()}
-   * <li> {@link ByteBuffer#getFloat(int)}
-   * <li> {@link ByteBuffer#getInt()}
-   * <li> {@link ByteBuffer#getInt(int)}
-   * <li> {@link ByteBuffer#getLong()}
-   * <li> {@link ByteBuffer#getLong(int)}
-   * <li> {@link ByteBuffer#getShort()}
-   * <li> {@link ByteBuffer#getShort(int)}
-   * <li> all other methods that do not influence {@link ByteBuffer#position()}, {@link ByteBuffer#limit()} and
-   * {@link ByteBuffer#capacity()}
-   * </ul>
-   * 
-   * @param socketChannel
-   *          The <code>socketChannel</code> to read the {@link ByteBuffer} from.
-   * @return A {@link ByteBuffer} that can be used for getting data if it was possible to completely read the data from
-   *         the given <code>SocketChannel</code>, <code>null</code> otherwise.
-   * @throws IllegalStateException
-   *           If the state of this buffer is not {@link BufferState#INITIAL INITIAL},
-   *           {@link BufferState#READING_HEADER READING_HEADER} or {@link BufferState#READING_BODY READING_BODY}.
-   * @throws IOException
-   *           If the <code>SocketChannel</code> has been closed or discovers other I/O problems.
-   */
-  public ByteBuffer startGetting(SocketChannel socketChannel) throws IllegalStateException, IOException;
-
-  /**
-   * Returns a {@link ByteBuffer} that can be used for putting data.
-   * <p>
-   * Turns the {@link #getState() state} of this buffer into {@link BufferState#PUTTING PUTTING}.
-   * <p>
-   * The returned <code>ByteBuffer</code> <b>may only</b> be used for putting data. It is left to the responsibility
-   * of the caller that only the following methods of that <code>ByteBuffer</code> are used:
-   * <ul>
-   * <li> {@link ByteBuffer#put(byte)}
-   * <li> {@link ByteBuffer#put(byte[])}
-   * <li> {@link ByteBuffer#put(ByteBuffer)}
-   * <li> {@link ByteBuffer#put(int, byte)}
-   * <li> {@link ByteBuffer#put(byte[], int, int)}
-   * <li> {@link ByteBuffer#putChar(char)}
-   * <li> {@link ByteBuffer#putChar(int, char)}
-   * <li> {@link ByteBuffer#putDouble(double)}
-   * <li> {@link ByteBuffer#putDouble(int, double)}
-   * <li> {@link ByteBuffer#putFloat(float)}
-   * <li> {@link ByteBuffer#putFloat(int, float)}
-   * <li> {@link ByteBuffer#putInt(int)}
-   * <li> {@link ByteBuffer#putInt(int, int)}
-   * <li> {@link ByteBuffer#putLong(long)}
-   * <li> {@link ByteBuffer#putLong(int, long)}
-   * <li> {@link ByteBuffer#putShort(short)}
-   * <li> {@link ByteBuffer#putShort(int, short)}
-   * <li> all other methods that do not influence {@link ByteBuffer#position()}, {@link ByteBuffer#limit()} and
-   * {@link ByteBuffer#capacity()}
-   * </ul>
-   * 
-   * @param channelIndex
-   *          The index of an {@link IChannel} that this buffer is intended to be passed to later or {@link #NO_CHANNEL}.
-   * @return A {@link ByteBuffer} that can be used for putting data.
-   * @throws IllegalStateException
-   *           If the state of this buffer is not {@link BufferState#INITIAL INITIAL} ({@link BufferState#PUTTING PUTTING}
-   *           is allowed but meaningless if and only if the given <code>channelIndex</code> is equal to the existing
-   *           <code>channelIndex</code> of this buffer).
-   */
-  public ByteBuffer startPutting(short channelIndex) throws IllegalStateException;
-
-  /**
-   * Tries to write the data of this buffer to a {@link SocketChannel}.
-   * <p>
-   * This method is non-blocking and it can be necessary to repeatedly call it. If it was not possible to completely
-   * write the data to the <code>SocketChannel</code> <code>false</code> is returned and the state of this buffer
-   * remains {@link BufferState#WRITING WRITING}.
-   * 
-   * @param socketChannel
-   *          The <code>socketChannel</code> to write the data to.
-   * @return <code>true</code> if it was possible to completely write the data to the <code>SocketChannel</code>,
-   *         <code>false</code> otherwise.
-   * @throws IllegalStateException
-   *           If the state of this buffer is not {@link BufferState#PUTTING PUTTING} or
-   *           {@link BufferState#WRITING WRITING}.
-   * @throws IOException
-   *           If the <code>SocketChannel</code> has been closed or discovers other I/O problems.
-   */
-  public boolean write(SocketChannel socketChannel) throws IllegalStateException, IOException;
-
-  /**
-   * Turns the state of this buffer from {@link BufferState#PUTTING PUTTING} into {@link BufferState#GETTING GETTING}.
-   * 
-   * @throws IllegalStateException
-   *           If the state of this buffer is not {@link BufferState#PUTTING PUTTING}.
-   */
-  public void flip() throws IllegalStateException;
-
-  /**
-   * Returns the <code>ByteBuffer</code> that can be used for putting or getting data.
-   * 
-   * @throws IllegalStateException
-   *           If the state of this buffer is not {@link BufferState#PUTTING PUTTING} or
-   *           {@link BufferState#GETTING GETTING}.
-   */
-  public ByteBuffer getByteBuffer() throws IllegalStateException;
-
-  /**
-   * Returns the <em>End Of Stream</em> flag to indicate whether this buffer is the last buffer in a stream of
-   * buffers.
-   */
-  public boolean isEOS();
-
-  /**
-   * Sets the <em>End Of Stream</em> flag to indicate whether this buffer is the last buffer in a stream of buffers.
-   */
-  public void setEOS(boolean eos);
-
-  /**
-   * Releases this buffer to its original {@link IBufferProvider}.
-   */
-  public void release();
-
-  /**
-   * Turns the state of this buffer from any state into {@link BufferState#INITIAL INITIAL}.
-   */
-  public void clear();
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferHandler.java
deleted file mode 100644
index db4c76a4a5..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferHandler.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buffer;
-
-/**
- * Provides clients with the ability to pass {@link IBuffer}s in for further buffer handling.
- * 
- * @author Eike Stepper
- */
-public interface IBufferHandler
-{
-  /**
-   * Handles an {@link IBuffer} and optionally releases it. The implementor of this method takes over the ownership of
-   * the buffer. Care must be taken to properly {@link IBuffer#release() release} the buffer if the ownership is not
-   * explicitely passed to some further party.
-   * 
-   * @param buffer
-   *          The buffer to be handled and otionally released.
-   */
-  public void handleBuffer(IBuffer buffer);
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferPool.java
deleted file mode 100644
index b830fffcf3..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferPool.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buffer;
-
-/**
- * Provides clients with the ability to obtain and retain pooled {@link IBuffer}s.
- * 
- * @author Eike Stepper
- */
-public interface IBufferPool extends IBufferProvider
-{
-  /**
-   * Tries to remove a single buffer from this <code>BufferPool</code> and {@link IBuffer#release() release} it.
-   * 
-   * @return <code>true</code> if a buffer could be evicted, <code>false</code> otherwise.
-   */
-  public boolean evictOne();
-
-  /**
-   * Tries to remove as many buffers from this <code>BufferPool</code> and {@link IBuffer#release() release} them as
-   * are needed to let a given maximum number of buffers survive in the pool.
-   * 
-   * @return The number of buffers that could be evicted.
-   */
-  public int evict(int survivors);
-
-  /**
-   * Offers additional introspection features for {@link IBufferPool}s.
-   * 
-   * @author Eike Stepper
-   */
-  public interface Introspection extends IBufferPool, IBufferProvider.Introspection
-  {
-    /**
-     * Returns the number of buffers that are currently pooled in this <code>BufferPool</code>.
-     */
-    public int getPooledBuffers();
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferProvider.java
deleted file mode 100644
index cc5f4de542..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.buffer;
-
-/**
- * Provides clients with the ability to obtain and retain {@link IBuffer}s.
- * 
- * @author Eike Stepper
- */
-public interface IBufferProvider
-{
-  /**
-   * Returns the capacity of the buffers provided by {@link #provideBuffer()} .
-   */
-  public short getBufferCapacity();
-
-  /**
-   * Provides a buffer from this <code>BufferProvider</code>.
-   */
-  public IBuffer provideBuffer();
-
-  /**
-   * Retains a buffer to this <code>BufferProvider</code>.
-   */
-  public void retainBuffer(IBuffer buffer);
-
-  /**
-   * Offers additional introspection features for {@link IBufferProvider}s.
-   * 
-   * @author Eike Stepper
-   */
-  public interface Introspection extends IBufferProvider
-  {
-    /**
-     * Returns the number of buffers that have already been provided by this <code>BufferProvider</code>.
-     */
-    public long getProvidedBuffers();
-
-    /**
-     * Returns the number of buffers that have already been retained to this <code>BufferProvider</code>.
-     */
-    public long getRetainedBuffers();
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java
deleted file mode 100644
index ff166549ac..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.channel;
-
-import org.eclipse.net4j.buffer.BufferInputStream;
-
-/**
- * @author Eike Stepper
- */
-public class ChannelInputStream extends BufferInputStream
-{
-  private IChannel channel;
-
-  private long millisBeforeTimeout = DEFAULT_MILLIS_BEFORE_TIMEOUT;
-
-  private long millisInterruptCheck = DEFAULT_MILLIS_INTERRUPT_CHECK;
-
-  public ChannelInputStream(IChannel channel)
-  {
-    this(channel, DEFAULT_MILLIS_BEFORE_TIMEOUT);
-  }
-
-  public ChannelInputStream(IChannel channel, long millisBeforeTimeout)
-  {
-    this.channel = channel;
-    channel.setReceiveHandler(this);
-    this.millisBeforeTimeout = millisBeforeTimeout;
-    millisInterruptCheck = DEFAULT_MILLIS_INTERRUPT_CHECK;
-  }
-
-  public IChannel getChannel()
-  {
-    return channel;
-  }
-
-  public long getMillisBeforeTimeout()
-  {
-    return millisBeforeTimeout;
-  }
-
-  public void setMillisBeforeTimeout(long millisBeforeTimeout)
-  {
-    this.millisBeforeTimeout = millisBeforeTimeout;
-  }
-
-  public long getMillisInterruptCheck()
-  {
-    return millisInterruptCheck;
-  }
-
-  public void setMillisInterruptCheck(long millisInterruptCheck)
-  {
-    this.millisInterruptCheck = millisInterruptCheck;
-  }
-
-  @Override
-  public String toString()
-  {
-    return "ChannelInputStream[" + channel + "]"; //$NON-NLS-1$ //$NON-NLS-2$
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelOutputStream.java
deleted file mode 100644
index 973024532b..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelOutputStream.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.channel;
-
-import org.eclipse.net4j.buffer.BufferOutputStream;
-import org.eclipse.net4j.buffer.IBufferProvider;
-
-/**
- * @author Eike Stepper
- */
-public class ChannelOutputStream extends BufferOutputStream
-{
-  public ChannelOutputStream(IChannel channel)
-  {
-    super(channel, channel.getChannelIndex());
-  }
-
-  public ChannelOutputStream(IChannel channel, IBufferProvider bufferProvider)
-  {
-    super(channel, bufferProvider, channel.getChannelIndex());
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
deleted file mode 100644
index 86b103abfb..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.channel;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferHandler;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.util.event.INotifier;
-
-/**
- * A bidirectional communications channel for the asynchronous exchange of {@link IBuffer}s. A channel is lightweight
- * and virtual in the sense that it does not necessarily represent a single physical connection like a TCP socket
- * connection. The underlying physical connection is represented by a {@link IConnector}.
- * <p>
- * This interface is <b>not</b> intended to be implemented by clients. Providers of channels (for example for new
- * physical connection types) have to extend/subclass
- * {@link org.eclipse.internal.net4j.channel.InternalChannel InternalChannel}.
- * <p>
- * <dt><b>Class Diagram:</b></dt>
- * <dd><img src="doc-files/Channels.png" title="Diagram Buffers" border="0" usemap="#Channels.png"/></dd>
- * <p>
- * <MAP NAME="Channels.png"> <AREA SHAPE="RECT" COORDS="301,8,451,68" HREF="IChannelID.html"> <AREA SHAPE="RECT"
- * COORDS="301,141,451,211" HREF="IChannel.html"> <AREA SHAPE="RECT" COORDS="599,151,696,201"
- * HREF="IBufferHandler.html"> <AREA SHAPE="RECT" COORDS="7,151,96,201" HREF="IConnector.html"> </MAP>
- * <p>
- * <dt><b>Sequence Diagram: Communication Process</b></dt>
- * <dd> <img src="doc-files/CommunicationProcess.jpg" title="Communication Process" border="0"
- * usemap="#CommunicationProcess.jpg"/></dd>
- * <p>
- * <MAP NAME="CommunicationProcess.jpg"> <AREA SHAPE="RECT" COORDS="128,94,247,123" HREF="IConnector.html"> <AREA
- * SHAPE="RECT" COORDS="648,95,767,123" HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="509,254,608,283"
- * HREF="IChannel.html"> <AREA SHAPE="RECT" COORDS="287,355,387,383" HREF="IChannel.html"> <AREA SHAPE="RECT"
- * COORDS="818,195,897,222" HREF="IProtocol.html"> </MAP>
- * <p>
- * An example for opening a channel on an {@link IConnector} and sending an {@link IBuffer}:
- * <p>
- * 
- * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
- * // Open a channel
- * IChannel channel = connector.openChannel();
- * short channelIndex = channel.getChannelIndex();
- * 
- * // Fill a buffer 
- * Buffer buffer = bufferProvider.getBuffer();
- * ByteBuffer byteBuffer = buffer.startPutting(channelIndex);
- * byteBuffer.putDouble(15.47);
- * 
- * // Let the channel send the buffer without blocking 
- * channel.sendBuffer(buffer);
- * </pre>
- * 
- * <p>
- * An example for receiving {@link IBuffer}s from channels on an {@link IConnector}:
- * <p>
- * 
- * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
- * // Create a receive handler
- * final IBufferHandler receiveHandler = new IBufferHandler()
- * {
- *   public void handleBuffer(IBuffer buffer)
- *   {
- *     ByteBuffer byteBuffer = buffer.getByteBuffer();
- *     IOUtil.OUT().println(&quot;Received &quot; + byteBuffer.getDouble());
- *     buffer.release();
- *   }
- * };
- * 
- * // Set the receive handler to all new channels
- * connector.addListener(new ContainerEventAdapter()
- * {
- *   protected void onAdded(IContainer container, Object element)
- *   {
- *     IChannel channel = (IChannel)element;
- *     channel.setReceiveHandler(receiveHandler);
- *   }
- * });
- * </pre>
- * 
- * @author Eike Stepper
- */
-public interface IChannel extends IBufferHandler, INotifier
-{
-  /**
-   * Returns the ID of this channel that is unique among all channels that the connector of this channel has ever
-   * created or will ever create.
-   */
-  public int getChannelID();
-
-  /**
-   * Returns the index of this channel within the array of channels returned from the
-   * {@link IConnector#getChannels() getChannels()} method of the connector of this channel.
-   */
-  public short getChannelIndex();
-
-  /**
-   * Asynchronously sends the given buffer to the receive handler of the peer channel.
-   */
-  public void sendBuffer(IBuffer buffer);
-
-  /**
-   * Returns the <code>IBufferHandler</code> that handles buffers received from the peer channel.
-   */
-  public IBufferHandler getReceiveHandler();
-
-  /**
-   * Sets the <code>IBufferHandler</code> to handle buffers received from the peer channel.
-   */
-  public void setReceiveHandler(IBufferHandler receiveHandler);
-
-  /**
-   * Closes this channel and removes it from its {@link IConnector}.
-   * <p>
-   * Once a channel has been closed it is <b>not</b> allowed anymore to call its {@link #sendBuffer(IBuffer)} method.
-   */
-  public void close();
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannelMultiplexer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannelMultiplexer.java
deleted file mode 100644
index f6c30fc3d9..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannelMultiplexer.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.channel;
-
-/**
- * @author Eike Stepper
- */
-public interface IChannelMultiplexer
-{
-  public void multiplexChannel(IChannel channel);
-
-  public boolean removeChannel(IChannel channel);
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorException.java
deleted file mode 100644
index 2819854169..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.connector;
-
-/**
- * Thrown by an {@link IConnector} to indicate connection problems.
- * 
- * @author Eike Stepper
- */
-public class ConnectorException extends RuntimeException
-{
-  private static final long serialVersionUID = 1L;
-
-  public ConnectorException()
-  {
-  }
-
-  public ConnectorException(String message)
-  {
-    super(message);
-  }
-
-  public ConnectorException(Throwable cause)
-  {
-    super(cause);
-  }
-
-  public ConnectorException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorLocation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorLocation.java
deleted file mode 100644
index b1125698b1..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorLocation.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.connector;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferHandler;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.protocol.IProtocol;
-
-/**
- * Enumerates the roles that an {@link IConnector} can play during the establishment of a physical connection.
- * <p>
- * An active connector that is created by a client application plays a {@link #CLIENT} role and a passive connector that
- * is created by an {@link org.eclipse.net4j.acceptor.IAcceptor IAcceptor} in response to a call to one of the active
- * connector's connect methods plays a {@link #SERVER} role.
- * <p>
- * Note however that the role of a connector is only meaningful to determine how a physical connection has been
- * <em>established</em>. Once it has been established actual communication (opening {@link IChannel}s, sending and
- * receiving {@link IBuffer}s) can occur in both directions without limitation. Values of this enumeration do not
- * necessarily permit general assumption about whether a connector is located in a typical client or server environment.
- * 
- * @see IConnector#connect(long)
- * @see IConnector#connectAsync()
- * @see IConnector#openChannel()
- * @see IConnector#openChannel(IProtocol)
- * @see IConnector#openChannel(String, Object)
- * @see IChannel#sendBuffer(IBuffer)
- * @see IChannel#setReceiveHandler(IBufferHandler)
- * @author Eike Stepper
- */
-public enum ConnectorLocation
-{
-  CLIENT, SERVER
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorState.java
deleted file mode 100644
index f42e5360ae..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorState.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.connector;
-
-import org.eclipse.net4j.util.security.INegotiator;
-
-/**
- * Enumerates the lifecycle states of an {@link IConnector}.
- * <p>
- * <dt><b>State Machine Diagram:</b></dt>
- * <dd><img src="doc-files/ConnectorStates.png" title="Diagram Connector States" border="0"
- * usemap="#ConnectorStates.png"/></dd>
- * <p>
- * <MAP NAME="ConnectorStates.png"> <AREA SHAPE="RECT" COORDS="26,135,143,159" HREF="ConnectorState.html#DISCONNECTED">
- * <AREA SHAPE="RECT" COORDS="449,50,547,73" HREF="ConnectorState.html#CONNECTING"> <AREA SHAPE="RECT"
- * COORDS="449,133,549,159" HREF="ConnectorState.html#NEGOTIATING"> <AREA SHAPE="RECT" COORDS="451,216,545,240"
- * HREF="ConnectorState.html#CONNECTED"> <AREA SHAPE="POLYGON" COORDS="10,89,11,183,164,183,163,109,77,109,77,89,11,88"
- * HREF="../util/lifecycle/ILifecycle.Introspection.html#isActive()"> <AREA SHAPE="POLYGON"
- * COORDS="429,10,428,262,597,263,597,30,483,29,483,10,428,11"
- * HREF="../util/lifecycle/ILifecycle.Introspection.html#isActive()"> </MAP>
- * 
- * @see IConnector#getState()
- * @author Eike Stepper
- */
-public enum ConnectorState
-{
-  /**
-   * Indicates that the {@link IConnector} has not been connected yet or has been disconnected after being connected
-   * previously.
-   * <p>
-   * A connector is <code>DISCONNECTED</code> if and only if it is not
-   * {@link org.eclipse.net4j.util.lifecycle.LifecycleUtil#isActive(Object) active}. A transition to
-   * {@link #CONNECTING} can be triggered by calling {@link IConnector#connect(long)} or
-   * {@link IConnector#connectAsync()}.
-   * 
-   * @see IConnector#getState()
-   * @see org.eclipse.net4j.util.lifecycle.ILifecycle.Introspection#isActive()
-   */
-  DISCONNECTED,
-
-  /**
-   * Indicates that the {@link IConnector} is currently trying to establish an underlying physical connection like a TCP
-   * socket connection.
-   * <p>
-   * A connector can only be <code>CONNECTING</code> if it is
-   * {@link org.eclipse.net4j.util.lifecycle.LifecycleUtil#isActive(Object) active}. As soon as the underlying physical
-   * connection is successfully established the state of the connector automatically transitions to {@link #NEGOTIATING}.
-   * 
-   * @see IConnector#getState()
-   * @see org.eclipse.net4j.util.lifecycle.ILifecycle.Introspection#isActive()
-   */
-  CONNECTING,
-
-  /**
-   * Indicates that the {@link IConnector} has successfully managed to establish the underlying physical connection and
-   * has currently delegated control over this connection to an {@link INegotiator}.
-   * <p>
-   * A connector can only be <code>NEGOTIATING</code> if it is
-   * {@link org.eclipse.net4j.util.lifecycle.LifecycleUtil#isActive(Object) active} and a negotiator has been supplied.
-   * As soon as the negotiator has successfully negotiated both peers (or a negotiator has not been supplied) the state
-   * of the connector automatically transitions to {@link #CONNECTED}.
-   * <p>
-   * Negotiators can implement arbitrary handshake protocols, challenge-response sequences or other authentication
-   * procedures. They can also be used to initially setup connection encryption if the connector implementation is not
-   * able to do so.
-   * 
-   * @see IConnector#getState()
-   * @see org.eclipse.net4j.util.lifecycle.ILifecycle.Introspection#isActive()
-   */
-  NEGOTIATING,
-
-  /**
-   * Indicates that the {@link IConnector} has successfully managed to establish and negotiate the underlying physical
-   * connection and is ready now to perform actual communications.
-   * <p>
-   * A connector can only be <code>CONNECTED</code> if it is
-   * {@link org.eclipse.net4j.util.lifecycle.LifecycleUtil#isActive(Object) active}. A transition to
-   * {@link #DISCONNECTED} can be triggered by calling {@link IConnector#disconnect()}.
-   * 
-   * @see IConnector#getState()
-   * @see org.eclipse.net4j.util.lifecycle.ILifecycle.Introspection#isActive()
-   */
-  CONNECTED
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java
deleted file mode 100644
index 9a928db8fb..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.connector;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferHandler;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.protocol.IProtocol;
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.factory.IFactory;
-import org.eclipse.net4j.util.factory.IFactoryKey;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import java.util.List;
-
-/**
- * One endpoint of a physical connection of arbitrary nature between two communicating parties. A {@link IConnector}
- * encapsulates the process of establishing and closing such connections and has a {@link ConnectorLocation} of
- * {@link ConnectorLocation#CLIENT CLIENT} or {@link ConnectorLocation#SERVER SERVER} with respect to this process. Once
- * a connection is established either party can use its connector to open multiple {@link IChannel}s to asynchronously
- * exchange {@link IBuffer}s.
- * <p>
- * This interface is <b>not</b> intended to be implemented by clients. Providers of connectors for new physical
- * connection types have to subclass {@link org.eclipse.internal.net4j.connector.Connector Connector}.
- * <p>
- * <dt><b>Class Diagram:</b></dt>
- * <dd><img src="doc-files/Connectors.png" title="Diagram Connectors" border="0" usemap="Connectors.png"/></dd>
- * <p>
- * <MAP NAME="Connectors.png"> <AREA SHAPE="RECT" COORDS="259,15,400,75" HREF="IConnectorCredentials.html"> <AREA
- * SHAPE="RECT" COORDS="12,174,138,245" HREF="ConnectorLocation.html"> <AREA SHAPE="RECT" COORDS="258,139,401,281"
- * HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="518,156,642,263" HREF="ConnectorState.html"> <AREA SHAPE="RECT"
- * COORDS="280,360,380,410" HREF="IChannel.html"> </MAP>
- * <p>
- * <dt><b>Sequence Diagram: Communication Process</b></dt>
- * <dd> <img src="doc-files/CommunicationProcess.jpg" title="Communication Process" border="0"
- * usemap="#CommunicationProcess.jpg"/></dd>
- * <p>
- * <MAP NAME="CommunicationProcess.jpg"> <AREA SHAPE="RECT" COORDS="128,94,247,123" HREF="IConnector.html"> <AREA
- * SHAPE="RECT" COORDS="648,95,767,123" HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="509,254,608,283"
- * HREF="IChannel.html"> <AREA SHAPE="RECT" COORDS="287,355,387,383" HREF="IChannel.html"> <AREA SHAPE="RECT"
- * COORDS="818,195,897,222" HREF="IProtocol.html"> </MAP>
- * 
- * @author Eike Stepper
- */
-public interface IConnector extends IContainer<IChannel>
-{
-  public String getURL();
-
-  /**
-   * Indicates which role this connector has played during the establishment of the physical connection.
-   */
-  public ConnectorLocation getLocation();
-
-  /**
-   * Same as <code>{@link #getLocation()} == {@link ConnectorLocation#CLIENT}</code>.
-   */
-  public boolean isClient();
-
-  /**
-   * Same as <code>{@link #getLocation()} == {@link ConnectorLocation#SERVER}</code>.
-   */
-  public boolean isServer();
-
-  /**
-   * Returns the userID of this connector.
-   */
-  public String getUserID();
-
-  /**
-   * Returns the factory registry used by this connector to lookup factories that can create {@link IProtocol}s for
-   * newly opened {@link IChannel}s.
-   * <p>
-   * Automatic protocol creation only happens if {@link #isServer()} returns <code>true</code>.
-   */
-  public IRegistry<IFactoryKey, IFactory> getProtocolFactoryRegistry();
-
-  /**
-   * Returns the post processors used by this connector to modify protocols created for new channels.
-   */
-  public List<IElementProcessor> getProtocolPostProcessors();
-
-  /**
-   * Returns the current state of this onnector.
-   */
-  public ConnectorState getState();
-
-  /**
-   * Same as <code>{@link #getState()} == {@link ConnectorState#CONNECTED}</code>.
-   */
-  public boolean isConnected();
-
-  /**
-   * Asynchronous connect. May leave this {@link IConnector} in a state where
-   * <code>{@link #isConnected()} == false</code>.
-   * <p>
-   */
-  public void connectAsync() throws ConnectorException;
-
-  /**
-   * Blocks until <code>{@link #isConnected()} == true</code> or the given timeout expired.
-   * <p>
-   * 
-   * @throws ConnectorException
-   */
-  public boolean waitForConnection(long timeout) throws ConnectorException;
-
-  /**
-   * Synchronous connect. Blocks until <code>{@link #isConnected()} ==
-   * true</code> or the given timeout expired.
-   * <p>
-   */
-  public boolean connect(long timeout) throws ConnectorException;
-
-  public ConnectorException disconnect();
-
-  /**
-   * Returns an array of currently open channels. Note that the resulting array does not contain <code>null</code>
-   * values. Generally the <code>channelIndex</code> of a channel can not be used as an index into this array.
-   * <p>
-   */
-  public IChannel[] getChannels();
-
-  /**
-   * Synchronous request to open a new {@link IChannel} with an undefined channel protocol. Since the peer connector
-   * can't lookup a protocol {@link IFactory factory} without a protocol identifier the {@link IBufferHandler} of the
-   * peer {@link IChannel} can only be provided by externally provided channel {@link ILifecycle lifecycle}
-   * {@link IListener listeners}.
-   * <p>
-   * 
-   * @see #openChannel(String, Object)
-   * @see #openChannel(IProtocol)
-   */
-  public IChannel openChannel() throws ConnectorException;
-
-  /**
-   * Synchronous request to open a new {@link IChannel} with a channel protocol defined by a given protocol identifier.
-   * The peer connector will lookup a protocol {@link IFactory factory} with the protocol identifier, create a
-   * {@link IBufferHandler} and inject it into the peer {@link IChannel}.
-   * <p>
-   * 
-   * @see #openChannel()
-   * @see #openChannel(IProtocol)
-   */
-  public IChannel openChannel(String protocolID, Object infraStructure) throws ConnectorException;
-
-  /**
-   * Synchronous request to open a new {@link IChannel} with the given channel protocol . The peer connector will lookup
-   * a protocol {@link IFactory factory} with the protocol identifier, create a {@link IBufferHandler} and inject it
-   * into the peer channel.
-   * <p>
-   * 
-   * @see #openChannel()
-   * @see #openChannel(String, Object)
-   */
-  public IChannel openChannel(IProtocol protocol) throws ConnectorException;
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorEvent.java
deleted file mode 100644
index 1a85215a0c..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.connector;
-
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * An event that is fired by an {@link IConnector}.
- * 
- * @author Eike Stepper
- */
-public interface IConnectorEvent extends IEvent
-{
-  /**
-   * The {@link IConnector} that sent this event.
-   * 
-   * @see IContainerEvent#getContainer()
-   */
-  public IConnector getConnector();
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java
deleted file mode 100644
index 4dc5699eae..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.connector;
-
-/**
- * An event that is fired by an {@link IConnector} to indicate that its state has changed.
- * 
- * @author Eike Stepper
- */
-public interface IConnectorStateEvent extends IConnectorEvent
-{
-  /**
-   * The old state of the {@link IConnector} that sent this event.
-   */
-  public ConnectorState getOldState();
-
-  /**
-   * The new state of the {@link IConnector} that sent this event.
-   */
-  public ConnectorState getNewState();
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Acceptors.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Acceptors.png
deleted file mode 100644
index 60bdf17416..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Acceptors.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.old.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.old.png
deleted file mode 100644
index be484f67d3..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.old.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.png
deleted file mode 100644
index c1a91bf1b1..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Buffers.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Buffers.png
deleted file mode 100644
index 818b129951..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Buffers.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Channels.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Channels.png
deleted file mode 100644
index 4dc14775af..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Channels.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.jpg b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.jpg
deleted file mode 100644
index 56fa6c2dae..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.jpg
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.uxf b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.uxf
deleted file mode 100644
index 6a92e29264..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.uxf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><umlet_diagram><element><type>com.umlet.element.base.Relation</type><coordinates><x>200</x><y>670</y><w>40</w><h>220</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;200</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>350</x><y>700</y><w>40</w><h>190</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;170</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>450</y><w>540</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>20;20;520;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>730</x><y>360</y><w>170</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>20;20;150;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>630</y><w>540</w><h>90</h></coordinates><panel_attributes>lt=&lt;.
-            sendToPeer</panel_attributes><additional_attributes>520;70;280;70;280;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>286</y><w>540</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-registerWithPeer</panel_attributes><additional_attributes>520;34;20;34</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>580</x><y>810</y><w>170</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>150;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>580</x><y>780</y><w>320</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>20;20;300;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>660</y><w>170</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>150;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>70</x><y>690</y><w>310</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>20;20;290;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>70</x><y>540</y><w>160</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>20;20;140;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>520</y><w>170</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>20;20;150;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>580</x><y>420</y><w>170</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>150;20;20;20</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>70</x><y>260</y><w>20</w><h>610</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>730</x><y>690</y><w>20</w><h>150</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Class</type><coordinates><x>160</x><y>230</y><w>120</w><h>30</h></coordinates><panel_attributes>clientConnector
-bg=pink</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Class</type><coordinates><x>320</x><y>490</y><w>100</w><h>30</h></coordinates><panel_attributes>clientChannel
-bg=pink</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>870</x><y>790</y><w>40</w><h>100</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;80</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>720</x><y>820</y><w>40</w><h>70</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;50</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>570</x><y>820</y><w>40</w><h>70</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;50</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>580</x><y>720</y><w>20</w><h>120</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>730</x><y>310</y><w>20</w><h>170</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>580</x><y>696</y><w>170</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-fromMultiplexer</panel_attributes><additional_attributes>20;34;150;34</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>350</x><y>500</y><w>40</w><h>50</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;30</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>360</x><y>530</y><w>20</w><h>20</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>350</x><y>530</y><w>40</w><h>70</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;50</additional_attributes></element><element><type>com.umlet.element.base.Class</type><coordinates><x>850</x><y>330</y><w>80</w><h>30</h></coordinates><panel_attributes>protocol
-bg=pink</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Class</type><coordinates><x>680</x><y>230</y><w>120</w><h>30</h></coordinates><panel_attributes>serverConnector
-bg=pink</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Class</type><coordinates><x>540</x><y>390</y><w>100</w><h>30</h></coordinates><panel_attributes>serverChannel
-bg=pink</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>880</x><y>750</y><w>20</w><h>60</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>580</x><y>726</y><w>320</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-                  handleBuffer</panel_attributes><additional_attributes>300;34;20;34</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>360</x><y>580</y><w>20</w><h>140</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>70</x><y>556</y><w>310</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-                  sendBuffer</panel_attributes><additional_attributes>290;34;20;34</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>210</x><y>290</y><w>20</w><h>280</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>466</y><w>130</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-create</panel_attributes><additional_attributes>110;34;20;34</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>210</x><y>610</y><w>20</w><h>80</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>586</y><w>170</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-multiplexBuffer</panel_attributes><additional_attributes>20;34;150;34</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>570</x><y>400</y><w>40</w><h>50</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;30</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>570</x><y>430</y><w>40</w><h>310</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;290</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>580</x><y>430</y><w>20</w><h>20</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>730</x><y>306</y><w>140</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-create</panel_attributes><additional_attributes>120;34;20;34</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>870</x><y>370</y><w>40</w><h>400</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;380</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>870</x><y>340</y><w>40</w><h>50</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;30</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>720</x><y>240</y><w>40</w><h>90</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;70</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>620</x><y>366</y><w>130</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-create</panel_attributes><additional_attributes>20;34;110;34</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>70</x><y>266</y><w>160</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-openChannel</panel_attributes><additional_attributes>140;34;20;34</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>720</x><y>460</y><w>40</w><h>250</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;230</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>200</x><y>550</y><w>40</w><h>80</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;60</additional_attributes></element><element><type>com.umlet.element.base.Actor</type><coordinates><x>60</x><y>150</y><w>45</w><h>120</h></coordinates><panel_attributes>Actor</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Actor</type><coordinates><x>60</x><y>150</y><w>45</w><h>120</h></coordinates><panel_attributes>Actor</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>200</x><y>240</y><w>40</w><h>70</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;50;20;20</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>880</x><y>370</y><w>20</w><h>20</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element></umlet_diagram>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.jpg b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.jpg
deleted file mode 100644
index 1cde3438b7..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.jpg
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.uxf b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.uxf
deleted file mode 100644
index ac9b745a4f..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.uxf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><umlet_diagram><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>530</x><y>300</y><w>20</w><h>380</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>350</x><y>620</y><w>40</w><h>80</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;60</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>200</x><y>620</y><w>40</w><h>80</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;60</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>40</x><y>130</y><w>20</w><h>550</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>40</x><y>196</y><w>190</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-connect</panel_attributes><additional_attributes>170;34;20;34</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>210</x><y>220</y><w>20</w><h>420</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>40</x><y>610</y><w>190</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>20;20;170;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>360</x><y>610</y><w>190</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>170;20;20;20</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>360</x><y>410</y><w>20</w><h>230</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.custom.InteractionFrame</type><coordinates><x>80</x><y>530</y><w>380</w><h>80</h></coordinates><panel_attributes>negotiation
-phase</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>550</y><w>170</w><h>40</h></coordinates><panel_attributes>lt=&lt;.&gt;
-</panel_attributes><additional_attributes>150;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>460</y><w>170</w><h>40</h></coordinates><panel_attributes>lt=&lt;.&gt;
-</panel_attributes><additional_attributes>150;20;20;20</additional_attributes></element><element><type>com.umlet.element.custom.InteractionFrame</type><coordinates><x>80</x><y>440</y><w>380</w><h>80</h></coordinates><panel_attributes>connection
-phase</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Class</type><coordinates><x>160</x><y>150</y><w>120</w><h>30</h></coordinates><panel_attributes>clientConnector
-bg=pink</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>360</x><y>370</y><w>190</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>170;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>360</x><y>386</y><w>190</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-connect</panel_attributes><additional_attributes>20;34;170;34</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>350</x><y>380</y><w>40</w><h>50</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;30</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>40</x><y>180</y><w>190</w><h>40</h></coordinates><panel_attributes>lt=&lt;</panel_attributes><additional_attributes>20;20;170;20</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>360</x><y>380</y><w>20</w><h>20</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>410</x><y>316</y><w>140</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-create</panel_attributes><additional_attributes>20;34;120;34</additional_attributes></element><element><type>com.umlet.element.base.Class</type><coordinates><x>310</x><y>340</y><w>120</w><h>30</h></coordinates><panel_attributes>serverConnector
-bg=pink</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>520</x><y>100</y><w>40</w><h>220</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;200</additional_attributes></element><element><type>com.umlet.element.base.Class</type><coordinates><x>500</x><y>90</y><w>80</w><h>30</h></coordinates><panel_attributes>acceptor
-bg=pink</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>40</x><y>126</y><w>140</w><h>54</h></coordinates><panel_attributes>lt=&lt;&lt;-
-create</panel_attributes><additional_attributes>120;34;20;34</additional_attributes></element><element><type>com.umlet.element.custom.SeqObjectActive</type><coordinates><x>210</x><y>190</y><w>20</w><h>20</h></coordinates><panel_attributes>bg=yellow</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>200</x><y>190</y><w>40</w><h>50</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;30</additional_attributes></element><element><type>com.umlet.element.base.Actor</type><coordinates><x>30</x><y>20</y><w>45</w><h>120</h></coordinates><panel_attributes>Actor</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Actor</type><coordinates><x>30</x><y>20</y><w>45</w><h>120</h></coordinates><panel_attributes>Actor</panel_attributes><additional_attributes></additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>200</x><y>160</y><w>40</w><h>50</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;30;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>350</x><y>350</y><w>40</w><h>50</h></coordinates><panel_attributes>lt=.</panel_attributes><additional_attributes>20;20;20;30</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>210</x><y>230</y><w>340</w><h>100</h></coordinates><panel_attributes>lt=&lt;.
-           accept</panel_attributes><additional_attributes>320;80;120;80;190;20;20;20</additional_attributes></element></umlet_diagram>
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectorStates.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectorStates.png
deleted file mode 100644
index 238d1e6c0f..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectorStates.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Connectors.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Connectors.png
deleted file mode 100644
index 73066c3737..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Connectors.png
+++ /dev/null
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html
deleted file mode 100644
index 8e8f36f4bd..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-The Net4j transport layer. 
-The four main interfaces of the transport layer are 
-{@link org.eclipse.net4j.buffer.IBuffer}, 
-{@link org.eclipse.net4j.channel.IChannel}, 
-{@link org.eclipse.net4j.connector.IConnector} and 
-{@link org.eclipse.net4j.protocol.IProtocol}.
-<p>
-
-<dt><b>Sequence Diagram: Communication Process</b></dt>
-<dd> <img src="doc-files/CommunicationProcess.jpg" title="Communication Process" border="0"
-usemap="#CommunicationProcess.jpg"/></dd>
-<p>
-<MAP NAME="CommunicationProcess.jpg">
-<AREA SHAPE="RECT" COORDS="128,94,247,123" HREF="IConnector.html">
-<AREA SHAPE="RECT" COORDS="648,95,767,123" HREF="IConnector.html">
-<AREA SHAPE="RECT" COORDS="509,254,608,283" HREF="IChannel.html">
-<AREA SHAPE="RECT" COORDS="287,355,387,383" HREF="IChannel.html">
-<AREA SHAPE="RECT" COORDS="818,195,897,222" HREF="IProtocol.html">
-
-</MAP>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocol.java
deleted file mode 100644
index 4c2e810657..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocol.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.protocol;
-
-import org.eclipse.net4j.buffer.IBufferHandler;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.channel.IChannel;
-
-import java.util.concurrent.ExecutorService;
-
-/**
- * @author Eike Stepper
- */
-public interface IProtocol extends IBufferHandler
-{
-  public String getType();
-
-  public IChannel getChannel();
-
-  public void setChannel(IChannel channel);
-
-  public Object getInfraStructure();
-
-  public void setInfraStructure(Object infraStructure);
-
-  public IBufferProvider getBufferProvider();
-
-  public void setBufferProvider(IBufferProvider bufferProvider);
-
-  public ExecutorService getExecutorService();
-
-  public void setExecutorService(ExecutorService executorService);
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocolProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocolProvider.java
deleted file mode 100644
index 149e673bfd..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocolProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.protocol;
-
-import org.eclipse.net4j.channel.IChannel;
-
-/**
- * @author Eike Stepper
- */
-public interface IProtocolProvider
-{
-  public IProtocol getClientProtocol(String type, IChannel channel);
-
-  public IProtocol getServerProtocol(String type, IChannel channel);
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
deleted file mode 100644
index 731a005fbe..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal;
-
-import org.eclipse.net4j.buffer.BufferInputStream;
-import org.eclipse.net4j.buffer.BufferOutputStream;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Indication extends SignalReactor
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, Indication.class);
-
-  protected Indication()
-  {
-  }
-
-  @Override
-  protected final void execute(BufferInputStream in, BufferOutputStream out) throws Exception
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("================ Indicating " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$
-    }
-
-    InputStream wrappedInputStream = wrapInputStream(in);
-    indicating(ExtendedDataInputStream.wrap(wrappedInputStream));
-    finishInputStream(wrappedInputStream);
-  }
-
-  protected abstract void indicating(ExtendedDataInputStream in) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
deleted file mode 100644
index aa2a2770e0..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal;
-
-import org.eclipse.net4j.buffer.BufferInputStream;
-import org.eclipse.net4j.buffer.BufferOutputStream;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public abstract class IndicationWithResponse extends SignalReactor
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, IndicationWithResponse.class);
-
-  protected IndicationWithResponse()
-  {
-  }
-
-  @Override
-  protected void execute(BufferInputStream in, BufferOutputStream out) throws Exception
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("================ Indicating " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$
-    }
-
-    InputStream wrappedInputStream = wrapInputStream(in);
-    indicating(ExtendedDataInputStream.wrap(wrappedInputStream));
-    finishInputStream(wrappedInputStream);
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("================ Responding " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$
-    }
-
-    OutputStream wrappedOutputStream = wrapOutputStream(out);
-    responding(ExtendedDataOutputStream.wrap(wrappedOutputStream));
-    finishOutputStream(wrappedOutputStream);
-    out.flushWithEOS();
-  }
-
-  protected abstract void indicating(ExtendedDataInputStream in) throws IOException;
-
-  /**
-   * <b>Important Note:</b> The response must not be empty, i.e. the stream must be used at least to write a
-   * <code>boolean</code>. Otherwise synchronization problems will result!
-   */
-  protected abstract void responding(ExtendedDataOutputStream out) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java
deleted file mode 100644
index daae00f130..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal;
-
-import org.eclipse.net4j.buffer.BufferInputStream;
-import org.eclipse.net4j.buffer.BufferOutputStream;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Request extends SignalActor<Object>
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, Request.class);
-
-  protected Request(IChannel channel)
-  {
-    super(channel);
-  }
-
-  @Override
-  protected final void execute(BufferInputStream in, BufferOutputStream out) throws Exception
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("================ Requesting " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$
-    }
-
-    OutputStream wrappedOutputStream = wrapOutputStream(out);
-    requesting(ExtendedDataOutputStream.wrap(wrappedOutputStream));
-    finishOutputStream(wrappedOutputStream);
-    out.flushWithEOS();
-  }
-
-  protected abstract void requesting(ExtendedDataOutputStream out) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java
deleted file mode 100644
index 5885a6fbd9..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal;
-
-import org.eclipse.net4j.buffer.BufferInputStream;
-import org.eclipse.net4j.buffer.BufferOutputStream;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public abstract class RequestWithConfirmation<RESULT> extends SignalActor<RESULT>
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, RequestWithConfirmation.class);
-
-  protected RequestWithConfirmation(IChannel channel)
-  {
-    super(channel);
-  }
-
-  @Override
-  protected final void execute(BufferInputStream in, BufferOutputStream out) throws Exception
-  {
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("================ Requesting " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$
-    }
-
-    OutputStream wrappedOutputStream = wrapOutputStream(out);
-    requesting(ExtendedDataOutputStream.wrap(wrappedOutputStream));
-    finishOutputStream(wrappedOutputStream);
-    out.flushWithEOS();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("================ Confirming " + ReflectUtil.getSimpleClassName(this)); //$NON-NLS-1$
-    }
-
-    InputStream wrappedInputStream = wrapInputStream(in);
-    RESULT result = confirming(ExtendedDataInputStream.wrap(wrappedInputStream));
-    finishInputStream(wrappedInputStream);
-    setResult(result);
-  }
-
-  protected abstract void requesting(ExtendedDataOutputStream out) throws IOException;
-
-  /**
-   * <b>Important Note:</b> The confirmation must not be empty, i.e. the stream must be used at least to read a
-   * <code>boolean</code>. Otherwise synchronization problems will result!
-   */
-  protected abstract RESULT confirming(ExtendedDataInputStream in) throws IOException;
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
deleted file mode 100644
index 747cb476f4..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal;
-
-import org.eclipse.net4j.buffer.BufferInputStream;
-import org.eclipse.net4j.buffer.BufferOutputStream;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.io.IORuntimeException;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.concurrent.TimeoutException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Signal implements Runnable
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, Signal.class);
-
-  private SignalProtocol protocol;
-
-  private int correlationID;
-
-  private BufferInputStream bufferInputStream;
-
-  private BufferOutputStream bufferOutputStream;
-
-  protected Signal()
-  {
-  }
-
-  public SignalProtocol getProtocol()
-  {
-    return protocol;
-  }
-
-  protected final int getCorrelationID()
-  {
-    return correlationID;
-  }
-
-  protected final BufferInputStream getBufferInputStream()
-  {
-    return bufferInputStream;
-  }
-
-  protected final BufferOutputStream getBufferOutputStream()
-  {
-    return bufferOutputStream;
-  }
-
-  protected InputStream wrapInputStream(InputStream in)
-  {
-    try
-    {
-      return protocol.wrapInputStream(in);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  protected OutputStream wrapOutputStream(OutputStream out)
-  {
-    try
-    {
-      return protocol.wrapOutputStream(out);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  protected void finishInputStream(InputStream in)
-  {
-    try
-    {
-      protocol.finishInputStream(in);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  protected void finishOutputStream(OutputStream out)
-  {
-    try
-    {
-      protocol.finishOutputStream(out);
-    }
-    catch (IOException ex)
-    {
-      throw new IORuntimeException(ex);
-    }
-  }
-
-  public final void run()
-  {
-    String threadName = null;
-    try
-    {
-      if (OM.SET_SIGNAL_THREAD_NAME)
-      {
-        threadName = getClass().getSimpleName();
-        Thread.currentThread().setName(threadName);
-      }
-
-      runSync();
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-    }
-    finally
-    {
-      if (threadName != null)
-      {
-        Thread.currentThread().setName(threadName + "(FINISHED)");
-      }
-    }
-  }
-
-  protected void runSync() throws Exception
-  {
-    try
-    {
-      execute(bufferInputStream, bufferOutputStream);
-    }
-    catch (EOFException ex)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace(ex);
-      }
-
-      throw new TimeoutException("Timeout");
-    }
-    catch (Exception ex)
-    {
-      throw ex;
-    }
-    finally
-    {
-      getProtocol().stopSignal(this);
-    }
-  }
-
-  protected abstract short getSignalID();
-
-  protected abstract void execute(BufferInputStream in, BufferOutputStream out) throws Exception;
-
-  void setProtocol(SignalProtocol protocol)
-  {
-    this.protocol = protocol;
-  }
-
-  void setCorrelationID(int correlationID)
-  {
-    this.correlationID = correlationID;
-  }
-
-  void setBufferInputStream(BufferInputStream inputStream)
-  {
-    this.bufferInputStream = inputStream;
-  }
-
-  void setBufferOutputStream(BufferOutputStream outputStream)
-  {
-    this.bufferOutputStream = outputStream;
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
deleted file mode 100644
index 6d09fb36ee..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal;
-
-import org.eclipse.net4j.buffer.BufferInputStream;
-import org.eclipse.net4j.buffer.IBufferHandler;
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.util.ReflectUtil;
-
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- */
-public abstract class SignalActor<RESULT> extends Signal
-{
-  public static final long NO_TIMEOUT = BufferInputStream.NO_TIMEOUT;
-
-  private boolean terminated;
-
-  private RESULT result;
-
-  protected SignalActor(IChannel channel)
-  {
-    SignalProtocol protocol = extractSignalProtocol(channel);
-    setProtocol(protocol);
-    setCorrelationID(protocol.getNextCorrelationID());
-  }
-
-  public RESULT send() throws Exception
-  {
-    return send(NO_TIMEOUT);
-  }
-
-  public RESULT send(long timeout) throws Exception
-  {
-    if (terminated)
-    {
-      throw new IllegalStateException("Terminated"); //$NON-NLS-1$
-    }
-
-    getProtocol().startSignal(this, timeout);
-    terminated = true;
-    return result;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("{0}[{1}, {2}, correlation={3} {4}]", ReflectUtil.getSimpleName(getClass()),
-        getSignalID(), getProtocol(), getCorrelationID(), terminated ? "SENT" : "UNSENT");
-  }
-
-  protected void setResult(RESULT result)
-  {
-    this.result = result;
-  }
-
-  private static SignalProtocol extractSignalProtocol(IChannel channel)
-  {
-    IBufferHandler receiveHandler = channel.getReceiveHandler();
-    if (receiveHandler == null)
-    {
-      throw new IllegalArgumentException("Channel has no protocol"); //$NON-NLS-1$
-    }
-
-    if (receiveHandler instanceof SignalProtocol)
-    {
-      return (SignalProtocol)receiveHandler;
-    }
-
-    throw new IllegalArgumentException("Channel has no signal protocol"); //$NON-NLS-1$
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
deleted file mode 100644
index 405e84d68d..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal;
-
-import org.eclipse.net4j.buffer.BufferInputStream;
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.buffer.IBufferProvider;
-import org.eclipse.net4j.channel.ChannelOutputStream;
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.io.IStreamWrapper;
-import org.eclipse.net4j.util.io.StreamWrapperChain;
-
-import org.eclipse.internal.net4j.bundle.OM;
-import org.eclipse.internal.net4j.protocol.Protocol;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.text.MessageFormat;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author Eike Stepper
- */
-public abstract class SignalProtocol extends Protocol
-{
-  public static final long NO_TIMEOUT = BufferInputStream.NO_TIMEOUT;
-
-  private static final int MIN_CORRELATION_ID = 1;
-
-  private static final int MAX_CORRELATION_ID = Integer.MAX_VALUE;
-
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, SignalProtocol.class);
-
-  private static final ContextTracer STREAM_TRACER = new ContextTracer(OM.DEBUG_BUFFER_STREAM, SignalProtocol.class);
-
-  private IStreamWrapper streamWrapper;
-
-  private Map<Integer, Signal> signals = new ConcurrentHashMap<Integer, Signal>(0);
-
-  private int nextCorrelationID = MIN_CORRELATION_ID;
-
-  protected SignalProtocol()
-  {
-  }
-
-  public IStreamWrapper getStreamWrapper()
-  {
-    return streamWrapper;
-  }
-
-  public void setStreamWrapper(IStreamWrapper streamWrapper)
-  {
-    this.streamWrapper = streamWrapper;
-  }
-
-  public void addStreamWrapper(IStreamWrapper streamWrapper)
-  {
-    if (this.streamWrapper == null)
-    {
-      this.streamWrapper = streamWrapper;
-    }
-    else
-    {
-      this.streamWrapper = new StreamWrapperChain(streamWrapper, this.streamWrapper);
-    }
-  }
-
-  public boolean waitForSignals(long timeout)
-  {
-    synchronized (signals)
-    {
-      while (!signals.isEmpty())
-      {
-        try
-        {
-          signals.wait(timeout);
-        }
-        catch (InterruptedException ex)
-        {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
-  public InputStream wrapInputStream(InputStream in) throws IOException
-  {
-    if (streamWrapper != null)
-    {
-      in = streamWrapper.wrapInputStream(in);
-    }
-
-    return in;
-  }
-
-  public OutputStream wrapOutputStream(OutputStream out) throws IOException
-  {
-    if (streamWrapper != null)
-    {
-      out = streamWrapper.wrapOutputStream(out);
-    }
-
-    return out;
-  }
-
-  public void finishInputStream(InputStream in) throws IOException
-  {
-    if (streamWrapper != null)
-    {
-      streamWrapper.finishInputStream(in);
-    }
-  }
-
-  public void finishOutputStream(OutputStream out) throws IOException
-  {
-    if (streamWrapper != null)
-    {
-      streamWrapper.finishOutputStream(out);
-    }
-  }
-
-  public void handleBuffer(IBuffer buffer)
-  {
-    ByteBuffer byteBuffer = buffer.getByteBuffer();
-    int correlationID = byteBuffer.getInt();
-    if (TRACER.isEnabled())
-    {
-      TRACER.trace("Received buffer for correlation " + correlationID); //$NON-NLS-1$
-    }
-
-    Signal signal;
-    synchronized (signals)
-    {
-      if (correlationID > 0)
-      {
-        // Incoming indication
-        signal = signals.get(-correlationID);
-        if (signal == null)
-        {
-          short signalID = byteBuffer.getShort();
-          if (TRACER.isEnabled())
-          {
-            TRACER.trace("Got signal id " + signalID); //$NON-NLS-1$
-          }
-
-          signal = createSignalReactor(signalID);
-          signal.setProtocol(this);
-          signal.setCorrelationID(-correlationID);
-          signal.setBufferInputStream(new SignalInputStream(getInputStreamTimeout()));
-          signal.setBufferOutputStream(new SignalOutputStream(-correlationID, signalID, false));
-          signals.put(-correlationID, signal);
-          getExecutorService().execute(signal);
-        }
-      }
-      else
-      {
-        // Incoming confirmation
-        signal = signals.get(-correlationID);
-        if (signal == null)
-        {
-          if (TRACER.isEnabled())
-          {
-            TRACER.trace("Discarding buffer"); //$NON-NLS-1$
-          }
-
-          buffer.release();
-        }
-      }
-    }
-
-    if (signal != null) // Can be null after timeout
-    {
-      BufferInputStream inputStream = signal.getBufferInputStream();
-      inputStream.handleBuffer(buffer);
-    }
-  }
-
-  public long getInputStreamTimeout()
-  {
-    return NO_TIMEOUT;
-  }
-
-  @Override
-  public String toString()
-  {
-    return MessageFormat.format("SignalProtocol[{0}]", getType()); //$NON-NLS-1$ 
-  }
-
-  protected final SignalReactor createSignalReactor(short signalID)
-  {
-    checkActive();
-    SignalReactor signal = doCreateSignalReactor(signalID);
-    if (signal == null)
-    {
-      throw new IllegalArgumentException("Invalid signalID " + signalID);
-    }
-
-    return signal;
-  }
-
-  protected abstract SignalReactor doCreateSignalReactor(short signalID);
-
-  void startSignal(SignalActor<?> signalActor, long timeout) throws Exception
-  {
-    if (signalActor.getProtocol() != this)
-    {
-      throw new IllegalArgumentException("signalActor.getProtocol() != this"); //$NON-NLS-1$
-    }
-
-    short signalID = signalActor.getSignalID();
-    int correlationID = signalActor.getCorrelationID();
-    signalActor.setBufferInputStream(new SignalInputStream(timeout));
-    signalActor.setBufferOutputStream(new SignalOutputStream(correlationID, signalID, true));
-    synchronized (signals)
-    {
-      signals.put(correlationID, signalActor);
-    }
-
-    signalActor.runSync();
-  }
-
-  void stopSignal(Signal signal)
-  {
-    int correlationID = signal.getCorrelationID();
-    synchronized (signals)
-    {
-      signals.remove(correlationID);
-      signals.notifyAll();
-    }
-  }
-
-  synchronized int getNextCorrelationID()
-  {
-    int correlationID = nextCorrelationID;
-    if (nextCorrelationID == MAX_CORRELATION_ID)
-    {
-      if (TRACER.isEnabled())
-      {
-        TRACER.trace("Correlation wrap around"); //$NON-NLS-1$
-      }
-
-      nextCorrelationID = MIN_CORRELATION_ID;
-    }
-    else
-    {
-      ++nextCorrelationID;
-    }
-
-    return correlationID;
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class SignalInputStream extends BufferInputStream
-  {
-    private long timeout;
-
-    public SignalInputStream(long timeout)
-    {
-      this.timeout = timeout;
-    }
-
-    @Override
-    public long getMillisBeforeTimeout()
-    {
-      return timeout;
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  class SignalOutputStream extends ChannelOutputStream
-  {
-    public SignalOutputStream(final int correlationID, final short signalID, final boolean addSignalID)
-    {
-      super(getChannel(), new IBufferProvider()
-      {
-        private IBufferProvider delegate = getBufferProvider();
-
-        private boolean firstBuffer = addSignalID;
-
-        public short getBufferCapacity()
-        {
-          return delegate.getBufferCapacity();
-        }
-
-        public IBuffer provideBuffer()
-        {
-          IBuffer buffer = delegate.provideBuffer();
-          ByteBuffer byteBuffer = buffer.startPutting(getChannel().getChannelIndex());
-          if (STREAM_TRACER.isEnabled())
-          {
-            STREAM_TRACER.trace("Providing buffer for correlation " + correlationID); //$NON-NLS-1$
-          }
-
-          byteBuffer.putInt(correlationID);
-          if (firstBuffer)
-          {
-            if (SignalProtocol.TRACER.isEnabled())
-            {
-              STREAM_TRACER.trace("Put signal id " + signalID); //$NON-NLS-1$
-            }
-
-            byteBuffer.putShort(signalID);
-          }
-
-          firstBuffer = false;
-          return buffer;
-        }
-
-        public void retainBuffer(IBuffer buffer)
-        {
-          delegate.retainBuffer(buffer);
-        }
-      });
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
deleted file mode 100644
index 0e10d29b2c..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal;
-
-import org.eclipse.net4j.util.ReflectUtil;
-
-/**
- * @author Eike Stepper
- */
-public abstract class SignalReactor extends Signal
-{
-  protected SignalReactor()
-  {
-  }
-
-  @Override
-  public String toString()
-  {
-    return ReflectUtil.getSimpleName(getClass()) + "[" + getSignalID() + ", " + getProtocol() + ", correlation=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        + getCorrelationID() + "]"; //$NON-NLS-1$
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java
deleted file mode 100644
index 39304305f4..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal.failover;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.util.event.Notifier;
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.signal.SignalActor;
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.util.CheckUtil;
-
-import java.util.concurrent.TimeoutException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class FailOverStrategy extends Notifier implements IFailOverStrategy
-{
-  public FailOverStrategy()
-  {
-  }
-
-  public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request) throws Exception
-  {
-    return send(request, SignalActor.NO_TIMEOUT);
-  }
-
-  public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request, long timeout) throws Exception
-  {
-    for (;;)
-    {
-      try
-      {
-        return request.send(timeout);
-      }
-      catch (TimeoutException exeption)
-      {
-        failOver(request.getProtocol());
-      }
-    }
-  }
-
-  protected void failOver(SignalProtocol protocol)
-  {
-    IChannel oldChannel = protocol.getChannel();
-    IConnector newConnector = getNewConnector(oldChannel);
-    CheckUtil.checkNull(newConnector, "newConnector");
-
-    IChannel newChannel = newConnector.openChannel(protocol);
-    protocol.setChannel(newChannel);
-    oldChannel.close();
-    fireEvent(new FailOverEvent(oldChannel, newChannel, newConnector));
-  }
-
-  /**
-   * Should be overridden to provide a fail-over <code>IConnector</code>. The oldChannel <i>can</i> be used as a
-   * hint.
-   */
-  protected abstract IConnector getNewConnector(IChannel oldChannel);
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class FailOverEvent implements IFailOverEvent
-  {
-    private IChannel oldChannel;
-
-    private IChannel newChannel;
-
-    private IConnector newConnector;
-
-    public FailOverEvent(IChannel oldChannel, IChannel newChannel, IConnector newConnector)
-    {
-      this.oldChannel = oldChannel;
-      this.newChannel = newChannel;
-      this.newConnector = newConnector;
-    }
-
-    public IFailOverStrategy getSource()
-    {
-      return FailOverStrategy.this;
-    }
-
-    public IChannel getOldChannel()
-    {
-      return oldChannel;
-    }
-
-    public IChannel getNewChannel()
-    {
-      return newChannel;
-    }
-
-    public IConnector getNewConnector()
-    {
-      return newConnector;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java
deleted file mode 100644
index dfd174a8ff..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal.failover;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Eike Stepper
- */
-public interface IFailOverEvent extends IEvent
-{
-  /**
-   * Returns the old channel that was active before the fail over occured. At the time this event is being sent the old
-   * channel is already closed.
-   */
-  public IChannel getOldChannel();
-
-  /**
-   * Returns the new channel that is active after the fail over occured. At the time this event is being sent the new
-   * channel is already active.
-   */
-  public IChannel getNewChannel();
-
-  /**
-   * Returns the connector of the new channel.
-   */
-  public IConnector getNewConnector();
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java
deleted file mode 100644
index 0bdcc642ac..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal.failover;
-
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.event.INotifier;
-
-/**
- * @author Eike Stepper
- */
-public interface IFailOverStrategy extends INotifier
-{
-  public static final IFailOverStrategy NOOP = NOOPFailOverStrategy.INSTANCE;
-
-  public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request) throws Exception;
-
-  public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request, long timeout) throws Exception;
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java
deleted file mode 100644
index 2230a08acc..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal.failover;
-
-import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.event.IListener;
-
-/**
- * @author Eike Stepper
- */
-public class NOOPFailOverStrategy implements IFailOverStrategy
-{
-  public static final NOOPFailOverStrategy INSTANCE = new NOOPFailOverStrategy();
-
-  public NOOPFailOverStrategy()
-  {
-  }
-
-  public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request) throws Exception
-  {
-    return request.send();
-  }
-
-  public <RESULT> RESULT send(RequestWithConfirmation<RESULT> request, long timeout) throws Exception
-  {
-    return request.send(timeout);
-  }
-
-  public void addListener(IListener listener)
-  {
-  }
-
-  public void removeListener(IListener listener)
-  {
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java
deleted file mode 100644
index 5c5bb56e3c..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal.failover;
-
-import org.eclipse.net4j.channel.IChannel;
-import org.eclipse.net4j.connector.IConnector;
-
-/**
- * @author Eike Stepper
- */
-public class RetryFailOverStrategy extends FailOverStrategy
-{
-  private IConnector connector;
-
-  public RetryFailOverStrategy(IConnector connector)
-  {
-    this.connector = connector;
-  }
-
-  public IConnector getConnector()
-  {
-    return connector;
-  }
-
-  @Override
-  protected IConnector getNewConnector(IChannel oldChannel)
-  {
-    return connector;
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package.html
deleted file mode 100644
index ab599a067b..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2008 Eike Stepper, Germany.
-	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
-
--->
-</head>
-<body bgcolor="white">
-
-A framework for request/response based communication on top of 
-the Net4j transport layer.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/GZIPStreamWrapperInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/GZIPStreamWrapperInjector.java
deleted file mode 100644
index 7a0669bee4..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/GZIPStreamWrapperInjector.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal.wrapping;
-
-import org.eclipse.net4j.util.io.GZIPStreamWrapper;
-
-/**
- * @author Eike Stepper
- */
-public class GZIPStreamWrapperInjector extends StreamWrapperInjector
-{
-  public static final GZIPStreamWrapper STREAM_WRAPPER = new GZIPStreamWrapper();
-
-  public GZIPStreamWrapperInjector(String protocolID)
-  {
-    super(protocolID, STREAM_WRAPPER);
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java
deleted file mode 100644
index a696492fb2..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/StreamWrapperInjector.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal.wrapping;
-
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.container.IElementProcessor;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.io.IStreamWrapper;
-
-/**
- * @author Eike Stepper
- */
-public class StreamWrapperInjector implements IElementProcessor
-{
-  private String protocolID;
-
-  private IStreamWrapper streamWrapper;
-
-  public StreamWrapperInjector(String protocolID, IStreamWrapper streamWrapper)
-  {
-    this.protocolID = protocolID;
-    this.streamWrapper = streamWrapper;
-  }
-
-  public String getProtocolID()
-  {
-    return protocolID;
-  }
-
-  public IStreamWrapper getStreamWrapper()
-  {
-    return streamWrapper;
-  }
-
-  public Object process(IManagedContainer container, String productGroup, String factoryType, String description,
-      Object element)
-  {
-    if (element instanceof SignalProtocol)
-    {
-      SignalProtocol signalProtocol = (SignalProtocol)element;
-      if (shouldInject(container, productGroup, factoryType, description, signalProtocol))
-      {
-        element = inject(container, productGroup, factoryType, description, signalProtocol);
-      }
-    }
-
-    return element;
-  }
-
-  protected boolean shouldInject(IManagedContainer container, String productGroup, String factoryType,
-      String description, SignalProtocol signalProtocol)
-  {
-    if (signalProtocol.getStreamWrapper() == streamWrapper)
-    {
-      return false;
-    }
-
-    return ObjectUtil.equals(signalProtocol.getType(), protocolID);
-  }
-
-  protected Object inject(IManagedContainer container, String productGroup, String factoryType, String description,
-      SignalProtocol signalProtocol)
-  {
-    signalProtocol.addStreamWrapper(streamWrapper);
-    return signalProtocol;
-  }
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/XORStreamWrapperInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/XORStreamWrapperInjector.java
deleted file mode 100644
index b28dc59315..0000000000
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/XORStreamWrapperInjector.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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
- **************************************************************************/
-package org.eclipse.net4j.signal.wrapping;
-
-import org.eclipse.net4j.util.io.XORStreamWrapper;
-
-/**
- * @author Eike Stepper
- */
-public class XORStreamWrapperInjector extends StreamWrapperInjector
-{
-  public XORStreamWrapperInjector(String protocolID, int[] key)
-  {
-    super(protocolID, new XORStreamWrapper(key));
-  }
-}