summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-31 09:10:41 (EDT)
committerEike Stepper2007-08-31 09:10:41 (EDT)
commitbe097c966f461f5146535c7b546cbd4ee564dd2f (patch)
tree26bc4efca0d23937a57ed620744892dd26f97c30
parentab25e3bf9fb960c8d7ae1503322aeccb176d670c (diff)
downloadcdo-be097c966f461f5146535c7b546cbd4ee564dd2f.zip
cdo-be097c966f461f5146535c7b546cbd4ee564dd2f.tar.gz
cdo-be097c966f461f5146535c7b546cbd4ee564dd2f.tar.bz2
[201839] Net4j/CDO Components must comform to incubation rules
https://bugs.eclipse.org/bugs/show_bug.cgi?id=201839
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.classpath7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.cvsignore7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.project28
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs261
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.ui.prefs19
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/client/cdo-client.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/client/cdo-client.xml65
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/server/cdo-server.properties55
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/server/cdo-server.xml126
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/client/net4j-client.properties3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/client/net4j-client.xml42
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/auth.users1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/net4j-server.properties11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/net4j-server.xml62
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/about.html42
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/build.properties15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/copyright.txt8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/epl-v10.html319
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch43
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/launches/CDO All Tests.launch485
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/license.html319
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/TestModel1.ecore29
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/model/TestModel1.genmodel21
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/plugin.properties4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/plugin.xml20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java90
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFDetachTest.java131
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IOHelper.java119
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AbstractModel1Test.java236
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AdapterTest.java94
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllTests.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BasicTest.java486
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BidiReferencesTest.java283
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla154389Test.java175
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla155899Test.java173
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla162017Test.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/ExtentTest.java80
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java179
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/OCLTest.java247
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java125
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java209
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/XRefsTest.java102
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java267
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientSeparatedServerTopology.java133
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java297
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientTopology.java80
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/EmbeddedTopology.java91
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ITopology.java34
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ITopologyConstants.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/EmptyNode.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/EmptyRefNode.java47
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/ExtendedNode.java95
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TestModel1Factory.java76
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TestModel1Package.java691
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TreeNode.java178
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/EmptyNodeImpl.java47
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/EmptyRefNodeImpl.java145
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/ExtendedNodeImpl.java299
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TestModel1FactoryImpl.java156
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TestModel1PackageImpl.java410
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TreeNodeImpl.java498
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/util/TestModel1AdapterFactory.java239
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/testmodel1/util/TestModel1Switch.java263
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/test.xml94
65 files changed, 0 insertions, 9043 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/.classpath b/plugins/org.eclipse.emf.cdo.tests/.classpath
deleted file mode 100644
index b242d5d..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="org/eclipse/emf/cdo/tests/topology/ClientSeparatedServerTopology.java|org/eclipse/emf/cdo/tests/topology/ClientTopology.java|org/eclipse/emf/cdo/tests/topology/EmbeddedTopology.java" 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.tests/.cvsignore b/plugins/org.eclipse.emf.cdo.tests/.cvsignore
deleted file mode 100644
index cf7758d..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-doc
-bin
-dist
-build
-runtime
-tmp
-*.tmp
diff --git a/plugins/org.eclipse.emf.cdo.tests/.project b/plugins/org.eclipse.emf.cdo.tests/.project
deleted file mode 100644
index e05af07..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.cdo.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.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2596826..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,261 +0,0 @@
-#Sun Dec 17 20:32:26 CET 2006
-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=2
-org.eclipse.jdt.core.formatter.blank_lines_after_package=2
-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=2
-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_type_declarations=2
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_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=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_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=false
-org.eclipse.jdt.core.formatter.comment.format_comments=false
-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_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=100
-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=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not 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=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=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=do not 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_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=100
-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
diff --git a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index cfff602..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,19 +0,0 @@
-#Mon Mar 13 08:16:19 CET 2006
-comment_clear_blank_lines=false
-comment_format_comments=false
-comment_format_header=false
-comment_format_html=true
-comment_format_source_code=true
-comment_indent_parameter_description=true
-comment_indent_root_tags=true
-comment_line_length=100
-comment_new_line_for_parameter=true
-comment_separate_root_tags=true
-eclipse.preferences.version=1
-formatter_settings_version=10
-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;org.eclipse;org.apache;org;com;java.lang;java.util;java.io;java.nio;java.net;java;javax;
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index e04d54f..0000000
--- a/plugins/org.eclipse.emf.cdo.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.emf.cdo.tests; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.emf.cdo.tests.internal.CDOTestPlugin
-Bundle-ClassPath: cdo.tests.jar
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.emf.cdo.client,
- org.eclipse.emf.cdo.server,
- org.eclipse.emf.cdo.client.ocl
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/client/cdo-client.properties b/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/client/cdo-client.properties
deleted file mode 100644
index eb68458..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/client/cdo-client.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-connector.host=localhost
-connector.port=2037
-#connector.userName=test
-#connector.password=test
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/client/cdo-client.xml b/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/client/cdo-client.xml
deleted file mode 100644
index 9fd8a55..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/client/cdo-client.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
- "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <!-- ######################################################## -->
- <bean id="propertyConfigurer"
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations">
- <list>
- <value> plugin:/META-INF/cdo/client/cdo-client.properties </value>
- </list>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="oidEncoder" class="org.eclipse.emf.cdo.core.impl.OIDEncoderImpl">
- <property name="fragmentBits">
- <value>48</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="packageManager" class="org.eclipse.emf.cdo.client.impl.PackageManagerImpl">
- <property name="oidEncoder">
- <ref bean="oidEncoder"/>
- </property>
- <property name="attributeConverter">
- <ref local="attributeConverter"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="attributeConverter" class="org.eclipse.emf.cdo.client.impl.AttributeConverterImpl"/>
-
- <!-- ######################################################## -->
- <bean id="clientCDOProtocol" class="org.eclipse.emf.cdo.client.protocol.ClientCDOProtocolImpl">
- <property name="protocolManager">
- <ref bean="protocolManager"/>
- </property>
- <property name="packageManager">
- <ref local="packageManager"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="clientCDOResProtocol"
- class="org.eclipse.emf.cdo.client.protocol.ClientCDOResProtocolImpl">
- <property name="protocolManager">
- <ref bean="protocolManager"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="resourceManager" class="org.eclipse.emf.cdo.client.impl.ResourceManagerImpl"
- singleton="false">
- <property name="connector">
- <ref bean="connector"/>
- </property>
- <property name="packageManager">
- <ref local="packageManager"/>
- </property>
- </bean>
-
-</beans>
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/server/cdo-server.properties b/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/server/cdo-server.properties
deleted file mode 100644
index 08a63f3..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/server/cdo-server.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-###################
-# JDBC PROPERTIES #
-###################
-
-
-#########
-# DERBY #
-#########
-
-#jdbc.dialect=DERBY
-#jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-#jdbc.url=jdbc:derby:cdoTest;create=true
-#jdbc.username=test
-#jdbc.password=test
-
-##########
-# HSQLDB #
-##########
-
-jdbc.dialect=HSQLDB
-jdbc.driver=org.hsqldb.jdbcDriver
-jdbc.url=jdbc:hsqldb:.
-jdbc.username=sa
-jdbc.password=
-
-#########
-# MYSQL #
-#########
-
-#jdbc.dialect=MYSQL
-#jdbc.driver=org.gjt.mm.mysql.Driver
-#jdbc.url=jdbc:mysql://localhost/cdoTest
-#jdbc.username=test
-#jdbc.password=test
-
-##########
-# ORACLE #
-##########
-
-#jdbc.dialect=oracle
-#jdbc.driver=
-#jdbc.url=
-#jdbc.username=
-#jdbc.password=
-
-#########
-# MIMER #
-#########
-
-#jdbc.dialect=mimer
-#jdbc.driver=
-#jdbc.url=
-#jdbc.username=
-#jdbc.password=
-
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/server/cdo-server.xml b/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/server/cdo-server.xml
deleted file mode 100644
index 3250abb..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/cdo/server/cdo-server.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
- "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <!-- ######################################################## -->
- <bean id="propertyConfigurer"
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations">
- <list>
- <value> plugin:/META-INF/cdo/server/cdo-server.properties </value>
- </list>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="oidEncoder" class="org.eclipse.emf.cdo.core.impl.OIDEncoderImpl">
- <property name="fragmentBits">
- <value>48</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="packageManager" class="org.eclipse.emf.cdo.server.impl.PackageManagerImpl"/>
-
- <!-- ######################################################## -->
- <bean id="resourceManager" class="org.eclipse.emf.cdo.server.impl.ResourceManagerImpl"/>
-
- <!-- ######################################################## -->
- <bean id="columnConverter" class="org.eclipse.emf.cdo.server.impl.ColumnConverterImpl"/>
-
- <!-- ######################################################## -->
- <bean id="serverCDOProtocol" class="org.eclipse.emf.cdo.server.protocol.ServerCDOProtocolImpl">
- <property name="protocolManager">
- <ref bean="protocolManager"/>
- </property>
- <property name="transactionTemplate">
- <ref local="transactionTemplate"/>
- </property>
- <property name="mapper">
- <ref local="mapper"/>
- </property>
- <property name="serverCDOResProtocol">
- <ref local="serverCDOResProtocol"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="serverCDOResProtocol"
- class="org.eclipse.emf.cdo.server.protocol.ServerCDOResProtocolImpl">
- <property name="protocolManager">
- <ref bean="protocolManager"/>
- </property>
- <property name="transactionTemplate">
- <ref local="transactionTemplate"/>
- </property>
- <property name="mapper">
- <ref local="mapper"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="dataSource" class="org.eclipse.net4j.spring.db.ContextClassLoaderDataSource">
- <property name="driverClassName">
- <value>${jdbc.driver}</value>
- </property>
- <property name="url">
- <value>${jdbc.url}</value>
- </property>
- <property name="username">
- <value>${jdbc.username}</value>
- </property>
- <property name="password">
- <value>${jdbc.password}</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="transactionManager"
- class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
- <property name="dataSource">
- <ref local="dataSource"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="transactionTemplate"
- class="org.springframework.transaction.support.TransactionTemplate">
- <property name="transactionManager">
- <ref local="transactionManager"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
- <property name="dataSource">
- <ref local="dataSource"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="mapper" class="org.eclipse.emf.cdo.server.impl.MapperImpl">
- <property name="columnConverter">
- <ref local="columnConverter"/>
- </property>
- <property name="packageManager">
- <ref local="packageManager"/>
- </property>
- <property name="resourceManager">
- <ref local="resourceManager"/>
- </property>
- <property name="dataSource">
- <ref local="dataSource"/>
- </property>
- <property name="jdbcTemplate">
- <ref local="jdbcTemplate"/>
- </property>
- <property name="oidEncoder" >
- <ref bean="oidEncoder"/>
- </property>
- <property name="sqlDialectName">
- <value>${jdbc.dialect}</value>
- </property>
- </bean>
-
-</beans>
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/client/net4j-client.properties b/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/client/net4j-client.properties
deleted file mode 100644
index 8985ca7..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/client/net4j-client.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Connection
-connector.host=localhost
-connector.port=2037 \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/client/net4j-client.xml b/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/client/net4j-client.xml
deleted file mode 100644
index 0351e76..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/client/net4j-client.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
- "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <!-- ######################################################## -->
- <bean id="propertyConfigurer"
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations">
- <list>
- <value>plugin:/META-INF/net4j/client/net4j-client.properties</value>
- </list>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="clientControlProtocol" class="org.eclipse.net4j.core.protocol.ClientControlProtocol">
- <property name="protocolManager">
- <ref bean="protocolManager"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="connector" class="org.eclipse.net4j.socket.impl.ActiveSocketConnectorImpl">
- <property name="bufferPool">
- <ref bean="bufferPool"/>
- </property>
- <property name="protocolManager">
- <ref bean="protocolManager"/>
- </property>
- <property name="selectorManager">
- <ref bean="selectorManager"/>
- </property>
- <property name="host">
- <value>${connector.host}</value>
- </property>
- <property name="port">
- <value>${connector.port}</value>
- </property>
- </bean>
-
-</beans>
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/auth.users b/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/auth.users
deleted file mode 100644
index 38fac2f..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/auth.users
+++ /dev/null
@@ -1 +0,0 @@
-test=test
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/net4j-server.properties b/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/net4j-server.properties
deleted file mode 100644
index 680bf7c..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/net4j-server.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Service
-acceptor.listenAddr=0.0.0.0
-acceptor.listenPort=2037
-
-# Authentication
-passiveNegotiator.algorithmName=PBEWithMD5AndDES
-passiveNegotiator.tokenLength=128
-auth.users.file=plugin:/META-INF/net4j/server/auth.users
-
-# Internal
-connectionManager.maxConnections=50
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/net4j-server.xml b/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/net4j-server.xml
deleted file mode 100644
index 82dcff5..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/server/net4j-server.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
- "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <!-- ######################################################## -->
- <bean id="propertyConfigurer"
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="locations">
- <list>
- <value> plugin:/META-INF/net4j/server/net4j-server.properties </value>
- </list>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="serverControlProtocol"
- class="org.eclipse.net4j.core.protocol.ServerControlProtocol">
- <property name="protocolManager">
- <ref bean="protocolManager"/>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="connectionManager"
- class="org.eclipse.net4j.core.impl.ConnectionManagerImpl">
- <property name="maxConnections">
- <value>${connectionManager.maxConnections}</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="acceptor" class="org.eclipse.net4j.socket.impl.SocketAcceptorImpl">
- <property name="listenAddr">
- <value>${acceptor.listenAddr}</value>
- </property>
- <property name="listenPort">
- <value>${acceptor.listenPort}</value>
- </property>
- <property name="autoStart">
- <value>false</value>
- </property>
- </bean>
-
- <!-- ######################################################## -->
- <bean id="slave" singleton="false"
- class="org.eclipse.net4j.socket.impl.PassiveSocketConnectorImpl">
- <property name="bufferPool">
- <ref bean="bufferPool"/>
- </property>
- <property name="connectionManager">
- <ref local="connectionManager"/>
- </property>
- <property name="protocolManager">
- <ref bean="protocolManager"/>
- </property>
- <property name="selectorManager">
- <ref bean="selectorManager"/>
- </property>
- </bean>
-
-</beans>
diff --git a/plugins/org.eclipse.emf.cdo.tests/about.html b/plugins/org.eclipse.emf.cdo.tests/about.html
deleted file mode 100644
index 373f387..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/about.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!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>Januaray 22, 2006</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.tests/build.properties b/plugins/org.eclipse.emf.cdo.tests/build.properties
deleted file mode 100644
index 9a1f44d..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-bin.includes = plugin.xml,\
- test.xml,\
- META-INF/,\
- epl-v10.html,\
- cdo.tests.jar,\
- copyright.txt,\
- about.html,\
- plugin.properties,\
- license.html,\
- model/
-jars.compile.order = cdo.tests.jar
-source.cdo.tests.jar = src/
-output.cdo.tests.jar = bin/
-src.includes = about.html
diff --git a/plugins/org.eclipse.emf.cdo.tests/copyright.txt b/plugins/org.eclipse.emf.cdo.tests/copyright.txt
deleted file mode 100644
index 3487e62..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/copyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.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/epl-v10.html b/plugins/org.eclipse.emf.cdo.tests/epl-v10.html
deleted file mode 100644
index d7b88e9..0000000
--- a/plugins/org.eclipse.emf.cdo.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.emf.cdo.tests/launches/CDO All Suites.launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch
deleted file mode 100644
index 8fa11fb..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.net4j.examples.mvc.swt,org.eclipse.net4j.examples.prov.client.ui,org.eclipse.net4j.examples.mvc,org.eclipse.net4j.examples.prov.server,org.eclipse.emf.cdo.dbgen.edit,org.eclipse.emf.cdo.examples.library,org.eclipse.emf.cdo.examples.library.ui,org.eclipse.emf.cdo.analysis.gmf,org.eclipse.emf.cdo.mapping.editor,org.eclipse.net4j.examples.server,org.eclipse.net4j.tests,org.eclipse.emf.cdo.doc,org.eclipse.datatools.enablement.mysql,org.eclipse.net4j.spring.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.dbgen.editor,org.eclipse.net4j.examples.prov.edit,org.eclipse.emf.cdo.utilities.migrator,org.eclipse.emf.cdo.analysis,org.eclipse.emf.cdo.examples.server,org.eclipse.datatools.enablement.mysql.dbdefinition,org.eclipse.net4j.examples.prov,org.eclipse.emf.cdo.examples.client,org.eclipse.emf.cdo.examples.ui,org.eclipse.net4j.examples.client.ui,org.eclipse.net4j.examples.client,org.eclipse.net4j.doc,org.eclipse.net4j.examples.prov.client,org.eclipse.net4j.examples.prov.editor,org.eclipse.net4j"/>
-<booleanAttribute key="tracing" value="false"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<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="selected_target_plugins" value="com.ibm.icu,org.apache.ant,org.eclipse.ant.core,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,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.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.ocl,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.osgi,org.eclipse.update.configurator,org.junit"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.client,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.client.ocl,org.eclipse.net4j.embedded,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"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.AllSuites"/>
-<stringAttribute key="pde.version" value="3.2a"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>
-<booleanAttribute key="askclear" value="false"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.cdo.tests"/>
-</listAttribute>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Tests.launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Tests.launch
deleted file mode 100644
index f32ae4e..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Tests.launch
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="tracing" value="true"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<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.emf.cdo.client/debug.resource" value="true"/>
-<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.emf.cdo.jdbc/debug" value="true"/>
-<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.emf.cdo.core/debug" value="true"/>
-<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.emf.cdo.client/debug.protocol" value="true"/>
-<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="false"/>
-<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.emf.cdo.core/debug.extension" value="true"/>
-<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.net4j/debug.signal" value="true"/>
-<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.net4j/debug.buffer" value="true"/>
-<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.net4j/debug.concurrency" value="true"/>
-<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.net4j/debug.acceptor" value="true"/>
-<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.net4j/debug.om" value="true"/>
-<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.emf.cdo.server/debug.mapper" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.emf.cdo.client/debug" value="true"/>
-<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.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.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="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
-<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.net4j/debug.selector" value="true"/>
-<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.cdo.dbgen/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.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.emf.cdo.client.ocl/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.net4j/debug.registry" value="true"/>
-<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<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.emf.cdo.core/debug.worker" value="true"/>
-<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.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="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.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.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.net4j/debug.buffer.stream" value="false"/>
-<mapEntry key="org.eclipse.gmf.runtime.common.core/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.cdo.client/debug.model" 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>
-<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.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu,net.sourceforge.lpg.lpgjavaruntime,org.apache.ant,org.eclipse.ant.core,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,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.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.ocl,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.update.configurator,org.junit"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.cdo.tests"/>
-</listAttribute>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.net4j.examples.mvc.swt,org.eclipse.net4j.examples.prov.client.ui,org.eclipse.net4j.examples.mvc,org.eclipse.net4j.examples.prov.server,org.eclipse.emf.cdo.dbgen.edit,org.eclipse.emf.cdo.examples.library,org.eclipse.emf.cdo.examples.library.ui,org.eclipse.emf.cdo.analysis.gmf,org.eclipse.emf.cdo.mapping.editor,org.eclipse.net4j.examples.server,org.eclipse.net4j.tests,org.eclipse.emf.cdo.doc,org.eclipse.datatools.enablement.mysql,org.eclipse.net4j.spring.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.dbgen.editor,org.eclipse.net4j.examples.prov.edit,org.eclipse.emf.cdo.utilities.migrator,org.eclipse.emf.cdo.analysis,org.eclipse.emf.cdo.examples.server,org.eclipse.datatools.enablement.mysql.dbdefinition,org.eclipse.net4j.examples.prov,org.eclipse.emf.cdo.examples.client,org.eclipse.emf.cdo.examples.ui,org.eclipse.net4j.examples.client.ui,org.eclipse.net4j.examples.client,org.eclipse.net4j.doc,org.eclipse.net4j.examples.prov.client,org.eclipse.net4j.examples.prov.editor,org.eclipse.net4j"/>
-<booleanAttribute key="askclear" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.model1.AllTests"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.jdbc,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.client.ocl,org.eclipse.emf.cdo.tests,org.eclipse.net4j,org.eclipse.emf.cdo.client,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.dbgen.hsqldb,org.eclipse.emf.cdo.dbgen.derby,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.jdbc.derby,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="checked" value="org.eclipse.emf.cdo.client,org.eclipse.emf.cdo.client.ocl,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.jdbc,org.eclipse.emf.cdo.server,org.eclipse.net4j"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/license.html b/plugins/org.eclipse.emf.cdo.tests/license.html
deleted file mode 100644
index d7b88e9..0000000
--- a/plugins/org.eclipse.emf.cdo.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.emf.cdo.tests/model/TestModel1.ecore b/plugins/org.eclipse.emf.cdo.tests/model/TestModel1.ecore
deleted file mode 100644
index b010a1e..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/model/TestModel1.ecore
+++ /dev/null
@@ -1,29 +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="testmodel1"
- nsURI="http://www.eclipse.org/emf/cdo/2006/TestModel1" nsPrefix="testmodel1">
- <eClassifiers xsi:type="ecore:EClass" name="TreeNode" eSuperTypes="../../org.eclipse.emf.cdo.client/model/client.ecore#//CDOPersistent">
- <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//TreeNode"
- eOpposite="#//TreeNode/children"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//TreeNode" containment="true" eOpposite="#//TreeNode/parent"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="references" upperBound="-1"
- eType="#//TreeNode"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="booleanFeature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="intFeature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringFeature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ExtendedNode" eSuperTypes="#//TreeNode">
- <eStructuralFeatures xsi:type="ecore:EReference" name="bidiSource" upperBound="-1"
- eType="#//ExtendedNode" eOpposite="#//ExtendedNode/bidiTarget"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="bidiTarget" upperBound="-1"
- eType="#//ExtendedNode" eOpposite="#//ExtendedNode/bidiSource"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringFeature2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EmptyNode" eSuperTypes="#//TreeNode"/>
- <eClassifiers xsi:type="ecore:EClass" name="EmptyRefNode" eSuperTypes="#//TreeNode">
- <eStructuralFeatures xsi:type="ecore:EReference" name="moreReferences" upperBound="-1"
- eType="#//TreeNode"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/TestModel1.genmodel b/plugins/org.eclipse.emf.cdo.tests/model/TestModel1.genmodel
deleted file mode 100644
index f394e46..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/model/TestModel1.genmodel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests/src"
- editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests"
- templateDirectory="platform:resource/org.eclipse.emf.cdo.client/templates" dynamicTemplates="true"
- modelName="TestModel1" editPluginClass="" editorPluginClass="" codeFormatting="true"
- testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
- usedGenPackages="../../org.eclipse.emf.cdo.client/model/client.genmodel#//client">
- <foreignModel>TestModel1.ecore</foreignModel>
- <genPackages prefix="TestModel1" disposableProviderFactory="true" ecorePackage="TestModel1.ecore#/">
- <genClasses ecoreClass="TestModel1.ecore#//TreeNode">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TestModel1.ecore#//TreeNode/parent"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TestModel1.ecore#//TreeNode/children"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TestModel1.ecore#//TreeNode/references"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TestModel1.ecore#//TreeNode/booleanFeature"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TestModel1.ecore#//TreeNode/intFeature"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TestModel1.ecore#//TreeNode/stringFeature"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests/plugin.properties b/plugins/org.eclipse.emf.cdo.tests/plugin.properties
deleted file mode 100644
index 8b30f2f..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-pluginName = CDO Tests
-providerName = Eclipse.org
-# ====================================================================
-
diff --git a/plugins/org.eclipse.emf.cdo.tests/plugin.xml b/plugins/org.eclipse.emf.cdo.tests/plugin.xml
deleted file mode 100644
index 586d2ae..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri = "http://www.eclipse.org/emf/cdo/2006/TestModel1"
- class = "testmodel1.TestModel1Package"
- genModel = "model/TestModel1.genmodel" />
- </extension>
-
- <extension point="org.eclipse.emf.cdo.client.mappings">
- <mapping
- map="META-INF/TestModel1.mapping"
- uri="http://www.eclipse.org/emf/cdo/2006/TestModel1"/>
- </extension>
-
-</plugin>
-
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java
deleted file mode 100644
index f5a5736..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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;
-
-
-import org.eclipse.emf.cdo.tests.topology.AbstractTopologyTest;
-import org.eclipse.emf.cdo.tests.topology.ITopologyConstants;
-
-import java.util.Enumeration;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class AllSuites extends TestSuite
-{
- public static Test suite()
- {
- return new AllSuites("CDO Build JUnit Test Suite");
- }
-
- public AllSuites()
- {
- super();
- populateSuite();
- }
-
- public AllSuites(Class theClass)
- {
- super(theClass);
- populateSuite();
- }
-
- public AllSuites(String name)
- {
- super(name);
- populateSuite();
- }
-
- protected void populateSuite()
- {
- // String mode = ITopologyConstants.EMBEDDED_MODE;
- for (String mode : ITopologyConstants.SELF_CONTAINED_MODES)
- {
- TestSuite topologySuite = new TestSuite("Mode " + mode);
- Test[] suites = createPackageSuites();
- for (int i = 0; i < suites.length; i++)
- {
- topologySuite.addTest(suites[i]);
- }
-
- recursivelySetMode(topologySuite, mode);
- addTest(topologySuite);
- }
- }
-
- protected void recursivelySetMode(Test test, String mode)
- {
- if (test instanceof AbstractTopologyTest)
- {
- AbstractTopologyTest topologyTest = (AbstractTopologyTest) test;
- topologyTest.setMode(mode);
- }
- else if (test instanceof TestSuite)
- {
- TestSuite suite = (TestSuite) test;
- Enumeration enumeration = suite.tests();
- while (enumeration.hasMoreElements())
- {
- Test child = (Test) enumeration.nextElement();
- recursivelySetMode(child, mode);
- }
- }
- }
-
- protected Test[] createPackageSuites()
- {
- return new Test[] { //
- org.eclipse.emf.cdo.tests.model1.AllTests.suite() //
- };
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFDetachTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFDetachTest.java
deleted file mode 100644
index b10eafa..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFDetachTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.util.ChangeRecorder;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-
-public class EMFDetachTest extends TestCase
-{
- private EClass treeNodeClass;
-
- private EAttribute nameAttribute;
-
- private EReference childrenReference;
-
- private EPackage modelPackage;
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- treeNodeClass = EcoreFactory.eINSTANCE.createEClass();
- treeNodeClass.setName("TreeNode");
-
- nameAttribute = EcoreFactory.eINSTANCE.createEAttribute();
- nameAttribute.setName("nameAttribute");
- nameAttribute.setEType(EcorePackage.eINSTANCE.getEString());
-
- childrenReference = EcoreFactory.eINSTANCE.createEReference();
- childrenReference.setName("childrenReference");
- childrenReference.setEType(treeNodeClass);
- childrenReference.setContainment(true);
- childrenReference.setLowerBound(0);
- childrenReference.setUpperBound(-1);
-
- treeNodeClass.getEStructuralFeatures().add(nameAttribute);
- treeNodeClass.getEStructuralFeatures().add(childrenReference);
-
- modelPackage = EcoreFactory.eINSTANCE.createEPackage();
- modelPackage.setName("modelPackage");
- modelPackage.setNsPrefix("modelPackage");
- modelPackage.setNsURI("http://modelPackage");
- modelPackage.getEClassifiers().add(treeNodeClass);
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- modelPackage = null;
- childrenReference = null;
- nameAttribute = null;
- treeNodeClass = null;
- super.tearDown();
- }
-
- public void testDetachSingle()
- {
- EObject root = createNode("root", null);
- for (int i = 0; i < 5; i++)
- {
- createNode("child" + i, root);
- }
-
- Resource resource = new ResourceImpl();
- resource.getContents().add(root);
-
- System.out.println();
- ChangeRecorder recorder = new ChangeRecorder(root);
- removeNode(root, 2);
- ChangeDescription changeDescription = recorder.endRecording();
-
- System.out.println();
- EList objectsToAttach = changeDescription.getObjectsToAttach();
- for (Iterator it = objectsToAttach.iterator(); it.hasNext();)
- {
- EObject node = (EObject) it.next();
- System.out.println("Node to attach: " + node.eGet(nameAttribute));
-
- }
-
- assertEquals(1, objectsToAttach.size());
- }
-
- private EObject createNode(String name, EObject parent)
- {
- EFactory factory = modelPackage.getEFactoryInstance();
- EObject node = factory.create(treeNodeClass);
- node.eSet(nameAttribute, name);
-
- if (parent != null)
- {
- EList children = (EList) parent.eGet(childrenReference);
- children.add(node);
- }
-
- System.out.println("Created node " + name);
- return node;
- }
-
- private void removeNode(EObject parent, int index)
- {
- EList children = (EList) parent.eGet(childrenReference);
- EObject child = (EObject) children.remove(index);
- System.out.println("Removed node " + child.eGet(nameAttribute));
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IOHelper.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IOHelper.java
deleted file mode 100644
index 096661a..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IOHelper.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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;
-
-
-import org.eclipse.net4j.util.IOUtil;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-
-
-public class IOHelper
-{
- /**
- * Copy chars from a <code>Reader</code> to a <code>Writer</code>.
- *
- * @param bufferSize
- * Size of internal buffer to use.
- */
- public static void copy(Reader input, Writer output, int bufferSize) throws IOException
- {
- char buffer[] = new char[bufferSize];
- int n = 0;
- while ((n = input.read(buffer)) != -1)
- {
- output.write(buffer, 0, n);
- }
- }
-
- public static void copy(InputStream input, OutputStream output, byte buffer[]) throws IOException
- {
- int n = 0;
- while ((n = input.read(buffer)) != -1)
- {
- output.write(buffer, 0, n);
- }
- }
-
- public static void copy(InputStream input, OutputStream output, int bufferSize)
- throws IOException
- {
- copy(input, output, new byte[bufferSize]);
- }
-
- public static void copy(InputStream input, OutputStream output) throws IOException
- {
- copy(input, output, 4096);
- }
-
- public static void copy(File input, File output) throws IOException
- {
- FileInputStream fis = null;
- FileOutputStream fos = null;
- try
- {
- fis = new FileInputStream(input);
- fos = new FileOutputStream(output);
-
- copy(fis, fos);
- }
- finally
- {
- IOUtil.closeSilent(fis);
- IOUtil.closeSilent(fos);
- }
- }
-
- /**
- * Read fully from reader
- */
- public static String readFully(Reader reader) throws IOException
- {
- StringWriter writer = new StringWriter();
- copy(reader, writer, 1024);
- return writer.toString();
- }
-
- /**
- * Read fully from stream
- */
- public static String readFully(InputStream input) throws IOException
- {
- InputStreamReader reader = new InputStreamReader(input);
- return readFully(reader);
- }
-
- /**
- * Read fully from file
- */
- public static String readFully(File file) throws IOException
- {
- FileInputStream stream = null;
- try
- {
- stream = new FileInputStream(file);
- return readFully(stream);
- }
- finally
- {
- IOUtil.closeSilent(stream);
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AbstractModel1Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AbstractModel1Test.java
deleted file mode 100644
index d64151f..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AbstractModel1Test.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.cdo.client.CDOResource;
-import org.eclipse.emf.cdo.tests.topology.AbstractTopologyTest;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import testmodel1.EmptyNode;
-import testmodel1.EmptyRefNode;
-import testmodel1.ExtendedNode;
-import testmodel1.TestModel1Factory;
-import testmodel1.TreeNode;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-
-/**
- * Base class for CDO tests based on selectable topologies and the TestModel1.
- *
- * After adding EClasses to TestModel1, don't forget to
- * <ol>
- * <li> regenerate the test model
- * <li> remove the CDO mapping file
- * <li> add a line to wipeDatabase()
- */
-public abstract class AbstractModel1Test extends AbstractTopologyTest
-{
- protected void assertChild(String name, EList nodes)
- {
- assertNotNull(nodes);
- assertNotNull(name);
- assertEquals(1, nodes.size());
- assertEquals(name, ((TreeNode) nodes.get(0)).getStringFeature());
- }
-
- protected void assertChildren(String[] names, EList nodes)
- {
- assertNotNull(nodes);
- assertNotNull(names);
- assertEquals(names.length, nodes.size());
- for (int i = 0; i < names.length; i++)
- {
- assertEquals(names[i], ((TreeNode) nodes.get(i)).getStringFeature());
- }
- }
-
- protected void assertNode(String name, TreeNode node)
- {
- assertNotNull(node);
- assertNotNull(name);
- assertEquals(name, node.getStringFeature());
- }
-
- protected void assertPath(String[] names, TreeNode node)
- {
- TreeNode result = findPath(names, node);
- assertNotNull(result);
- }
-
- protected void assertResource(String path, TreeNode node)
- {
- Resource resource = node.eResource();
- assertTrue(resource instanceof CDOResource);
-
- CDOResource cdoResource = (CDOResource) resource;
- assertEquals(path, cdoResource.getPath());
- }
-
- protected TreeNode[] createChildren(String[] names, TreeNode parent)
- {
- List<TreeNode> result = new ArrayList<TreeNode>();
- for (String name : names)
- {
- TreeNode node = createNode(name, parent);
- result.add(node);
- }
-
- return result.toArray(new TreeNode[result.size()]);
- }
-
- protected TreeNode createNode(String name)
- {
- return createNode(name, null);
- }
-
- protected TreeNode createNode(String name, TreeNode parent)
- {
- TreeNode node = TestModel1Factory.eINSTANCE.createTreeNode();
- node.setStringFeature(name);
- node.setParent(parent);
- return node;
- }
-
- protected TreeNode createNode(String name, TreeNode parent, TreeNode[] references)
- {
- TreeNode node = createNode(name, parent);
- node.getReferences().add(Arrays.asList(references));
- return node;
- }
-
- protected TreeNode createPath(String[] names, TreeNode parent, boolean reuseNodes)
- {
- for (String name : names)
- {
- TreeNode node = null;
- if (reuseNodes)
- {
- node = findNode(name, parent.getChildren());
- }
-
- if (node == null)
- {
- node = TestModel1Factory.eINSTANCE.createTreeNode();
- node.setStringFeature(name);
- node.setParent(parent);
- }
-
- parent = node;
- }
-
- return parent;
- }
-
- protected ExtendedNode createExtended(String name)
- {
- return createExtended(name, null);
- }
-
- protected ExtendedNode createExtended(String name, TreeNode parent)
- {
- ExtendedNode node = TestModel1Factory.eINSTANCE.createExtendedNode();
- node.setStringFeature(name);
- node.setParent(parent);
- return node;
- }
-
- protected EmptyNode createEmpty(String name)
- {
- return createEmpty(name, null);
- }
-
- protected EmptyNode createEmpty(String name, TreeNode parent)
- {
- EmptyNode node = TestModel1Factory.eINSTANCE.createEmptyNode();
- node.setStringFeature(name);
- node.setParent(parent);
- return node;
- }
-
- protected EmptyRefNode createEmptyRef(String name)
- {
- return createEmptyRef(name, null);
- }
-
- protected EmptyRefNode createEmptyRef(String name, TreeNode parent)
- {
- EmptyRefNode node = TestModel1Factory.eINSTANCE.createEmptyRefNode();
- node.setStringFeature(name);
- node.setParent(parent);
- return node;
- }
-
- protected void createTree(ExtendedNode root, int levels, int children)
- {
- String name = root.getStringFeature();
- for (int i = 0; i < children; i++)
- {
- ExtendedNode child = createExtended(name + (i + 1), root);
- if (levels > 1)
- {
- createTree(child, levels - 1, children);
- }
- }
- }
-
- protected TreeNode findChild(String name, TreeNode parent)
- {
- return findNode(name, parent.getChildren());
- }
-
- protected TreeNode findNode(String name, EList nodes)
- {
- assertNotNull(name);
- for (Iterator it = nodes.iterator(); it.hasNext();)
- {
- TreeNode node = (TreeNode) it.next();
- if (name.equals(node.getStringFeature()))
- {
- return node;
- }
- }
-
- return null;
- }
-
- protected TreeNode findPath(String[] names, TreeNode node)
- {
- assertNotNull(names);
- for (int i = 0; i < names.length; i++)
- {
- String name = names[i];
- TreeNode child = findChild(name, node);
- if (child == null) return null;
- node = child;
- }
-
- return node;
- }
-
- @Override
- protected void wipeDatabase(JdbcTemplate jdbc)
- {
- super.wipeDatabase(jdbc);
- dropTable(jdbc, "TREE_NODE");
- dropTable(jdbc, "EMPTY_NODE");
- dropTable(jdbc, "EMPTY_REF_NODE");
- dropTable(jdbc, "EXTENDED_NODE");
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AdapterTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AdapterTest.java
deleted file mode 100644
index 6beb04d..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AdapterTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.cdo.client.CDOResource;
-import org.eclipse.emf.cdo.client.PausableChangeRecorder;
-import org.eclipse.emf.cdo.client.ResourceManager;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import testmodel1.TreeNode;
-
-import java.util.Iterator;
-
-
-public class AdapterTest extends AbstractModel1Test
-{
- public void testFiveLevels() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] CHILDREN = { "a", "b", "c"};
-
- TreeNode root = createNode(ROOT);
- TreeNode[] children = createChildren(CHILDREN, root);
- for (int i = 0; i < children.length; i++)
- createChildren(new String[] { "a" + i, "b" + i, "c" + i}, children[i]);
- CDOResource resource = saveRoot(root, RESOURCE);
-
- ResourceManager resourceManager = resource.getResourceManager();
- ResourceSet resourceSet = resourceManager.getResourceSet();
- PausableChangeRecorder transaction = resourceManager.getTransaction();
- assertAdapter(resourceSet, transaction);
- }
-
- protected void assertAdapter(Notifier notifier, Adapter adapter)
- {
- EList adapters = notifier.eAdapters();
- assertNotNull(notifier.toString(), adapters);
-
- int count = 0;
- for (Iterator it = adapters.iterator(); it.hasNext();)
- {
- Adapter element = (Adapter) it.next();
- count += element == adapter ? 1 : 0;
- }
- assertEquals(notifier.toString(), 1, count);
-
- if (notifier instanceof ResourceSet)
- {
- ResourceSet resourceSet = (ResourceSet) notifier;
- EList resources = resourceSet.getResources();
- for (Iterator it = resources.iterator(); it.hasNext();)
- {
- Resource resource = (Resource) it.next();
- assertAdapter(resource, adapter);
- }
- }
- else if (notifier instanceof Resource)
- {
- Resource resource = (Resource) notifier;
- EList contents = resource.getContents();
- for (Iterator it = contents.iterator(); it.hasNext();)
- {
- EObject object = (EObject) it.next();
- assertAdapter(object, adapter);
- }
- }
- else if (notifier instanceof EObject)
- {
- EObject object = (EObject) notifier;
- EList contents = object.eContents();
- for (Iterator it = contents.iterator(); it.hasNext();)
- {
- EObject child = (EObject) it.next();
- assertAdapter(child, adapter);
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllTests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllTests.java
deleted file mode 100644
index cf250fc..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class AllTests
-{
- public static Test suite()
- {
- TestSuite suite = new TestSuite("Test for org.eclipse.emf.cdo.tests.model1");
- suite.addTestSuite(BasicTest.class);
- suite.addTestSuite(AdapterTest.class);
- suite.addTestSuite(SerializationTest.class);
- suite.addTestSuite(NotificationTest.class);
- suite.addTestSuite(RollbackTest.class);
- suite.addTestSuite(XRefsTest.class);
- suite.addTestSuite(ExtentTest.class);
- suite.addTestSuite(OCLTest.class);
- suite.addTestSuite(BidiReferencesTest.class);
- suite.addTestSuite(Bugzilla154389Test.class);
- suite.addTestSuite(Bugzilla155899Test.class);
- suite.addTestSuite(Bugzilla162017Test.class);
- return suite;
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BasicTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BasicTest.java
deleted file mode 100644
index e755a03..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BasicTest.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.cdo.client.CDOResource;
-import org.eclipse.emf.cdo.client.impl.CDOPersistentImpl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import testmodel1.ExtendedNode;
-import testmodel1.TreeNode;
-
-
-public class BasicTest extends AbstractModel1Test
-{
- public void testSimple() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] CHILDREN = { "a", "b", "c"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- createChildren(CHILDREN, root);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
-
- EList children = root.getChildren();
- assertChildren(CHILDREN, children);
- }
- }
-
- public void testContainment() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] PATH_A = { "a1", "a2", "a3", "a4"};
- final String[] PATH_B = { "b1", "b2", "b3", "b4"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- createPath(PATH_A, root, false);
- createPath(PATH_B, root, false);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
- assertPath(PATH_A, root);
- assertPath(PATH_B, root);
- }
- }
-
- public void testRefAlreadyLoaded() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] PATH_A = { "a1", "a2", "a3", "a4"};
- final String[] PATH_B = { "b1", "b2", "b3", "b4"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- TreeNode a = createPath(PATH_A, root, false);
- TreeNode b = createPath(PATH_B, root, false);
- a.getReferences().add(b);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
-
- TreeNode a = findPath(PATH_A, root);
- findPath(PATH_B, root);
- assertNode(PATH_B[3], (TreeNode) a.getReferences().get(0));
- }
- }
-
- public void testRefNotYetLoaded() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] PATH_A = { "a1", "a2", "a3", "a4"};
- final String[] PATH_B = { "b1", "b2", "b3", "b4"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- TreeNode a = createPath(PATH_A, root, false);
- TreeNode b = createPath(PATH_B, root, false);
- a.getReferences().add(b);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
-
- TreeNode a = findPath(PATH_A, root);
- TreeNode b = (TreeNode) a.getReferences().get(0);
- assertNode(PATH_B[3], b);
- }
- }
-
- public void testGetResource() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] PATH = { "a1", "a2", "a3", "a4"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- createPath(PATH, root, false);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode node = (TreeNode) loadRoot(RESOURCE);
- CDOResource cdoResource = ((CDOPersistentImpl) node).cdoGetResource();
- while (node != null)
- {
- Resource resource = node.eResource();
- assertEquals(cdoResource, resource);
-
- if (node.getChildren().isEmpty())
- {
- node = null;
- }
- else
- {
- node = (TreeNode) node.getChildren().get(0);
- }
- }
- }
- }
-
- public void testGetResourceViaRef() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] PATH_A = { "a1", "a2", "a3", "a4"};
- final String[] PATH_B = { "b1", "b2", "b3", "b4"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- TreeNode a = createPath(PATH_A, root, false);
- TreeNode b = createPath(PATH_B, root, false);
- a.getReferences().add(b);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- TreeNode a = findPath(PATH_A, root);
- TreeNode b = (TreeNode) a.getReferences().get(0);
- assertResource(RESOURCE, b);
- }
- }
-
- public void testInterResourceRef1() throws Exception
- {
- final String RESOURCE1 = "/test/res1";
- final String RESOURCE2 = "/test/res2";
- final String ROOT1 = "root1";
- final String ROOT2 = "root2";
-
- { // Execution
- TreeNode root1 = createNode(ROOT1);
- saveRoot(root1, RESOURCE1);
-
- TreeNode root2 = createNode(ROOT2);
- root2.getReferences().add(root1);
- saveRoot(root2, RESOURCE2);
- }
-
- { // Verification
- TreeNode root2 = (TreeNode) loadRoot(RESOURCE2);
- assertNode(ROOT2, root2);
- assertResource(RESOURCE2, root2);
-
- TreeNode root1 = (TreeNode) root2.getReferences().get(0);
- assertNode(ROOT1, root1);
- assertResource(RESOURCE1, root1);
- }
- }
-
- public void testInterResourceRef2() throws Exception
- {
- final String RESOURCE1 = "/test/res1";
- final String RESOURCE2 = "/test/res2";
- final String ROOT1 = "root1";
- final String ROOT2 = "root2";
- final String CHILD1 = "child1";
-
- { // Execution
- TreeNode root1 = createNode(ROOT1);
- TreeNode child1 = createNode(CHILD1, root1);
- saveRoot(root1, RESOURCE1);
-
- TreeNode root2 = createNode(ROOT2);
- root2.getReferences().add(child1);
- saveRoot(root2, RESOURCE2);
- }
-
- { // Verification
- TreeNode root2 = (TreeNode) loadRoot(RESOURCE2);
- assertNode(ROOT2, root2);
- assertResource(RESOURCE2, root2);
-
- TreeNode child1 = (TreeNode) root2.getReferences().get(0);
- assertNode(CHILD1, child1);
- assertResource(RESOURCE1, child1);
- }
- }
-
- public void testInterResourceRef3() throws Exception
- {
- final String RESOURCE1 = "/test/res1";
- final String RESOURCE2 = "/test/res2";
- final String ROOT1 = "root1";
- final String ROOT2 = "root2";
- final String CHILD2 = "child2";
-
- { // Execution
- TreeNode root1 = createNode(ROOT1);
- saveRoot(root1, RESOURCE1);
-
- TreeNode root2 = createNode(ROOT2);
- TreeNode child2 = createNode(CHILD2, root2);
- child2.getReferences().add(root1);
- saveRoot(root2, RESOURCE2);
- }
-
- { // Verification
- TreeNode root2 = (TreeNode) loadRoot(RESOURCE2);
- assertNode(ROOT2, root2);
- assertResource(RESOURCE2, root2);
-
- TreeNode child2 = (TreeNode) root2.getChildren().get(0);
- assertNode(CHILD2, child2);
- assertResource(RESOURCE2, child2);
-
- TreeNode root1 = (TreeNode) child2.getReferences().get(0);
- assertNode(ROOT1, root1);
- assertResource(RESOURCE1, root1);
- }
- }
-
- public void testGetContainer() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] PATH = { "a1", "a2", "a3", "a4"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- createPath(PATH, root, false);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- TreeNode a4 = findPath(PATH, root);
-
- TreeNode a3 = a4.getParent();
- assertNode(PATH[2], a3);
- assertEquals(a3, a4.eContainer());
-
- TreeNode a2 = a3.getParent();
- assertNode(PATH[1], a2);
- assertEquals(a2, a3.eContainer());
-
- TreeNode a1 = a2.getParent();
- assertNode(PATH[0], a1);
- assertEquals(a1, a2.eContainer());
-
- TreeNode a0 = a1.getParent();
- assertNode(ROOT, a0);
- assertEquals(a0, a1.eContainer());
- assertEquals(a0, root);
-
- assertResource(RESOURCE, a0);
- assertResource(RESOURCE, a1);
- assertResource(RESOURCE, a2);
- assertResource(RESOURCE, a3);
- assertResource(RESOURCE, a4);
- }
- }
-
- public void testGetContainerViaRef() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] PATH = { "a1", "a2", "a3", "a4"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- TreeNode a4 = createPath(PATH, root, false);
- root.getReferences().add(a4);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- TreeNode a4 = (TreeNode) root.getReferences().get(0);
-
- TreeNode a3 = a4.getParent();
- assertNode(PATH[2], a3);
- assertEquals(a3, a4.eContainer());
-
- TreeNode a2 = a3.getParent();
- assertNode(PATH[1], a2);
- assertEquals(a2, a3.eContainer());
-
- TreeNode a1 = a2.getParent();
- assertNode(PATH[0], a1);
- assertEquals(a1, a2.eContainer());
-
- TreeNode a0 = a1.getParent();
- assertNode(ROOT, a0);
- assertEquals(a0, a1.eContainer());
- assertEquals(a0, root);
-
- assertResource(RESOURCE, a0);
- assertResource(RESOURCE, a1);
- assertResource(RESOURCE, a2);
- assertResource(RESOURCE, a3);
- assertResource(RESOURCE, a4);
- }
- }
-
- public void testGetEContainer() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] PATH = { "a1", "a2", "a3", "a4"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- createPath(PATH, root, false);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- TreeNode a4 = findPath(PATH, root);
-
- TreeNode a3 = (TreeNode) a4.eContainer();
- assertNode(PATH[2], a3);
-
- TreeNode a2 = (TreeNode) a3.eContainer();
- assertNode(PATH[1], a2);
-
- TreeNode a1 = (TreeNode) a2.eContainer();
- assertNode(PATH[0], a1);
-
- TreeNode a0 = (TreeNode) a1.eContainer();
- assertNode(ROOT, a0);
- assertEquals(a0, root);
-
- assertResource(RESOURCE, a0);
- assertResource(RESOURCE, a1);
- assertResource(RESOURCE, a2);
- assertResource(RESOURCE, a3);
- assertResource(RESOURCE, a4);
- }
- }
-
- public void testGetEContainerViaRef() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] PATH = { "a1", "a2", "a3", "a4"};
-
- { // Execution
- TreeNode root = createNode(ROOT);
- TreeNode a4 = createPath(PATH, root, false);
- root.getReferences().add(a4);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- TreeNode a4 = (TreeNode) root.getReferences().get(0);
-
- TreeNode a3 = (TreeNode) a4.eContainer();
- assertNode(PATH[2], a3);
-
- TreeNode a2 = (TreeNode) a3.eContainer();
- assertNode(PATH[1], a2);
-
- TreeNode a1 = (TreeNode) a2.eContainer();
- assertNode(PATH[0], a1);
-
- TreeNode a0 = (TreeNode) a1.eContainer();
- assertNode(ROOT, a0);
- assertEquals(a0, root);
-
- assertResource(RESOURCE, a0);
- assertResource(RESOURCE, a1);
- assertResource(RESOURCE, a2);
- assertResource(RESOURCE, a3);
- assertResource(RESOURCE, a4);
- }
- }
-
- public void testUpdate() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String NEW_NAME = "XXX";
-
- { // Execution
- TreeNode root = createNode(ROOT);
- CDOResource resource = saveRoot(root, RESOURCE);
-
- root.setStringFeature(NEW_NAME);
- resource.save(null);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(NEW_NAME, root);
- }
- }
-
- public void testUpdateWithInheritance() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String NEW_NAME = "XXX";
-
- { // Execution
- ExtendedNode root = createExtended(ROOT);
- CDOResource resource = saveRoot(root, RESOURCE);
-
- root.setStringFeature(NEW_NAME);
- root.setStringFeature2(NEW_NAME);
- resource.save(null);
- }
-
- { // Verification
- ExtendedNode root = (ExtendedNode) loadRoot(RESOURCE);
- assertNode(NEW_NAME, root);
- assertEquals(NEW_NAME, root.getStringFeature2());
- }
- }
-
- public void testAttachWithInheritance() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final boolean BOOLEAN_VALUE = true;
- final int INT_VALUE = 12345;
-
- { // Execution
- ExtendedNode root = createExtended(ROOT);
- root.setBooleanFeature(BOOLEAN_VALUE);
- root.setIntFeature(INT_VALUE);
- root.setStringFeature2(ROOT);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- ExtendedNode root = (ExtendedNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
- assertEquals(BOOLEAN_VALUE, root.isBooleanFeature());
- assertEquals(INT_VALUE, root.getIntFeature());
- assertEquals(ROOT, root.getStringFeature2());
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BidiReferencesTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BidiReferencesTest.java
deleted file mode 100644
index 3ab026f..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BidiReferencesTest.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import testmodel1.ExtendedNode;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-
-public class BidiReferencesTest extends AbstractModel1Test
-{
- private static final int LEVELS = 3;
-
- private static final int CHILDREN = 4;
-
- private static final int NODECOUNT = getNodeCount(LEVELS, CHILDREN);
-
- private static final int CHILDCOUNT = NODECOUNT - 1;
-
- public void testBasicTree() throws Exception
- {
- ExtendedNode created = createExtended("node");
- createTree(created, LEVELS, CHILDREN);
- saveRoot(created, "/test/resource");
-
- ExtendedNode loaded = (ExtendedNode) loadRoot("/test/resource");
- assertTree("node", loaded, LEVELS, CHILDREN);
-
- assertEquals(1, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_RESOURCE"));
- assertEquals(NODECOUNT, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_OBJECT"));
- assertEquals(NODECOUNT, jdbc().queryForInt("SELECT COUNT(*) FROM EXTENDED_NODE"));
- assertEquals(CHILDCOUNT * 2, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
- assertEquals(CHILDCOUNT, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE WHERE CONTENT"));
- }
-
- public void testBasicBidis() throws Exception
- {
- ExtendedNode created = createExtended("node");
- createTree(created, LEVELS, CHILDREN);
- createBidi(created, "111", "211");
- createBidi(created, "111", "212");
- createBidi(created, "111", "213");
- createBidi(created, "111", "311");
- createBidi(created, "111", "312");
- createBidi(created, "111", "313");
- saveRoot(created, "/test/resource");
-
- ExtendedNode loaded = (ExtendedNode) loadRoot("/test/resource");
- assertTree("node", loaded, LEVELS, CHILDREN);
- assertBidi(loaded, "111", "211");
- assertBidi(loaded, "111", "212");
- assertBidi(loaded, "111", "213");
- assertBidi(loaded, "111", "311");
- assertBidi(loaded, "111", "312");
- assertBidi(loaded, "111", "313");
-
- assertEquals(1, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_RESOURCE"));
- assertEquals(NODECOUNT, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_OBJECT"));
- assertEquals(NODECOUNT, jdbc().queryForInt("SELECT COUNT(*) FROM EXTENDED_NODE"));
- assertEquals(CHILDCOUNT * 2 + 6 * 2, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
- assertEquals(CHILDCOUNT, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE WHERE CONTENT"));
- }
-
- public void testDetachCount() throws Exception
- {
- ExtendedNode created = createExtended("node"); // root node
- createTree(created, LEVELS, CHILDREN); // tree of degree 4, height = root + 3
- saveRoot(created, "/test/resource"); // commit
- int expected = NODECOUNT;
- assertEquals(expected, getNodeCount(created));
- created.cdoGetResource().getResourceManager().close();
-
- ExtendedNode loaded = (ExtendedNode) loadRoot("/test/resource"); // load another copy
- assertEquals(expected, getNodeCount(loaded));
- detachNode(loaded, "211"); // delete a leaf node
- loaded.eResource().save(null); // commit
- expected -= 1;
- assertEquals(expected, getNodeCount(loaded));
-
- detachNode(loaded, "4"); // delete a subtree
- loaded.eResource().save(null); // commit
- expected -= getNodeCount(LEVELS - 1, CHILDREN);
- assertEquals(expected, getNodeCount(loaded));
- }
-
- public void testDetachWithoutBidi() throws Exception
- {
- ExtendedNode created = createExtended("node"); // root node
- createTree(created, LEVELS, CHILDREN); // tree of degree 4, height = root + 3
- saveRoot(created, "/test/resource"); // commit
- int refs = CHILDCOUNT * 2; // expect num of refs = 2 per child
- assertEquals(refs, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
- created.cdoGetResource().getResourceManager().close();
-
- ExtendedNode loaded = (ExtendedNode) loadRoot("/test/resource"); // load another copy
- detachNode(loaded, "211"); // delete a leaf node
- loaded.eResource().save(null); // commit
- refs -= 2; // expect -2 containment refs
- assertEquals(refs, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
-
- detachNode(loaded, "4"); // delete a subtree
- loaded.eResource().save(null); // commit
- refs -= getNodeCount(LEVELS - 1, CHILDREN) * 2;
- assertEquals(refs, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
- }
-
- public void testDetachWithBidiSimple() throws Exception
- {
- ExtendedNode node = createExtended("node"); // root node
- ExtendedNode node1 = createExtended("node1", node); // child node 1
- ExtendedNode node2 = createExtended("node2", node); // child node 2
-
- saveRoot(node, "/test/resource"); // commit
- assertEquals(4, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
-
- node1.getBidiSource().add(node2);
- node.eResource().save(null); // commit
- assertEquals(6, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
-
- node.getChildren().remove(node1);
- EList bidiTarget = node2.getBidiTarget();
- assertTrue(bidiTarget.isEmpty());
- node.eResource().save(null); // commit
- assertEquals(2, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
- }
-
- public void testDetachWithBidi() throws Exception
- {
- ExtendedNode created = createExtended("node"); // root node
- createTree(created, LEVELS, CHILDREN); // tree of degree 4, height = root + 3
- saveRoot(created, "/test/resource"); // commit
- int refs = CHILDCOUNT * 2; // expect num of refs = 2 per child
- assertEquals(refs, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
-
- // create 12 bidi refs
- createBidi(created, "111", "211");
- createBidi(created, "111", "212");
- createBidi(created, "111", "213");
- createBidi(created, "111", "214");
- createBidi(created, "111", "311");
- createBidi(created, "111", "312");
- createBidi(created, "111", "313");
- createBidi(created, "111", "314");
- createBidi(created, "111", "411");
- createBidi(created, "111", "412");
- createBidi(created, "111", "413");
- createBidi(created, "111", "414");
- created.eResource().save(null); // commit
- refs += 12 * 2; // expect 24 additional refs
- assertEquals(refs, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
- created.cdoGetResource().getResourceManager().close();
-
- ExtendedNode loaded = (ExtendedNode) loadRoot("/test/resource"); // load another copy
- detachNode(loaded, "211"); // delete a leaf node with 1 bidi ref
- loaded.eResource().save(null); // commit
- refs -= 2 + 2; // expect -2 containment refs, -2 bidi refs
- assertEquals(refs, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
- }
-
- public void testRemoveBidi() throws Exception
- {
- ExtendedNode created = createExtended("node"); // root node
- createTree(created, LEVELS, CHILDREN); // tree of degree 4, height = root + 3
- saveRoot(created, "/test/resource"); // commit
- int refs = CHILDCOUNT * 2; // expect num of refs = 2 per child
- assertEquals(refs, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
-
- // create 12 bidi refs
- createBidi(created, "111", "211");
- createBidi(created, "111", "212");
- createBidi(created, "111", "213");
- createBidi(created, "111", "214");
- createBidi(created, "111", "311");
- createBidi(created, "111", "312");
- createBidi(created, "111", "313");
- createBidi(created, "111", "314");
- createBidi(created, "111", "411");
- createBidi(created, "111", "412");
- createBidi(created, "111", "413");
- createBidi(created, "111", "414");
- created.eResource().save(null); // commit
- refs += 12 * 2; // expect 24 additional refs
- assertEquals(refs, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
- created.cdoGetResource().getResourceManager().close();
-
- ExtendedNode loaded = (ExtendedNode) loadRoot("/test/resource"); // load another copy
- ExtendedNode node211 = findPath(loaded, "211");
- node211.getBidiSource().clear();
- loaded.eResource().save(null); // commit
- refs -= 2; // expect -2 bidi refs
- assertEquals(refs, jdbc().queryForInt("SELECT COUNT(*) FROM CDO_REFERENCE"));
- }
-
- private void detachNode(ExtendedNode root, String path)
- {
- ExtendedNode node = findPath(root, path);
- EList children = node.getParent().getChildren();
- int size = children.size();
- children.remove(node);
- assertEquals(size - 1, children.size());
- }
-
- private void createBidi(ExtendedNode root, String path1, String path2)
- {
- ExtendedNode src = findPath(root, path1);
- ExtendedNode dst = findPath(root, path2);
- dst.getBidiSource().add(src);
- }
-
- private void assertBidi(ExtendedNode root, String path1, String path2)
- {
- ExtendedNode src = findPath(root, path1);
- ExtendedNode dst = findPath(root, path2);
- assertTrue(dst.getBidiSource().contains(src));
- assertTrue(src.getBidiTarget().contains(dst));
- }
-
- private ExtendedNode findPath(ExtendedNode root, String path)
- {
- String name = "node";
- List<String> list = new ArrayList<String>();
- for (int i = 0; i < path.length(); i++)
- {
- name += path.charAt(i);
- list.add(name);
- }
-
- return (ExtendedNode) findPath(list.toArray(new String[list.size()]), root);
- }
-
- private void assertTree(String name, ExtendedNode root, int levels, int children)
- {
- assertNode(name, root);
- if (levels > 1)
- {
- assertEquals(children, root.getChildren().size());
- for (int i = 0; i < children; i++)
- {
- assertTree(name + (i + 1), (ExtendedNode) root.getChildren().get(i), levels - 1, children);
- }
- }
- }
-
- private static int getNodeCount(EObject root)
- {
- int count = 1;
- for (Iterator it = EcoreUtil.getAllContents(root, true); it.hasNext();)
- {
- it.next();
- ++count;
- }
-
- return count;
- }
-
- private static int getNodeCount(int levels, int children)
- {
- int level = children;
- int result = level;
- for (int i = 1; i < levels; i++)
- {
- level *= children;
- result += level;
- }
-
- return result + 1;
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla154389Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla154389Test.java
deleted file mode 100644
index e6ed88f..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla154389Test.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import testmodel1.EmptyNode;
-import testmodel1.EmptyRefNode;
-import testmodel1.TreeNode;
-
-
-/**
- * attributes in super class returned by server, ignored by client.
- *
- * The issue occurs when an object is loaded that has no attributes.
- * All the attributes are in the super class.
- *
- * When the object is loaded the server transmits all of the attributes,
- * which include the super class attributes. The client side ignored the
- * attributes and mis-interpreted the message containing the attributes as
- * the next object. From this point on nothing will work...
- *
- * So, it looks like the client and server don't match here.
- *
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154389
- */
-public class Bugzilla154389Test extends AbstractModel1Test
-{
- public void testEmptyRoot() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final boolean BOOLEAN_VALUE = true;
- final int INT_VALUE = 12345;
-
- { // Execution
- TreeNode root = createEmpty(ROOT);
- root.setBooleanFeature(BOOLEAN_VALUE);
- root.setIntFeature(INT_VALUE);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
- assertEquals(BOOLEAN_VALUE, root.isBooleanFeature());
- assertEquals(INT_VALUE, root.getIntFeature());
- }
- }
-
- public void testEmptyChild() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String CHILD = "child";
- final boolean BOOLEAN_VALUE = true;
- final int INT_VALUE = 12345;
-
- { // Execution
- TreeNode root = createEmpty(ROOT);
- EmptyNode child = createEmpty(CHILD, root);
- child.setBooleanFeature(BOOLEAN_VALUE);
- child.setIntFeature(INT_VALUE);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
-
- TreeNode child = findChild(CHILD, root);
- assertEquals(BOOLEAN_VALUE, child.isBooleanFeature());
- assertEquals(INT_VALUE, child.getIntFeature());
- }
- }
-
- public void testEmptyViaRef() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String CHILD_A = "a";
- final String CHILD_B = "b";
- final boolean BOOLEAN_VALUE = true;
- final int INT_VALUE = 12345;
-
- { // Execution
- TreeNode root = createNode(ROOT);
- TreeNode a = createNode(CHILD_A, root);
- TreeNode b = createEmpty(CHILD_B, root);
- b.setBooleanFeature(BOOLEAN_VALUE);
- b.setIntFeature(INT_VALUE);
- a.getReferences().add(b);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
-
- TreeNode a = (TreeNode) root.getChildren().get(0);
- assertNode(CHILD_A, a);
-
- TreeNode b = (TreeNode) a.getReferences().get(0);
- assertNode(CHILD_B, b);
- assertEquals(BOOLEAN_VALUE, b.isBooleanFeature());
- assertEquals(INT_VALUE, b.getIntFeature());
- }
- }
-
- public void testEmptyViaRefWithRef() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String CHILD_A = "a";
- final String CHILD_B = "b";
- final boolean BOOLEAN_VALUE = true;
- final int INT_VALUE = 12345;
-
- { // Execution
- TreeNode root = createNode(ROOT);
- TreeNode a = createNode(CHILD_A, root);
- TreeNode b = createEmpty(CHILD_B, root);
- b.setBooleanFeature(BOOLEAN_VALUE);
- b.setIntFeature(INT_VALUE);
- a.getReferences().add(b);
- b.getReferences().add(a);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
-
- TreeNode a = (TreeNode) root.getChildren().get(0);
- assertNode(CHILD_A, a);
-
- TreeNode b = (TreeNode) a.getReferences().get(0);
- assertNode(CHILD_B, b);
- assertEquals(BOOLEAN_VALUE, b.isBooleanFeature());
- assertEquals(INT_VALUE, b.getIntFeature());
- assertEquals(CHILD_A, ((TreeNode) b.getReferences().get(0)).getStringFeature());
- }
- }
-
- public void testEmptyRefRoot() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final boolean BOOLEAN_VALUE = true;
- final int INT_VALUE = 12345;
-
- { // Execution
- EmptyRefNode root = createEmptyRef(ROOT);
- root.setBooleanFeature(BOOLEAN_VALUE);
- root.setIntFeature(INT_VALUE);
- root.getMoreReferences().add(root);
- saveRoot(root, RESOURCE);
- }
-
- { // Verification
- EmptyRefNode root = (EmptyRefNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
- assertEquals(BOOLEAN_VALUE, root.isBooleanFeature());
- assertEquals(INT_VALUE, root.getIntFeature());
- assertEquals(ROOT, ((TreeNode) root.getMoreReferences().get(0)).getStringFeature());
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla155899Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla155899Test.java
deleted file mode 100644
index 81922f2..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla155899Test.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.cdo.client.CDOResource;
-import org.eclipse.emf.cdo.client.ResourceManager;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import testmodel1.ExtendedNode;
-import testmodel1.TreeNode;
-
-
-/**
- * Bidirectional XRefs are doubled at target side
- *
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=155899
- */
-public class Bugzilla155899Test extends AbstractModel1Test
-{
- public void testTwoResourcesUniDi() throws Exception
- {
- final String SOURCE_RESOURCE = "/test/source";
- final String TARGET_RESOURCE = "/test/target";
- final String SOURCE = "sourceRoot";
- final String TARGET = "targetRoot";
-
- { // Execution
- TreeNode target = createNode(TARGET);
- CDOResource targetResource = saveRoot(target, TARGET_RESOURCE);
- ResourceManager resourceManager = targetResource.getResourceManager();
- Resource sourceResource = createResource(SOURCE_RESOURCE, resourceManager);
-
- TreeNode source = createNode(SOURCE);
- source.getReferences().add(target);
- sourceResource.getContents().add(source);
- resourceManager.commit();
- }
-
- { // Verification
- TreeNode source = (TreeNode) loadRoot(SOURCE_RESOURCE);
- assertEquals(1, source.getReferences().size());
- assertNode(TARGET, (TreeNode) source.getReferences().get(0));
-
- TreeNode target = (TreeNode) loadRoot(TARGET_RESOURCE);
- assertEquals(0, target.getReferences().size());
- }
- }
-
- public void testTwoResourcesBiDi() throws Exception
- {
- final String SOURCE_RESOURCE = "/test/source";
- final String TARGET_RESOURCE = "/test/target";
- final String SOURCE = "sourceRoot";
- final String TARGET = "targetRoot";
-
- { // Execution
- ExtendedNode target = createExtended(TARGET);
- CDOResource targetResource = saveRoot(target, TARGET_RESOURCE);
- ResourceManager resourceManager = targetResource.getResourceManager();
- Resource sourceResource = createResource(SOURCE_RESOURCE, resourceManager);
-
- ExtendedNode source = createExtended(SOURCE);
- source.getBidiSource().add(target);
- sourceResource.getContents().add(source);
- resourceManager.commit();
- }
-
- { // Verification
- ExtendedNode source = (ExtendedNode) loadRoot(SOURCE_RESOURCE);
- assertEquals(1, source.getBidiSource().size());
- assertEquals(0, source.getBidiTarget().size());
- assertNode(TARGET, (ExtendedNode) source.getBidiSource().get(0));
-
- ExtendedNode target = (ExtendedNode) loadRoot(TARGET_RESOURCE);
- assertEquals(0, target.getBidiSource().size());
- assertEquals(1, target.getBidiTarget().size());
- assertNode(SOURCE, (ExtendedNode) target.getBidiTarget().get(0));
- }
- }
-
- public void testOneResourceTargetRoot() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String SOURCE = "source";
- final String TARGET = "target";
-
- { // Execution
- ExtendedNode target = createExtended(TARGET);
- ExtendedNode source = createExtended(SOURCE, target);
- source.getBidiSource().add(target);
- saveRoot(target, RESOURCE);
- }
-
- { // Verification
- ExtendedNode target = (ExtendedNode) loadRoot(RESOURCE);
- assertEquals(0, target.getBidiSource().size());
- assertEquals(1, target.getBidiTarget().size());
-
- ExtendedNode source = (ExtendedNode) findChild(SOURCE, target);
- assertEquals(1, source.getBidiSource().size());
- assertEquals(0, source.getBidiTarget().size());
- }
- }
-
- public void testOneResourceSourceRoot() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String SOURCE = "source";
- final String TARGET = "target";
-
- { // Execution
- ExtendedNode source = createExtended(SOURCE);
- ExtendedNode target = createExtended(TARGET, source);
- source.getBidiSource().add(target);
- saveRoot(source, RESOURCE);
- }
-
- { // Verification
- ExtendedNode source = (ExtendedNode) loadRoot(RESOURCE);
- assertEquals(1, source.getBidiSource().size());
- assertEquals(0, source.getBidiTarget().size());
-
- ExtendedNode target = (ExtendedNode) findChild(TARGET, source);
- assertEquals(0, target.getBidiSource().size());
- assertEquals(1, target.getBidiTarget().size());
- }
- }
-
- public void testTwoResourcesTwoResMans() throws Exception
- {
- final String SOURCE_RESOURCE = "/test/source";
- final String TARGET_RESOURCE = "/test/target";
- final String SOURCE = "sourceRoot";
- final String TARGET = "targetRoot";
-
- { // Execution
- ExtendedNode target = createExtended(TARGET);
- saveRoot(target, TARGET_RESOURCE);
-
- ExtendedNode source = createExtended(SOURCE);
- CDOResource sourceResource = saveRoot(source, SOURCE_RESOURCE);
-
- ResourceManager resourceManager = sourceResource.getResourceManager();
- Resource targetResource = getResource(TARGET_RESOURCE, resourceManager);
- target = (ExtendedNode) targetResource.getContents().get(0);
-
- source.getBidiTarget().add(target);
- resourceManager.commit();
- }
-
- { // Verification
- ExtendedNode source = (ExtendedNode) loadRoot(SOURCE_RESOURCE);
- assertEquals(0, source.getBidiSource().size());
- assertEquals(1, source.getBidiTarget().size());
- assertNode(TARGET, (ExtendedNode) source.getBidiTarget().get(0));
-
- ExtendedNode target = (ExtendedNode) loadRoot(TARGET_RESOURCE);
- assertEquals(1, target.getBidiSource().size());
- assertEquals(0, target.getBidiTarget().size());
- assertNode(SOURCE, (ExtendedNode) target.getBidiSource().get(0));
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla162017Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla162017Test.java
deleted file mode 100644
index 4c5f525..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/Bugzilla162017Test.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import testmodel1.ExtendedNode;
-
-
-/**
- * transmit object change using incorrect EClass for attributes.
- *
- * When an attribute is changed in an EClass with a super class, and that
- * attribute happens to be in the super class definition, the changes transmitted
- * to the CDO server include the super class EClass, not the class that was modified.
- *
- * To temporarily fix this I added an new argument to the rememberAttributeChange()
- * method. I added the EClass returned from the classInfo.getEClass() method.
- * In this way rememberAttributeChange() does not depend of finding the EClass
- * from the feature itself. A patch follows.
- *
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=162017
- */
-public class Bugzilla162017Test extends AbstractModel1Test
-{
- public void testChangeSuperClassAttribute() throws Exception
- {
- {
- ExtendedNode node = createExtended("extended");
- node.setBooleanFeature(true);
- node.setIntFeature(4711);
- node.setStringFeature("tree node feature");
- node.setStringFeature2("extended node feature");
- saveRoot(node, "/test/res");
- }
-
- {
- ExtendedNode node = (ExtendedNode) loadRoot("/test/res");
- assertEquals(true, node.isBooleanFeature());
- assertEquals(4711, node.getIntFeature());
- assertEquals("tree node feature", node.getStringFeature());
- assertEquals("extended node feature", node.getStringFeature2());
-
- node.setStringFeature("changed tree node feature");
- node.eResource().save(null);
- }
-
- {
- ExtendedNode node = (ExtendedNode) loadRoot("/test/res");
- assertEquals(true, node.isBooleanFeature());
- assertEquals(4711, node.getIntFeature());
- assertEquals("changed tree node feature", node.getStringFeature());
- assertEquals("extended node feature", node.getStringFeature2());
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/ExtentTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/ExtentTest.java
deleted file mode 100644
index 7e25f73..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/ExtentTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.cdo.client.CDOResource;
-import org.eclipse.emf.cdo.client.ResourceManager;
-
-import testmodel1.ExtendedNode;
-import testmodel1.TestModel1Package;
-import testmodel1.TreeNode;
-
-import java.util.Set;
-
-
-public class ExtentTest extends AbstractModel1Test
-{
- public void testExactGlobal() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] CHILDREN = { "a", "b", "c"};
- final String OTHER_CHILD = "XYZ";
-
- TreeNode root = createNode(ROOT);
- TreeNode[] exactChildren = createChildren(CHILDREN, root);
- createExtended(OTHER_CHILD, root);
-
- CDOResource resource = saveRoot(root, RESOURCE);
- ResourceManager resourceManager = resource.getResourceManager();
- Set extent = resourceManager.queryExtent(TestModel1Package.eINSTANCE.getTreeNode(), true);
- assertEquals(1 + CHILDREN.length, extent.size());
-
- assertTrue(extent.contains(root));
- assertResource(RESOURCE, root);
-
- for (TreeNode child : exactChildren)
- {
- assertTrue(extent.contains(child));
- assertResource(RESOURCE, child);
- }
- }
-
- public void testDerivedGlobal() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] CHILDREN = { "a", "b", "c"};
- final String OTHER_CHILD = "XYZ";
-
- TreeNode root = createNode(ROOT);
- TreeNode[] exactChildren = createChildren(CHILDREN, root);
- ExtendedNode otherChild = createExtended(OTHER_CHILD, root);
-
- CDOResource resource = saveRoot(root, RESOURCE);
- ResourceManager resourceManager = resource.getResourceManager();
- Set extent = resourceManager.queryExtent(TestModel1Package.eINSTANCE.getTreeNode());
- assertEquals(2 + CHILDREN.length, extent.size());
-
- assertTrue(extent.contains(root));
- assertResource(RESOURCE, root);
-
- assertTrue(extent.contains(otherChild));
- assertResource(RESOURCE, otherChild);
-
- for (TreeNode child : exactChildren)
- {
- assertTrue(extent.contains(child));
- assertResource(RESOURCE, child);
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java
deleted file mode 100644
index 8207bbc..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.cdo.client.ResourceManager;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import testmodel1.TreeNode;
-
-import java.util.List;
-
-import junit.framework.ComparisonFailure;
-
-
-public class NotificationTest extends AbstractModel1Test
-{
- public void testRoot() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String NEW_ROOT = "new root";
- final long TIME_LIMIT = 10000;
-
- // Client1 creates resource
- TreeNode root = createNode(ROOT);
- saveRoot(root, RESOURCE);
-
- // Client2 loads resource
- TreeNode loaded = (TreeNode) loadRoot(RESOURCE);
-
- // Client1 modifies and commits resource
- root.setStringFeature(NEW_ROOT);
- Resource resource = root.eResource();
- resource.save(null);
-
- // Give server and client2 enough time to get notified
- long start = System.currentTimeMillis();
- try
- {
- assertNode(NEW_ROOT, loaded);
- }
- catch (ComparisonFailure ex)
- {
- long duration = System.currentTimeMillis() - start;
- if (duration > TIME_LIMIT) throw ex;
- Thread.sleep(1);
- }
- }
-
- public void testChildNotYetLoaded() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String CHILD = "a";
- final String NEW_NAME = "a2";
- final long TIME_LIMIT = 10000;
-
- // Client1 creates resource
- TreeNode root = createNode(ROOT);
- TreeNode a = createNode(CHILD, root);
- saveRoot(root, RESOURCE);
-
- // Client2 loads resource
- TreeNode loaded = (TreeNode) loadRoot(RESOURCE);
- TreeNode loadedA = (TreeNode) loaded.getChildren().get(0);
-
- // Client1 modifies and commits resource
- a.setStringFeature(NEW_NAME);
- Resource resource = root.eResource();
- resource.save(null);
-
- // Give server and client2 enough time to get notified
- long start = System.currentTimeMillis();
- try
- {
- assertNode(NEW_NAME, loadedA);
- }
- catch (ComparisonFailure ex)
- {
- long duration = System.currentTimeMillis() - start;
- if (duration > TIME_LIMIT) throw ex;
- Thread.sleep(1);
- }
- }
-
- public void testChildAlreadyLoaded() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String CHILD = "a";
- final String NEW_NAME = "a2";
- final long TIME_LIMIT = 10000;
-
- // Client1 creates resource
- TreeNode root = createNode(ROOT);
- TreeNode a = createNode(CHILD, root);
- saveRoot(root, RESOURCE);
-
- // Client2 loads resource
- TreeNode loaded = (TreeNode) loadRoot(RESOURCE);
- TreeNode loadedA = (TreeNode) loaded.getChildren().get(0);
- assertNode(CHILD, loadedA);
-
- // Client1 modifies and commits resource
- a.setStringFeature(NEW_NAME);
- Resource resource = root.eResource();
- resource.save(null);
-
- // Give server and client2 enough time to get notified
- long start = System.currentTimeMillis();
- try
- {
- assertNode(NEW_NAME, loadedA);
- }
- catch (ComparisonFailure ex)
- {
- long duration = System.currentTimeMillis() - start;
- if (duration > TIME_LIMIT) throw ex;
- Thread.sleep(1);
- }
- }
-
- public void testListener() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String CHILD = "a";
- final String NEW_NAME = "a2";
- final long TIME_LIMIT = 10000;
- final boolean[] notificationReceived = { false};
-
- // Client1 creates resource
- TreeNode root = createNode(ROOT);
- TreeNode a = createNode(CHILD, root);
- saveRoot(root, RESOURCE);
-
- // Client2 loads resource
- TreeNode loaded = (TreeNode) loadRoot(RESOURCE);
- TreeNode loadedA = (TreeNode) loaded.getChildren().get(0);
- assertNode(CHILD, loadedA);
-
- // Client2 remembers notifications
- ResourceManager client2 = loaded.cdoGetResource().getResourceManager();
- client2.addInvalidationListener(new ResourceManager.InvalidationListener()
- {
- public void notifyInvalidation(ResourceManager resourceManager, List<EObject> invalidated,
- List<EObject> deferred)
- {
- notificationReceived[0] = true;
- }
- });
-
- // Client1 modifies and commits resource
- a.setStringFeature(NEW_NAME);
- Resource resource = root.eResource();
- resource.save(null);
-
- // Give server and client2 enough time to get notified
- long start = System.currentTimeMillis();
- while (System.currentTimeMillis() - start < TIME_LIMIT)
- {
- if (notificationReceived[0]) return;
- Thread.sleep(1);
- }
-
- fail("Notification did not arrive within " + TIME_LIMIT + " millis");
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/OCLTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/OCLTest.java
deleted file mode 100644
index d138b09..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/OCLTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.cdo.client.ocl.CDOHelperUtil;
-
-import org.eclipse.emf.ocl.helper.IOCLHelper;
-import org.eclipse.emf.ocl.helper.OCLParsingException;
-
-import testmodel1.TreeNode;
-
-import java.util.Set;
-
-
-public class OCLTest extends AbstractModel1Test
-{
- public void testNotEmpty() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] CHILDREN = { "a", "b", "c"};
- final String EXPR = "self.children->isEmpty()";
-
- { // Create CDO resource
- TreeNode root = createNode(ROOT);
- createChildren(CHILDREN, root);
- saveRoot(root, RESOURCE);
- }
-
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- IOCLHelper helper = CDOHelperUtil.createOCLHelper();
- helper.setContext(root);
-
- try
- {
- Object result = helper.evaluate(root, EXPR);
- assertFalse(result);
- }
- catch (OCLParsingException ex)
- {
- ex.printStackTrace();
- fail("Parse failed: " + ex.getLocalizedMessage());
- }
- }
-
- public void testEmpty() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String EXPR = "self.children->isEmpty()";
-
- { // Create CDO resource
- TreeNode root = createNode(ROOT);
- saveRoot(root, RESOURCE);
- }
-
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- IOCLHelper helper = CDOHelperUtil.createOCLHelper();
- helper.setContext(root);
-
- try
- {
- Object result = helper.evaluate(root, EXPR);
- assertTrue(result);
- }
- catch (OCLParsingException ex)
- {
- ex.printStackTrace();
- fail("Parse failed: " + ex.getLocalizedMessage());
- }
- }
-
- public void testExtendedNodeExtent() throws Exception
- {
- final String RESOURCE = "/test/res";
-
- { // Create CDO resource
- TreeNode root = createNode("root");
- TreeNode a = createNode("a", root);
- TreeNode b = createNode("b", root);
- TreeNode c = createNode("c", root);
- createNode("a1", a);
- createNode("b1", b);
- createNode("c1", c);
- createExtended("a2", a);
- createExtended("b2", b);
- createExtended("c2", c);
- saveRoot(root, RESOURCE);
- }
-
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- IOCLHelper helper = CDOHelperUtil.createOCLHelper();
- helper.setContext(root);
-
- try
- {
- Set result = (Set) helper.evaluate(root, "ExtendedNode.allInstances()");
- assertEquals(3, result.size());
- }
- catch (OCLParsingException ex)
- {
- ex.printStackTrace();
- fail("Parse failed: " + ex.getLocalizedMessage());
- }
- }
-
- public void testTreeNodeExtent() throws Exception
- {
- final String RESOURCE = "/test/res";
-
- { // Create CDO resource
- TreeNode root = createNode("root");
- TreeNode a = createNode("a", root);
- TreeNode b = createNode("b", root);
- TreeNode c = createNode("c", root);
- createNode("a1", a);
- createNode("b1", b);
- createNode("c1", c);
- createExtended("a2", a);
- createExtended("b2", b);
- createExtended("c2", c);
- saveRoot(root, RESOURCE);
- }
-
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- IOCLHelper helper = CDOHelperUtil.createOCLHelper();
- helper.setContext(root);
-
- try
- {
- Set result = (Set) helper.evaluate(root, "TreeNode.allInstances()");
- assertEquals(10, result.size());
- }
- catch (OCLParsingException ex)
- {
- ex.printStackTrace();
- fail("Parse failed: " + ex.getLocalizedMessage());
- }
- }
-
- public void testExtentTwoResources() throws Exception
- {
- final String RESOURCE1 = "/test/res1";
- final String RESOURCE2 = "/test/res2";
-
- { // Create first CDO resource
- TreeNode root = createNode("root");
- TreeNode a = createNode("a", root);
- TreeNode b = createNode("b", root);
- TreeNode c = createNode("c", root);
- createNode("a1", a);
- createNode("b1", b);
- createNode("c1", c);
- createExtended("a2", a);
- createExtended("b2", b);
- createExtended("c2", c);
- saveRoot(root, RESOURCE1);
- }
-
- { // Create second CDO resource
- TreeNode root = createNode("root");
- TreeNode a = createNode("a", root);
- TreeNode b = createNode("b", root);
- TreeNode c = createNode("c", root);
- createNode("a1", a);
- createNode("b1", b);
- createNode("c1", c);
- createExtended("a2", a);
- createExtended("b2", b);
- createExtended("c2", c);
- saveRoot(root, RESOURCE2);
- }
-
- TreeNode root = (TreeNode) loadRoot(RESOURCE1);
- IOCLHelper helper = CDOHelperUtil.createOCLHelper();
- helper.setContext(root);
-
- try
- {
- Set result = (Set) helper.evaluate(root, "ExtendedNode.allInstances()");
- assertEquals(3, result.size());
- }
- catch (OCLParsingException ex)
- {
- ex.printStackTrace();
- fail("Parse failed: " + ex.getLocalizedMessage());
- }
- }
-
- public void testGlobalExtent() throws Exception
- {
- final String RESOURCE1 = "/test/res1";
- final String RESOURCE2 = "/test/res2";
-
- { // Create first CDO resource
- TreeNode root = createNode("root");
- TreeNode a = createNode("a", root);
- TreeNode b = createNode("b", root);
- TreeNode c = createNode("c", root);
- createNode("a1", a);
- createNode("b1", b);
- createNode("c1", c);
- createExtended("a2", a);
- createExtended("b2", b);
- createExtended("c2", c);
- saveRoot(root, RESOURCE1);
- }
-
- { // Create second CDO resource
- TreeNode root = createNode("root");
- TreeNode a = createNode("a", root);
- TreeNode b = createNode("b", root);
- TreeNode c = createNode("c", root);
- createNode("a1", a);
- createNode("b1", b);
- createNode("c1", c);
- createExtended("a2", a);
- createExtended("b2", b);
- createExtended("c2", c);
- saveRoot(root, RESOURCE2);
- }
-
- TreeNode root = (TreeNode) loadRoot(RESOURCE1);
- IOCLHelper helper = CDOHelperUtil.createOCLHelper(true);
- helper.setContext(root);
-
- try
- {
- Set result = (Set) helper.evaluate(root, "ExtendedNode.allInstances()");
- assertEquals(6, result.size());
- }
- catch (OCLParsingException ex)
- {
- ex.printStackTrace();
- fail("Parse failed: " + ex.getLocalizedMessage());
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java
deleted file mode 100644
index bdc8885..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.cdo.client.OptimisticControlException;
-import org.eclipse.emf.cdo.client.ResourceManager;
-
-import org.eclipse.emf.ecore.EObject;
-
-import testmodel1.TreeNode;
-
-import java.util.List;
-
-import junit.framework.ComparisonFailure;
-
-
-public class RollbackTest extends AbstractModel1Test
-{
- public void testNoNotification() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String NEW_ROOT1 = "new root 1";
- final String NEW_ROOT2 = "new root 2";
- final long TIME_LIMIT = 1000;
-
- // Client1 creates resource
- TreeNode root = createNode(ROOT);
- saveRoot(root, RESOURCE);
-
- // Client2 loads and modifies resource
- TreeNode loaded = (TreeNode) loadRoot(RESOURCE);
- loaded.setStringFeature(NEW_ROOT2);
-
- // Client1 modifies and commits resource
- root.setStringFeature(NEW_ROOT1);
- root.eResource().save(null);
-
- // Give server and client2 enough time to get notified
- long start = System.currentTimeMillis();
- while (System.currentTimeMillis() - start < TIME_LIMIT)
- {
- assertNode(NEW_ROOT2, loaded);
- Thread.sleep(1);
- }
- }
-
- public void testOptimisticControlException() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String NEW_ROOT1 = "new root 1";
- final String NEW_ROOT2 = "new root 2";
- final long TIME_LIMIT = 1000;
- final boolean[] notificationReceived = { false};
-
- // Client1 creates resource
- TreeNode client1 = createNode(ROOT);
- saveRoot(client1, RESOURCE);
-
- // Client2 loads and modifies resource
- TreeNode client2 = (TreeNode) loadRoot(RESOURCE);
- client2.setStringFeature(NEW_ROOT2);
-
- // Client2 remembers notifications
- ResourceManager resourceManager = client2.cdoGetResource().getResourceManager();
- resourceManager.addInvalidationListener(new ResourceManager.InvalidationListener()
- {
- public void notifyInvalidation(ResourceManager resourceManager, List<EObject> invalidated,
- List<EObject> deferred)
- {
- notificationReceived[0] = true;
- }
- });
-
- // Client1 modifies and commits resource
- client1.setStringFeature(NEW_ROOT1);
- client1.eResource().save(null);
-
- // Give server and client2 enough time to get notified
- long start = System.currentTimeMillis();
- while (System.currentTimeMillis() - start < TIME_LIMIT)
- {
- if (notificationReceived[0]) break;
- Thread.sleep(1);
- }
-
- assertTrue("Notification did not arrive within " + TIME_LIMIT + " millis",
- notificationReceived[0]);
-
- // Client2 commits resource, verify that exception occurs
- try
- {
- client2.eResource().save(null);
- fail("OptimisticControlException did not occur");
- }
- catch (OptimisticControlException ex)
- {
- ; // This is the expected case
- }
-
- // Verify that client2 has been rolled back
- try
- {
- assertNode(NEW_ROOT2, client2);
- fail("Client2 has not been rolled back");
- }
- catch (ComparisonFailure ex)
- {
- ; // This is the expected case
- }
-
- // TODO Clarify what should be done with invalidated objects on rollback
- assertNode(NEW_ROOT1, client2);
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java
deleted file mode 100644
index 1bfb44a..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.cdo.tests.IOHelper;
-
-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.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-
-import org.eclipse.net4j.util.IOUtil;
-
-import testmodel1.TreeNode;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-
-public class SerializationTest extends AbstractModel1Test
-{
- public void testExport() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] CHILDREN = { "a", "b", "c"};
-
- final File FILE = new File("testExport.testmodel1");
- final String CONTENT = "<?xml version=\"1.0\" encoding=\"ASCII\"?>\n"
- + "<testmodel1:TreeNode xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:testmodel1=\"http://www.eclipse.org/emf/cdo/2006/TestModel1\" stringFeature=\"root\">\n" //
- + " <children stringFeature=\"a\"/>\n" //
- + " <children stringFeature=\"b\"/>\n" //
- + " <children stringFeature=\"c\"/>\n" //
- + "</testmodel1:TreeNode>\n";
-
- try
- {
- { // Execution
- TreeNode root = createNode(ROOT);
- createChildren(CHILDREN, root);
- saveRoot(root, RESOURCE);
-
- TreeNode loaded = (TreeNode) loadRoot(RESOURCE);
- loaded.cdoGetResource().preLoad();
- EObject copied = EcoreUtil.copy(loaded);
-
- ResourceSet resourceSet = createXMIResourceSet();
- URI uri = URI.createFileURI(FILE.getAbsolutePath());
- Resource xmiResource = resourceSet.createResource(uri);
- xmiResource.getContents().add(copied);
- xmiResource.save(new HashMap());
- }
-
- { // Verification
- String content = IOHelper.readFully(FILE).replaceAll("\r", "");
- assertEquals(CONTENT, content);
- }
- }
- finally
- {
- FILE.delete();
- }
- }
-
- public void testExportThreeLevels() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] CHILDREN = { "a", "b", "c"};
-
- final File FILE = new File("testExport.testmodel1");
- final String CONTENT = "<?xml version=\"1.0\" encoding=\"ASCII\"?>\n"
- + "<testmodel1:TreeNode xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:testmodel1=\"http://www.eclipse.org/emf/cdo/2006/TestModel1\" stringFeature=\"root\">\n" //
- + " <children stringFeature=\"a\">\n" //
- + " <children stringFeature=\"a\"/>\n" //
- + " <children stringFeature=\"b\"/>\n" //
- + " <children stringFeature=\"c\"/>\n" //
- + " </children>\n" //
- + " <children stringFeature=\"b\">\n" //
- + " <children stringFeature=\"a\"/>\n" //
- + " <children stringFeature=\"b\"/>\n" //
- + " <children stringFeature=\"c\"/>\n" //
- + " </children>\n" //
- + " <children stringFeature=\"c\">\n" //
- + " <children stringFeature=\"a\"/>\n" //
- + " <children stringFeature=\"b\"/>\n" //
- + " <children stringFeature=\"c\"/>\n" //
- + " </children>\n" //
- + "</testmodel1:TreeNode>\n";
-
- try
- {
- { // Execution
- TreeNode root = createNode(ROOT);
- TreeNode[] children = createChildren(CHILDREN, root);
- for (int i = 0; i < children.length; i++)
- createChildren(CHILDREN, children[i]);
- saveRoot(root, RESOURCE);
-
- TreeNode loaded = (TreeNode) loadRoot(RESOURCE);
- loaded.cdoGetResource().preLoad();
- EObject copied = EcoreUtil.copy(loaded);
-
- ResourceSet resourceSet = createXMIResourceSet();
- URI uri = URI.createFileURI(FILE.getAbsolutePath());
- Resource xmiResource = resourceSet.createResource(uri);
- xmiResource.getContents().add(copied);
- xmiResource.save(new HashMap());
- }
-
- { // Verification
- String content = IOHelper.readFully(FILE).replaceAll("\r", "");
- assertEquals(CONTENT, content);
- }
- }
- finally
- {
- FILE.delete();
- }
- }
-
- public void testImport() throws Exception
- {
- final String RESOURCE = "/test/res";
- final String ROOT = "root";
- final String[] CHILDREN = { "a", "b", "c"};
-
- final File FILE = new File("testExport.testmodel1");
- final String CONTENT = "<?xml version=\"1.0\" encoding=\"ASCII\"?>\n"
- + "<testmodel1:TreeNode xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:testmodel1=\"http://www.eclipse.org/emf/cdo/2006/TestModel1\" stringFeature=\"root\">\n"
- + " <children stringFeature=\"a\"/>\n" + " <children stringFeature=\"b\"/>\n"
- + " <children stringFeature=\"c\"/>\n" + "</testmodel1:TreeNode>\n";
-
- try
- {
- { // Execution
- saveFile(FILE, CONTENT);
-
- ResourceSet resourceSet = createXMIResourceSet();
- URI uri = URI.createFileURI(FILE.getAbsolutePath());
- Resource xmiResource = resourceSet.getResource(uri, true);
- TreeNode root = (TreeNode) xmiResource.getContents().get(0);
-
- EObject copied = EcoreUtil.copy(root);
- saveRoot(copied, RESOURCE);
- }
-
- { // Verification
- TreeNode root = (TreeNode) loadRoot(RESOURCE);
- assertNode(ROOT, root);
-
- EList children = root.getChildren();
- assertNode(CHILDREN[0], (TreeNode) children.get(0));
- assertNode(CHILDREN[1], (TreeNode) children.get(1));
- assertNode(CHILDREN[2], (TreeNode) children.get(2));
- }
- }
- finally
- {
- FILE.delete();
- }
- }
-
- protected ResourceSetImpl createXMIResourceSet()
- {
- ResourceSetImpl resourceSet = new ResourceSetImpl();
- Map map = resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();
- map.put("testmodel1", new XMIResourceFactoryImpl());
- return resourceSet;
- }
-
- protected void saveFile(final File file, String content) throws IOException
- {
- InputStream is = null;
- OutputStream os = null;
-
- try
- {
- is = new ByteArrayInputStream(content.getBytes());
- os = new FileOutputStream(file);
- IOHelper.copy(is, os);
- }
- finally
- {
- IOUtil.closeSilent(is);
- IOUtil.closeSilent(os);
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/XRefsTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/XRefsTest.java
deleted file mode 100644
index ba7497b..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/XRefsTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.model1;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EContentsEList.FeatureListIterator;
-
-import testmodel1.TestModel1Package;
-import testmodel1.TreeNode;
-import junit.framework.ComparisonFailure;
-
-
-public class XRefsTest extends AbstractModel1Test
-{
- public void testList() throws Exception
- {
- final String RESOURCE1 = "/test/res1";
- final String RESOURCE2 = "/test/res2";
- final String ROOT1 = "root1";
- final String ROOT2 = "root2";
- final String CHILD2 = "child2";
-
- { // Execution
- TreeNode root1 = createNode(ROOT1);
- saveRoot(root1, RESOURCE1);
-
- TreeNode root2 = createNode(ROOT2);
- root2.getReferences().add(root1);
-
- TreeNode child2 = createNode(CHILD2, root2);
- child2.getReferences().add(root1);
- saveRoot(root2, RESOURCE2);
- }
-
- { // Verification
- TreeNode root1 = (TreeNode) loadRoot(RESOURCE1);
- EList list = root1.eCrossReferences();
- assertNotNull(list);
- assertEquals(2, list.size());
-
- try
- {
- assertNode(ROOT2, (TreeNode) list.get(0));
- assertNode(CHILD2, (TreeNode) list.get(1));
- }
- catch (ComparisonFailure ex)
- {
- assertNode(ROOT2, (TreeNode) list.get(1));
- assertNode(CHILD2, (TreeNode) list.get(0));
- }
- }
- }
-
- public void testIterator() throws Exception
- {
- final String RESOURCE1 = "/test/res1";
- final String RESOURCE2 = "/test/res2";
- final String ROOT1 = "root1";
- final String ROOT2 = "root2";
- final String CHILD2 = "child2";
-
- { // Execution
- TreeNode root1 = createNode(ROOT1);
- saveRoot(root1, RESOURCE1);
-
- TreeNode root2 = createNode(ROOT2);
- root2.getReferences().add(root1);
-
- TreeNode child2 = createNode(CHILD2, root2);
- child2.getReferences().add(root1);
- saveRoot(root2, RESOURCE2);
- }
-
- { // Verification
- TreeNode root1 = (TreeNode) loadRoot(RESOURCE1);
- EList list = root1.eCrossReferences();
- int count = 0;
-
- for (FeatureListIterator it = (FeatureListIterator) list.iterator(); it.hasNext();)
- {
- count++;
- TreeNode node = (TreeNode) it.next();
- assertTrue(ROOT2.equals(node.getStringFeature()) || CHILD2.equals(node.getStringFeature()));
-
- EReference reference = (EReference) it.feature();
- assertEquals(TestModel1Package.eINSTANCE.getTreeNode_References(), reference);
- }
-
- assertEquals(2, count);
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java
deleted file mode 100644
index 204067a..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.topology;
-
-
-import org.eclipse.emf.cdo.client.CDOResource;
-import org.eclipse.emf.cdo.client.ResourceManager;
-import org.eclipse.emf.cdo.client.impl.CDOResourceFactoryImpl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.util.om.trace.PrintTraceHandler;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import javax.sql.DataSource;
-
-import junit.framework.TestCase;
-
-
-public abstract class AbstractTopologyTest extends TestCase implements ITopologyConstants
-{
- private static int run;
-
- private String mode;
-
- private ITopology topology;
-
- private long startMemory;
-
- private long startTime;
-
- private long runTime;
-
- private String label;
-
- public String getMode()
- {
- return mode;
- }
-
- public void setMode(String mode)
- {
- this.mode = mode;
- }
-
- public ITopology getTopology()
- {
- return topology;
- }
-
- public void setTopology(ITopology topology)
- {
- this.topology = topology;
- }
-
- @Override
- protected void setUp() throws Exception
- {
- startTime = System.currentTimeMillis();
- // remoteTraceServer = new RemoteTraceServer();
- // remoteTraceServer.addListener(RemoteTraceServer.PrintListener.CONSOLE);
-
- OMPlatform.INSTANCE.setDebugging(true);
- OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
- // OMPlatform.INSTANCE.addTraceHandler(new RemoteTraceHandler());
- OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
-
- System.gc();
- startMemory = getUsedMemory();
-
- if (topology == null) topology = createTopology();
- label = getName() + " [" + topology.getName() + "]";
- System.out.println("=========================================================================");
- System.out.println("TC_START " + label);
- System.out.println("=========================================================================");
-
- super.setUp();
- topology.start();
-
- startTime = System.currentTimeMillis() - startTime;
- runTime = System.currentTimeMillis();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- topology.waitForSignals();
- runTime = System.currentTimeMillis() - runTime;
-
- Thread.sleep(100);
- long stopTime = System.currentTimeMillis();
-
- JdbcTemplate jdbc = jdbc();
- wipeDatabase(jdbc);
-
- topology.stop();
- topology = null;
- super.tearDown();
-
- System.gc();
- long endMemory = getUsedMemory();
- stopTime = System.currentTimeMillis() - stopTime;
-
- String run = getRun();
- System.out.println("Runtime-Stat " + run + "\t " + startTime + "\t " + runTime + "\t "
- + stopTime);
- System.out.println("Memory-Delta " + run + "\t " + (endMemory - startMemory));
- System.out.println("=========================================================================");
- System.out.println("TC_END " + label);
- System.out.println("=========================================================================");
- System.out.println();
- System.out.println();
- System.out.println();
- System.out.println();
- label = null;
- mode = null;
- }
-
- private static long getUsedMemory()
- {
- return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
- }
-
- private static String getRun()
- {
- return String.format("%4d", new Object[] { ++run});
- }
-
- protected void wipeDatabase(JdbcTemplate jdbc)
- {
- dropTable(jdbc, "CDO_ATTRIBUTE");
- dropTable(jdbc, "CDO_CLASS");
- dropTable(jdbc, "CDO_CONTENT");
- dropTable(jdbc, "CDO_OBJECT");
- dropTable(jdbc, "CDO_PACKAGE");
- dropTable(jdbc, "CDO_REFERENCE");
- dropTable(jdbc, "CDO_RESOURCE");
- }
-
- protected void dropTable(JdbcTemplate jdbc, String tableName)
- {
- try
- {
- jdbc.execute("DROP TABLE " + tableName);
- }
- catch (Exception ignore)
- {
- ; // Intentionally left empty
- }
- }
-
- protected DataSource getDataSource()
- {
- return topology.getDataSource();
- }
-
- protected JdbcTemplate jdbc()
- {
- return new JdbcTemplate(getDataSource());
- }
-
- protected ResourceManager createResourceManager(ResourceSet resourceSet) throws Exception
- {
- return topology.createResourceManager(resourceSet);
- }
-
- protected ResourceManager createResourceManager() throws Exception
- {
- return createResourceManager(new ResourceSetImpl());
- }
-
- protected CDOResource createResource(String path, ResourceManager resourceManager)
- {
- URI uri = CDOResourceFactoryImpl.formatURI(path);
- return (CDOResource) resourceManager.createResource(uri);
- }
-
- protected CDOResource createResource(String path) throws Exception
- {
- return createResource(path, createResourceManager());
- }
-
- protected CDOResource getResource(String path, ResourceManager resourceManager)
- {
- URI uri = CDOResourceFactoryImpl.formatURI(path);
- return (CDOResource) resourceManager.getResource(uri, true);
- }
-
- protected CDOResource getResource(String path) throws Exception
- {
- return getResource(path, createResourceManager());
- }
-
- protected EObject loadRoot(String path) throws Exception
- {
- CDOResource resource = getResource(path);
- return resource.getContents().get(0);
- }
-
- protected CDOResource saveRoot(EObject root, String path) throws Exception
- {
- CDOResource resource = createResource(path);
- resource.getContents().add(root);
- resource.save(null);
- return resource;
- }
-
- protected ITopology createTopology()
- {
- return new ClientServerTopology();
- // if (mode == null)
- // {
- // mode = System.getProperty(CDO_TEST_MODE_KEY, DEFAULT_MODE);
- // }
- //
- // if (EMBEDDED_MODE.equalsIgnoreCase(mode))
- // {
- // return new EmbeddedTopology();
- // }
- //
- // if (CLIENT_MODE.equalsIgnoreCase(mode))
- // {
- // return new ClientTopology();
- // }
- //
- // if (CLIENT_SERVER_MODE.equalsIgnoreCase(mode))
- // {
- // return new ClientServerTopology();
- // }
- //
- // if (CLIENT_SEPARATED_SERVER_MODE.equalsIgnoreCase(mode))
- // {
- // return new ClientSeparatedServerTopology();
- // }
- //
- // fail("Topology not recognized: " + mode);
- // return null; // Make compiler happy
- }
-
- protected void assertTrue(Object object)
- {
- assertNotNull(object);
- assertSame(Boolean.class, object.getClass());
- assertTrue(((Boolean) object).booleanValue());
- }
-
- protected void assertFalse(Object object)
- {
- assertNotNull(object);
- assertSame(Boolean.class, object.getClass());
- assertFalse(((Boolean) object).booleanValue());
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientSeparatedServerTopology.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientSeparatedServerTopology.java
deleted file mode 100644
index bf60469..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientSeparatedServerTopology.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.topology;
-
-
-import javax.sql.DataSource;
-
-
-public class ClientSeparatedServerTopology extends AbstractTopology
-{
- public ClientSeparatedServerTopology()
- {
- }
-
- public String getName()
- {
- return ITopologyConstants.CLIENT_SEPARATED_SERVER_MODE;
- }
-
- public void start() throws Exception
- {
- super.start();
-
- // Start server
- serverNet4j = createContainer("server", NET4J_LOCATION, null);
- net4jServer = createContainer("socket", NET4J_SERVER_LOCATION, serverNet4j);
- cdoServer = createContainer("cdo", CDO_SERVER_LOCATION, net4jServer);
-
- acceptor = (Acceptor) cdoServer.getBean("acceptor", Acceptor.class);
- acceptor.start();
-
- // Start client
- clientNet4j = createContainer("client", NET4J_LOCATION, null);
- net4jClient = createContainer("socket", NET4J_CLIENT_LOCATION, clientNet4j);
- createCDOClient("cdo", net4jClient);
- }
-
- public void stop() throws Exception
- {
- super.stop();
-
- try
- {
- net4jClient.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- net4jClient = null;
- }
-
- try
- {
- clientNet4j.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- clientNet4j = null;
- }
-
- try
- {
- acceptor.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- acceptor = null;
- }
-
- try
- {
- cdoServer.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- cdoServer = null;
- }
-
- try
- {
- net4jServer.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- net4jServer = null;
- }
-
- try
- {
- serverNet4j.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- serverNet4j = null;
- }
- }
-
- public DataSource getDataSource()
- {
- return (DataSource) cdoServer.getBean("dataSource");
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java
deleted file mode 100644
index c3dd62f..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.topology;
-
-
-import org.eclipse.emf.cdo.client.ResourceManager;
-import org.eclipse.emf.cdo.client.impl.AttributeConverterImpl;
-import org.eclipse.emf.cdo.client.impl.PackageManagerImpl;
-import org.eclipse.emf.cdo.client.impl.ResourceManagerImpl;
-import org.eclipse.emf.cdo.client.protocol.ClientCDOProtocolImpl;
-import org.eclipse.emf.cdo.client.protocol.ClientCDOResProtocolImpl;
-import org.eclipse.emf.cdo.core.impl.OIDEncoderImpl;
-import org.eclipse.emf.cdo.server.impl.ColumnConverterImpl;
-import org.eclipse.emf.cdo.server.impl.MapperImpl;
-import org.eclipse.emf.cdo.server.protocol.ServerCDOProtocolImpl;
-import org.eclipse.emf.cdo.server.protocol.ServerCDOResProtocolImpl;
-
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.transport.BufferHandler;
-import org.eclipse.net4j.transport.BufferProvider;
-import org.eclipse.net4j.transport.Channel;
-import org.eclipse.net4j.transport.Connector;
-import org.eclipse.net4j.transport.ProtocolFactory;
-import org.eclipse.net4j.transport.tcp.TCPAcceptor;
-import org.eclipse.net4j.transport.tcp.TCPSelector;
-import org.eclipse.net4j.util.Net4jUtil;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.registry.HashMapRegistry;
-import org.eclipse.net4j.util.registry.IRegistry;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.transaction.support.TransactionTemplate;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
-import javax.sql.DataSource;
-
-
-public class ClientServerTopology implements ITopology
-{
- public static final ThreadGroup ACCEPTOR_GROUP = new ThreadGroup("acceptor");
-
- public static final ThreadGroup CONNECTOR_GROUP = new ThreadGroup("connector");
-
- public static final ExecutorService ACCEPTOR_POOL = Executors
- .newCachedThreadPool(new ThreadFactory()
- {
- public Thread newThread(Runnable r)
- {
- return new Thread(ACCEPTOR_GROUP, r);
- }
- });
-
- public static final ExecutorService CONNECTOR_POOL = Executors
- .newCachedThreadPool(new ThreadFactory()
- {
- public Thread newThread(Runnable r)
- {
- return new Thread(CONNECTOR_GROUP, r);
- }
- });
-
- private AttributeConverterImpl attributeConverter;
-
- private OIDEncoderImpl oidEncoder;
-
- private PackageManagerImpl clientPackageManager;
-
- private IRegistry<String, ProtocolFactory> clientRegistry;
-
- private IRegistry<String, ProtocolFactory> serverRegistry;
-
- private BufferProvider bufferPool;
-
- private TCPSelector selector;
-
- private TCPAcceptor acceptor;
-
- private Connector connector;
-
- private org.eclipse.emf.cdo.server.impl.PackageManagerImpl serverPackageManager;
-
- private org.eclipse.emf.cdo.server.impl.ResourceManagerImpl serverResourceManager;
-
- private ColumnConverterImpl columnConverter;
-
- private DriverManagerDataSource dataSource;
-
- private DataSourceTransactionManager transactionManager;
-
- private TransactionTemplate transactionTemplate;
-
- private JdbcTemplate jdbcTemplate;
-
- private MapperImpl mapper;
-
- private List<ResourceManager> resourceManagers = new ArrayList();
-
- public ClientServerTopology()
- {
- }
-
- public String getName()
- {
- return ITopologyConstants.CLIENT_SERVER_MODE;
- }
-
- public void start() throws Exception
- {
- bufferPool = Net4jUtil.createBufferPool();
- LifecycleUtil.activate(bufferPool);
-
- selector = Net4jUtil.createTCPSelector();
- LifecycleUtil.activate(selector);
-
- oidEncoder = new OIDEncoderImpl();
- oidEncoder.setFragmentBits(48);
- LifecycleUtil.activate(oidEncoder);
-
- // Server
- columnConverter = new ColumnConverterImpl();
- LifecycleUtil.activate(columnConverter);
-
- serverPackageManager = new org.eclipse.emf.cdo.server.impl.PackageManagerImpl();
- LifecycleUtil.activate(serverPackageManager);
-
- serverResourceManager = new org.eclipse.emf.cdo.server.impl.ResourceManagerImpl();
- LifecycleUtil.activate(serverResourceManager);
-
- dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
- dataSource.setUrl("jdbc:hsqldb:.");
- dataSource.setUsername("sa");
-
- jdbcTemplate = new JdbcTemplate();
- jdbcTemplate.setDataSource(dataSource);
-
- mapper = new MapperImpl();
- mapper.setColumnConverter(columnConverter);
- mapper.setDataSource(dataSource);
- mapper.setJdbcTemplate(jdbcTemplate);
- mapper.setOidEncoder(oidEncoder);
- mapper.setPackageManager(serverPackageManager);
- mapper.setResourceManager(serverResourceManager);
- mapper.setSqlDialectName("HSQLDB");
- LifecycleUtil.activate(mapper);
-
- transactionManager = new DataSourceTransactionManager();
- transactionManager.setDataSource(dataSource);
-
- transactionTemplate = new TransactionTemplate();
- transactionTemplate.setTransactionManager(transactionManager);
-
- serverRegistry = new HashMapRegistry();
- {
- ServerCDOResProtocolImpl.Factory factory = new ServerCDOResProtocolImpl.Factory(mapper,
- transactionTemplate);
- serverRegistry.put(factory.getID(), factory);
- }
- {
- ServerCDOProtocolImpl.Factory factory = new ServerCDOProtocolImpl.Factory(mapper,
- transactionTemplate);
- serverRegistry.put(factory.getID(), factory);
- }
-
- acceptor = Net4jUtil.createTCPAcceptor(bufferPool, selector);
- acceptor.setProtocolFactoryRegistry(serverRegistry);
- acceptor.setReceiveExecutor(ACCEPTOR_POOL);
- LifecycleUtil.activate(acceptor);
-
- // Client
- attributeConverter = new AttributeConverterImpl();
- LifecycleUtil.activate(attributeConverter);
-
- clientPackageManager = new PackageManagerImpl();
- clientPackageManager.setAttributeConverter(attributeConverter);
- clientPackageManager.setOidEncoder(oidEncoder);
- clientPackageManager.setAutoPersistent(true);
- LifecycleUtil.activate(clientPackageManager);
-
- clientRegistry = new HashMapRegistry();
- {
- ClientCDOProtocolImpl.Factory factory = new ClientCDOProtocolImpl.Factory(
- clientPackageManager);
- clientRegistry.put(factory.getID(), factory);
- }
- {
- ClientCDOResProtocolImpl.Factory factory = new ClientCDOResProtocolImpl.Factory();
- clientRegistry.put(factory.getID(), factory);
- }
-
- connector = Net4jUtil.createTCPConnector(bufferPool, selector, "localhost");
- connector.setProtocolFactoryRegistry(clientRegistry);
- connector.setReceiveExecutor(CONNECTOR_POOL);
- LifecycleUtil.activate(connector);
- }
-
- public void stop() throws Exception
- {
- for (ResourceManager resourceManager : resourceManagers)
- {
- LifecycleUtil.deactivate(resourceManager);
- }
-
- resourceManagers.clear();
- resourceManagers = null;
-
- LifecycleUtil.deactivate(connector);
- connector = null;
-
- clientRegistry = null;
-
- LifecycleUtil.deactivate(clientPackageManager);
- clientPackageManager = null;
-
- LifecycleUtil.deactivate(attributeConverter);
- attributeConverter = null;
-
- LifecycleUtil.deactivate(acceptor);
- acceptor = null;
-
- serverRegistry = null;
- transactionTemplate = null;
- transactionManager = null;
-
- LifecycleUtil.deactivate(mapper);
- mapper = null;
-
- jdbcTemplate = null;
- dataSource = null;
-
- LifecycleUtil.deactivate(serverResourceManager);
- serverResourceManager = null;
-
- LifecycleUtil.deactivate(serverPackageManager);
- serverPackageManager = null;
-
- LifecycleUtil.deactivate(columnConverter);
- columnConverter = null;
-
- LifecycleUtil.deactivate(oidEncoder);
- oidEncoder = null;
-
- LifecycleUtil.deactivate(selector);
- selector = null;
-
- LifecycleUtil.deactivate(bufferPool);
- bufferPool = null;
- }
-
- public void waitForSignals()
- {
- Collection<Channel> channels = Channel.REGISTRY.values();
- for (Channel channel : channels)
- {
- BufferHandler receiveHandler = channel.getReceiveHandler();
- if (receiveHandler instanceof SignalProtocol)
- {
- SignalProtocol signalProtocol = (SignalProtocol) receiveHandler;
- signalProtocol.waitForSignals(2000);
- }
- }
- }
-
- public ResourceManager createResourceManager(ResourceSet resourceSet) throws Exception
- {
- ResourceManagerImpl resourceManager = new ResourceManagerImpl();
- resourceManager.setConnector(connector);
- resourceManager.setPackageManager(clientPackageManager);
- resourceManager.setResourceSet(resourceSet);
- LifecycleUtil.activate(resourceManager);
- resourceManagers.add(resourceManager);
- return resourceManager;
- }
-
- public DataSource getDataSource()
- {
- return dataSource;
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientTopology.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientTopology.java
deleted file mode 100644
index 1dcf97f..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientTopology.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.topology;
-
-
-import javax.sql.DataSource;
-
-
-/*
- * TODO Test this topology (need external server for that)
- */
-public class ClientTopology extends AbstractTopology
-{
- private Container net4j;
-
- private Container net4jClient;
-
- public ClientTopology()
- {
- }
-
- public String getName()
- {
- return ITopologyConstants.CLIENT_MODE;
- }
-
- public void start() throws Exception
- {
- super.start();
-
- // Start client
- net4j = createContainer("net4j", NET4J_LOCATION, null);
- net4jClient = createContainer("client", NET4J_CLIENT_LOCATION, net4j);
- createCDOClient("cdo", net4jClient);
- }
-
- public void stop() throws Exception
- {
- super.stop();
-
- try
- {
- net4jClient.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- net4jClient = null;
- }
-
- try
- {
- net4j.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- net4j = null;
- }
- }
-
- public DataSource getDataSource()
- {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/EmbeddedTopology.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/EmbeddedTopology.java
deleted file mode 100644
index fb0040d..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/EmbeddedTopology.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.topology;
-
-
-import javax.sql.DataSource;
-
-
-public class EmbeddedTopology extends AbstractTopology
-{
- private Container net4j;
-
- private Container cdoServer;
-
- private Container net4jEmbedded;
-
- public EmbeddedTopology()
- {
- }
-
- public String getName()
- {
- return ITopologyConstants.EMBEDDED_MODE;
- }
-
- public void start() throws Exception
- {
- super.start();
- net4j = createContainer("net4j", NET4J_LOCATION, null);
- net4jEmbedded = createContainer("embedded", NET4J_EMBEDDED_LOCATION, net4j);
- cdoServer = createContainer("cdo-server", CDO_SERVER_LOCATION, net4jEmbedded);
- createCDOClient("cdo-client", net4jEmbedded);
- }
-
- public void stop() throws Exception
- {
- super.stop();
-
- try
- {
- cdoServer.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- cdoServer = null;
- }
-
- try
- {
- net4jEmbedded.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- net4jEmbedded = null;
- }
-
- try
- {
- net4j.stop();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- net4j = null;
- }
- }
-
- public DataSource getDataSource()
- {
- return (DataSource) cdoServer.getBean("dataSource");
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ITopology.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ITopology.java
deleted file mode 100644
index 0a8eeba..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ITopology.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.topology;
-
-
-import org.eclipse.emf.cdo.client.ResourceManager;
-
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import javax.sql.DataSource;
-
-
-public interface ITopology
-{
- public String getName();
-
- public void start() throws Exception;
-
- public void stop() throws Exception;
-
- public ResourceManager createResourceManager(ResourceSet resourceSet) throws Exception;
-
- public DataSource getDataSource();
-
- public void waitForSignals();
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ITopologyConstants.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ITopologyConstants.java
deleted file mode 100644
index f0e8358..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ITopologyConstants.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.topology;
-
-
-public interface ITopologyConstants
-{
- public static final String CDO_TEST_MODE_KEY = "cdo.test.mode";
-
- public static final String CLIENT_SEPARATED_SERVER_MODE = "Client-Separated-Server";
-
- public static final String CLIENT_SERVER_MODE = "Client-Server";
-
- public static final String CLIENT_MODE = "Client";
-
- public static final String EMBEDDED_MODE = "Embedded";
-
- public static final String[] ALL_MODES = { //
- CLIENT_SEPARATED_SERVER_MODE, // 0
- CLIENT_SERVER_MODE, // 1
- CLIENT_MODE, // 2
- EMBEDDED_MODE // 3
- };
-
- public static final String[] SELF_CONTAINED_MODES = { //
- CLIENT_SEPARATED_SERVER_MODE, // 0
- CLIENT_SERVER_MODE, // 1
- EMBEDDED_MODE // 2
- };
-
- public static final String DEFAULT_MODE = EMBEDDED_MODE;
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/EmptyNode.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/EmptyNode.java
deleted file mode 100644
index 475a9b6..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/EmptyNode.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Empty Node</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see testmodel1.TestModel1Package#getEmptyNode()
- * @model
- * @generated
- */
-public interface EmptyNode extends TreeNode
-{
-} // EmptyNode \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/EmptyRefNode.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/EmptyRefNode.java
deleted file mode 100644
index 76938f1..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/EmptyRefNode.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1;
-
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Empty Ref Node</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link testmodel1.EmptyRefNode#getMoreReferences <em>More References</em>}</li>
- * </ul>
- * </p>
- *
- * @see testmodel1.TestModel1Package#getEmptyRefNode()
- * @model
- * @generated
- */
-public interface EmptyRefNode extends TreeNode
-{
- /**
- * Returns the value of the '<em><b>More References</b></em>' reference list.
- * The list contents are of type {@link testmodel1.TreeNode}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>More References</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>More References</em>' reference list.
- * @see testmodel1.TestModel1Package#getEmptyRefNode_MoreReferences()
- * @model type="testmodel1.TreeNode"
- * @generated
- */
- EList getMoreReferences();
-
-} // EmptyRefNode \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/ExtendedNode.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/ExtendedNode.java
deleted file mode 100644
index 63cee3a..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/ExtendedNode.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1;
-
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extended Node</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link testmodel1.ExtendedNode#getBidiSource <em>Bidi Source</em>}</li>
- * <li>{@link testmodel1.ExtendedNode#getBidiTarget <em>Bidi Target</em>}</li>
- * <li>{@link testmodel1.ExtendedNode#getStringFeature2 <em>String Feature2</em>}</li>
- * </ul>
- * </p>
- *
- * @see testmodel1.TestModel1Package#getExtendedNode()
- * @model
- * @generated
- */
-public interface ExtendedNode extends TreeNode
-{
- /**
- * Returns the value of the '<em><b>Bidi Source</b></em>' reference list.
- * The list contents are of type {@link testmodel1.ExtendedNode}.
- * It is bidirectional and its opposite is '{@link testmodel1.ExtendedNode#getBidiTarget <em>Bidi Target</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Bidi Source</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>Bidi Source</em>' reference list.
- * @see testmodel1.TestModel1Package#getExtendedNode_BidiSource()
- * @see testmodel1.ExtendedNode#getBidiTarget
- * @model type="testmodel1.ExtendedNode" opposite="bidiTarget"
- * @generated
- */
- EList getBidiSource();
-
- /**
- * Returns the value of the '<em><b>Bidi Target</b></em>' reference list.
- * The list contents are of type {@link testmodel1.ExtendedNode}.
- * It is bidirectional and its opposite is '{@link testmodel1.ExtendedNode#getBidiSource <em>Bidi Source</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Bidi Target</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>Bidi Target</em>' reference list.
- * @see testmodel1.TestModel1Package#getExtendedNode_BidiTarget()
- * @see testmodel1.ExtendedNode#getBidiSource
- * @model type="testmodel1.ExtendedNode" opposite="bidiSource"
- * @generated
- */
- EList getBidiTarget();
-
- /**
- * Returns the value of the '<em><b>String Feature2</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>String Feature2</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>String Feature2</em>' attribute.
- * @see #setStringFeature2(String)
- * @see testmodel1.TestModel1Package#getExtendedNode_StringFeature2()
- * @model
- * @generated
- */
- String getStringFeature2();
-
- /**
- * Sets the value of the '{@link testmodel1.ExtendedNode#getStringFeature2 <em>String Feature2</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>String Feature2</em>' attribute.
- * @see #getStringFeature2()
- * @generated
- */
- void setStringFeature2(String value);
-
-} // ExtendedNode \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TestModel1Factory.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TestModel1Factory.java
deleted file mode 100644
index 263f3e8..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TestModel1Factory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1;
-
-
-import org.eclipse.emf.ecore.EFactory;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see testmodel1.TestModel1Package
- * @generated
- */
-public interface TestModel1Factory extends EFactory
-{
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- TestModel1Factory eINSTANCE = testmodel1.impl.TestModel1FactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Tree Node</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tree Node</em>'.
- * @generated
- */
- TreeNode createTreeNode();
-
- /**
- * Returns a new object of class '<em>Extended Node</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Extended Node</em>'.
- * @generated
- */
- ExtendedNode createExtendedNode();
-
- /**
- * Returns a new object of class '<em>Empty Node</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Empty Node</em>'.
- * @generated
- */
- EmptyNode createEmptyNode();
-
- /**
- * Returns a new object of class '<em>Empty Ref Node</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Empty Ref Node</em>'.
- * @generated
- */
- EmptyRefNode createEmptyRefNode();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- TestModel1Package getTestModel1Package();
-
-} //TestModel1Factory
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TestModel1Package.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TestModel1Package.java
deleted file mode 100644
index aca26ad..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TestModel1Package.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1;
-
-
-import org.eclipse.emf.cdo.client.CDOPackage;
-
-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 testmodel1.TestModel1Factory
- * @model kind="package"
- * @generated
- */
-public interface TestModel1Package extends EPackage
-{
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "testmodel1";
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/emf/cdo/2006/TestModel1";
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "testmodel1";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- TestModel1Package eINSTANCE = testmodel1.impl.TestModel1PackageImpl.init();
-
- /**
- * The meta object id for the '{@link testmodel1.impl.TreeNodeImpl <em>Tree Node</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see testmodel1.impl.TreeNodeImpl
- * @see testmodel1.impl.TestModel1PackageImpl#getTreeNode()
- * @generated
- */
- int TREE_NODE = 0;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TREE_NODE__PARENT = CDOPackage.CDO_PERSISTENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TREE_NODE__CHILDREN = CDOPackage.CDO_PERSISTENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TREE_NODE__REFERENCES = CDOPackage.CDO_PERSISTENT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Boolean Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TREE_NODE__BOOLEAN_FEATURE = CDOPackage.CDO_PERSISTENT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Int Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TREE_NODE__INT_FEATURE = CDOPackage.CDO_PERSISTENT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>String Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TREE_NODE__STRING_FEATURE = CDOPackage.CDO_PERSISTENT_FEATURE_COUNT + 5;
-
- /**
- * The number of structural features of the '<em>Tree Node</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TREE_NODE_FEATURE_COUNT = CDOPackage.CDO_PERSISTENT_FEATURE_COUNT + 6;
-
- /**
- * The meta object id for the '{@link testmodel1.impl.ExtendedNodeImpl <em>Extended Node</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see testmodel1.impl.ExtendedNodeImpl
- * @see testmodel1.impl.TestModel1PackageImpl#getExtendedNode()
- * @generated
- */
- int EXTENDED_NODE = 1;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE__PARENT = TREE_NODE__PARENT;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE__CHILDREN = TREE_NODE__CHILDREN;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE__REFERENCES = TREE_NODE__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Boolean Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE__BOOLEAN_FEATURE = TREE_NODE__BOOLEAN_FEATURE;
-
- /**
- * The feature id for the '<em><b>Int Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE__INT_FEATURE = TREE_NODE__INT_FEATURE;
-
- /**
- * The feature id for the '<em><b>String Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE__STRING_FEATURE = TREE_NODE__STRING_FEATURE;
-
- /**
- * The feature id for the '<em><b>Bidi Source</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE__BIDI_SOURCE = TREE_NODE_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Bidi Target</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE__BIDI_TARGET = TREE_NODE_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>String Feature2</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE__STRING_FEATURE2 = TREE_NODE_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Extended Node</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EXTENDED_NODE_FEATURE_COUNT = TREE_NODE_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link testmodel1.impl.EmptyNodeImpl <em>Empty Node</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see testmodel1.impl.EmptyNodeImpl
- * @see testmodel1.impl.TestModel1PackageImpl#getEmptyNode()
- * @generated
- */
- int EMPTY_NODE = 2;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_NODE__PARENT = TREE_NODE__PARENT;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_NODE__CHILDREN = TREE_NODE__CHILDREN;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_NODE__REFERENCES = TREE_NODE__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Boolean Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_NODE__BOOLEAN_FEATURE = TREE_NODE__BOOLEAN_FEATURE;
-
- /**
- * The feature id for the '<em><b>Int Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_NODE__INT_FEATURE = TREE_NODE__INT_FEATURE;
-
- /**
- * The feature id for the '<em><b>String Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_NODE__STRING_FEATURE = TREE_NODE__STRING_FEATURE;
-
- /**
- * The number of structural features of the '<em>Empty Node</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_NODE_FEATURE_COUNT = TREE_NODE_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link testmodel1.impl.EmptyRefNodeImpl <em>Empty Ref Node</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see testmodel1.impl.EmptyRefNodeImpl
- * @see testmodel1.impl.TestModel1PackageImpl#getEmptyRefNode()
- * @generated
- */
- int EMPTY_REF_NODE = 3;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_REF_NODE__PARENT = TREE_NODE__PARENT;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_REF_NODE__CHILDREN = TREE_NODE__CHILDREN;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_REF_NODE__REFERENCES = TREE_NODE__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Boolean Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_REF_NODE__BOOLEAN_FEATURE = TREE_NODE__BOOLEAN_FEATURE;
-
- /**
- * The feature id for the '<em><b>Int Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_REF_NODE__INT_FEATURE = TREE_NODE__INT_FEATURE;
-
- /**
- * The feature id for the '<em><b>String Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_REF_NODE__STRING_FEATURE = TREE_NODE__STRING_FEATURE;
-
- /**
- * The feature id for the '<em><b>More References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_REF_NODE__MORE_REFERENCES = TREE_NODE_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Empty Ref Node</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EMPTY_REF_NODE_FEATURE_COUNT = TREE_NODE_FEATURE_COUNT + 1;
-
- /**
- * Returns the meta object for class '{@link testmodel1.TreeNode <em>Tree Node</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tree Node</em>'.
- * @see testmodel1.TreeNode
- * @generated
- */
- EClass getTreeNode();
-
- /**
- * Returns the meta object for the container reference '{@link testmodel1.TreeNode#getParent <em>Parent</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the container reference '<em>Parent</em>'.
- * @see testmodel1.TreeNode#getParent()
- * @see #getTreeNode()
- * @generated
- */
- EReference getTreeNode_Parent();
-
- /**
- * Returns the meta object for the containment reference list '{@link testmodel1.TreeNode#getChildren <em>Children</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Children</em>'.
- * @see testmodel1.TreeNode#getChildren()
- * @see #getTreeNode()
- * @generated
- */
- EReference getTreeNode_Children();
-
- /**
- * Returns the meta object for the reference list '{@link testmodel1.TreeNode#getReferences <em>References</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>References</em>'.
- * @see testmodel1.TreeNode#getReferences()
- * @see #getTreeNode()
- * @generated
- */
- EReference getTreeNode_References();
-
- /**
- * Returns the meta object for the attribute '{@link testmodel1.TreeNode#isBooleanFeature <em>Boolean Feature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Boolean Feature</em>'.
- * @see testmodel1.TreeNode#isBooleanFeature()
- * @see #getTreeNode()
- * @generated
- */
- EAttribute getTreeNode_BooleanFeature();
-
- /**
- * Returns the meta object for the attribute '{@link testmodel1.TreeNode#getIntFeature <em>Int Feature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Int Feature</em>'.
- * @see testmodel1.TreeNode#getIntFeature()
- * @see #getTreeNode()
- * @generated
- */
- EAttribute getTreeNode_IntFeature();
-
- /**
- * Returns the meta object for the attribute '{@link testmodel1.TreeNode#getStringFeature <em>String Feature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>String Feature</em>'.
- * @see testmodel1.TreeNode#getStringFeature()
- * @see #getTreeNode()
- * @generated
- */
- EAttribute getTreeNode_StringFeature();
-
- /**
- * Returns the meta object for class '{@link testmodel1.ExtendedNode <em>Extended Node</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Extended Node</em>'.
- * @see testmodel1.ExtendedNode
- * @generated
- */
- EClass getExtendedNode();
-
- /**
- * Returns the meta object for the reference list '{@link testmodel1.ExtendedNode#getBidiSource <em>Bidi Source</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Bidi Source</em>'.
- * @see testmodel1.ExtendedNode#getBidiSource()
- * @see #getExtendedNode()
- * @generated
- */
- EReference getExtendedNode_BidiSource();
-
- /**
- * Returns the meta object for the reference list '{@link testmodel1.ExtendedNode#getBidiTarget <em>Bidi Target</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Bidi Target</em>'.
- * @see testmodel1.ExtendedNode#getBidiTarget()
- * @see #getExtendedNode()
- * @generated
- */
- EReference getExtendedNode_BidiTarget();
-
- /**
- * Returns the meta object for the attribute '{@link testmodel1.ExtendedNode#getStringFeature2 <em>String Feature2</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>String Feature2</em>'.
- * @see testmodel1.ExtendedNode#getStringFeature2()
- * @see #getExtendedNode()
- * @generated
- */
- EAttribute getExtendedNode_StringFeature2();
-
- /**
- * Returns the meta object for class '{@link testmodel1.EmptyNode <em>Empty Node</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Empty Node</em>'.
- * @see testmodel1.EmptyNode
- * @generated
- */
- EClass getEmptyNode();
-
- /**
- * Returns the meta object for class '{@link testmodel1.EmptyRefNode <em>Empty Ref Node</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Empty Ref Node</em>'.
- * @see testmodel1.EmptyRefNode
- * @generated
- */
- EClass getEmptyRefNode();
-
- /**
- * Returns the meta object for the reference list '{@link testmodel1.EmptyRefNode#getMoreReferences <em>More References</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>More References</em>'.
- * @see testmodel1.EmptyRefNode#getMoreReferences()
- * @see #getEmptyRefNode()
- * @generated
- */
- EReference getEmptyRefNode_MoreReferences();
-
- /**
- * 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
- */
- TestModel1Factory getTestModel1Factory();
-
-
- /**
- * <!-- 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 testmodel1.impl.TreeNodeImpl <em>Tree Node</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see testmodel1.impl.TreeNodeImpl
- * @see testmodel1.impl.TestModel1PackageImpl#getTreeNode()
- * @generated
- */
- EClass TREE_NODE = eINSTANCE.getTreeNode();
-
- /**
- * The meta object literal for the '<em><b>Parent</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference TREE_NODE__PARENT = eINSTANCE.getTreeNode_Parent();
-
- /**
- * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference TREE_NODE__CHILDREN = eINSTANCE.getTreeNode_Children();
-
- /**
- * The meta object literal for the '<em><b>References</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference TREE_NODE__REFERENCES = eINSTANCE.getTreeNode_References();
-
- /**
- * The meta object literal for the '<em><b>Boolean Feature</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute TREE_NODE__BOOLEAN_FEATURE = eINSTANCE.getTreeNode_BooleanFeature();
-
- /**
- * The meta object literal for the '<em><b>Int Feature</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute TREE_NODE__INT_FEATURE = eINSTANCE.getTreeNode_IntFeature();
-
- /**
- * The meta object literal for the '<em><b>String Feature</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute TREE_NODE__STRING_FEATURE = eINSTANCE.getTreeNode_StringFeature();
-
- /**
- * The meta object literal for the '{@link testmodel1.impl.ExtendedNodeImpl <em>Extended Node</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see testmodel1.impl.ExtendedNodeImpl
- * @see testmodel1.impl.TestModel1PackageImpl#getExtendedNode()
- * @generated
- */
- EClass EXTENDED_NODE = eINSTANCE.getExtendedNode();
-
- /**
- * The meta object literal for the '<em><b>Bidi Source</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference EXTENDED_NODE__BIDI_SOURCE = eINSTANCE.getExtendedNode_BidiSource();
-
- /**
- * The meta object literal for the '<em><b>Bidi Target</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference EXTENDED_NODE__BIDI_TARGET = eINSTANCE.getExtendedNode_BidiTarget();
-
- /**
- * The meta object literal for the '<em><b>String Feature2</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute EXTENDED_NODE__STRING_FEATURE2 = eINSTANCE.getExtendedNode_StringFeature2();
-
- /**
- * The meta object literal for the '{@link testmodel1.impl.EmptyNodeImpl <em>Empty Node</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see testmodel1.impl.EmptyNodeImpl
- * @see testmodel1.impl.TestModel1PackageImpl#getEmptyNode()
- * @generated
- */
- EClass EMPTY_NODE = eINSTANCE.getEmptyNode();
-
- /**
- * The meta object literal for the '{@link testmodel1.impl.EmptyRefNodeImpl <em>Empty Ref Node</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see testmodel1.impl.EmptyRefNodeImpl
- * @see testmodel1.impl.TestModel1PackageImpl#getEmptyRefNode()
- * @generated
- */
- EClass EMPTY_REF_NODE = eINSTANCE.getEmptyRefNode();
-
- /**
- * The meta object literal for the '<em><b>More References</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference EMPTY_REF_NODE__MORE_REFERENCES = eINSTANCE.getEmptyRefNode_MoreReferences();
-
- }
-
-} //TestModel1Package
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TreeNode.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TreeNode.java
deleted file mode 100644
index ca1f0e1..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/TreeNode.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1;
-
-
-import org.eclipse.emf.cdo.client.CDOPersistent;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tree Node</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link testmodel1.TreeNode#getParent <em>Parent</em>}</li>
- * <li>{@link testmodel1.TreeNode#getChildren <em>Children</em>}</li>
- * <li>{@link testmodel1.TreeNode#getReferences <em>References</em>}</li>
- * <li>{@link testmodel1.TreeNode#isBooleanFeature <em>Boolean Feature</em>}</li>
- * <li>{@link testmodel1.TreeNode#getIntFeature <em>Int Feature</em>}</li>
- * <li>{@link testmodel1.TreeNode#getStringFeature <em>String Feature</em>}</li>
- * </ul>
- * </p>
- *
- * @see testmodel1.TestModel1Package#getTreeNode()
- * @model
- * @generated
- */
-public interface TreeNode extends CDOPersistent
-{
- /**
- * Returns the value of the '<em><b>Parent</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link testmodel1.TreeNode#getChildren <em>Children</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Parent</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>Parent</em>' container reference.
- * @see #setParent(TreeNode)
- * @see testmodel1.TestModel1Package#getTreeNode_Parent()
- * @see testmodel1.TreeNode#getChildren
- * @model opposite="children"
- * @generated
- */
- TreeNode getParent();
-
- /**
- * Sets the value of the '{@link testmodel1.TreeNode#getParent <em>Parent</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Parent</em>' container reference.
- * @see #getParent()
- * @generated
- */
- void setParent(TreeNode value);
-
- /**
- * Returns the value of the '<em><b>Children</b></em>' containment reference list.
- * The list contents are of type {@link testmodel1.TreeNode}.
- * It is bidirectional and its opposite is '{@link testmodel1.TreeNode#getParent <em>Parent</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Children</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>Children</em>' containment reference list.
- * @see testmodel1.TestModel1Package#getTreeNode_Children()
- * @see testmodel1.TreeNode#getParent
- * @model type="testmodel1.TreeNode" opposite="parent" containment="true"
- * @generated
- */
- EList getChildren();
-
- /**
- * Returns the value of the '<em><b>References</b></em>' reference list.
- * The list contents are of type {@link testmodel1.TreeNode}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>References</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>References</em>' reference list.
- * @see testmodel1.TestModel1Package#getTreeNode_References()
- * @model type="testmodel1.TreeNode"
- * @generated
- */
- EList getReferences();
-
- /**
- * Returns the value of the '<em><b>Boolean Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Boolean Feature</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Boolean Feature</em>' attribute.
- * @see #setBooleanFeature(boolean)
- * @see testmodel1.TestModel1Package#getTreeNode_BooleanFeature()
- * @model
- * @generated
- */
- boolean isBooleanFeature();
-
- /**
- * Sets the value of the '{@link testmodel1.TreeNode#isBooleanFeature <em>Boolean Feature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Boolean Feature</em>' attribute.
- * @see #isBooleanFeature()
- * @generated
- */
- void setBooleanFeature(boolean value);
-
- /**
- * Returns the value of the '<em><b>Int Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Int Feature</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Int Feature</em>' attribute.
- * @see #setIntFeature(int)
- * @see testmodel1.TestModel1Package#getTreeNode_IntFeature()
- * @model
- * @generated
- */
- int getIntFeature();
-
- /**
- * Sets the value of the '{@link testmodel1.TreeNode#getIntFeature <em>Int Feature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Int Feature</em>' attribute.
- * @see #getIntFeature()
- * @generated
- */
- void setIntFeature(int value);
-
- /**
- * Returns the value of the '<em><b>String Feature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>String Feature</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>String Feature</em>' attribute.
- * @see #setStringFeature(String)
- * @see testmodel1.TestModel1Package#getTreeNode_StringFeature()
- * @model
- * @generated
- */
- String getStringFeature();
-
- /**
- * Sets the value of the '{@link testmodel1.TreeNode#getStringFeature <em>String Feature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>String Feature</em>' attribute.
- * @see #getStringFeature()
- * @generated
- */
- void setStringFeature(String value);
-
-} // TreeNode \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/EmptyNodeImpl.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/EmptyNodeImpl.java
deleted file mode 100644
index bf6b370..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/EmptyNodeImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-
-import testmodel1.EmptyNode;
-import testmodel1.TestModel1Package;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Empty Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class EmptyNodeImpl extends TreeNodeImpl implements EmptyNode
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EmptyNodeImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return TestModel1Package.Literals.EMPTY_NODE;
- }
-
-} //EmptyNodeImpl \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/EmptyRefNodeImpl.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/EmptyRefNodeImpl.java
deleted file mode 100644
index 6d6c6c5..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/EmptyRefNodeImpl.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1.impl;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import testmodel1.EmptyRefNode;
-import testmodel1.TestModel1Package;
-import testmodel1.TreeNode;
-
-import java.util.Collection;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Empty Ref Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link testmodel1.impl.EmptyRefNodeImpl#getMoreReferences <em>More References</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EmptyRefNodeImpl extends TreeNodeImpl implements EmptyRefNode
-{
- /**
- * The cached value of the '{@link #getMoreReferences() <em>More References</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMoreReferences()
- * @generated
- * @ordered
- */
- protected EList moreReferences = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EmptyRefNodeImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return TestModel1Package.Literals.EMPTY_REF_NODE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getMoreReferences()
- {
- cdoLoad();
- if (moreReferences == null)
- {
- moreReferences = new EObjectResolvingEList(TreeNode.class, this,
- TestModel1Package.EMPTY_REF_NODE__MORE_REFERENCES);
- }
- return moreReferences;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case TestModel1Package.EMPTY_REF_NODE__MORE_REFERENCES:
- return getMoreReferences();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case TestModel1Package.EMPTY_REF_NODE__MORE_REFERENCES:
- getMoreReferences().clear();
- getMoreReferences().addAll((Collection) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case TestModel1Package.EMPTY_REF_NODE__MORE_REFERENCES:
- getMoreReferences().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case TestModel1Package.EMPTY_REF_NODE__MORE_REFERENCES:
- return moreReferences != null && !moreReferences.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //EmptyRefNodeImpl \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/ExtendedNodeImpl.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/ExtendedNodeImpl.java
deleted file mode 100644
index 2610d19..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/ExtendedNodeImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import testmodel1.ExtendedNode;
-import testmodel1.TestModel1Package;
-
-import java.util.Collection;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extended Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link testmodel1.impl.ExtendedNodeImpl#getBidiSource <em>Bidi Source</em>}</li>
- * <li>{@link testmodel1.impl.ExtendedNodeImpl#getBidiTarget <em>Bidi Target</em>}</li>
- * <li>{@link testmodel1.impl.ExtendedNodeImpl#getStringFeature2 <em>String Feature2</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtendedNodeImpl extends TreeNodeImpl implements ExtendedNode
-{
- /**
- * The cached value of the '{@link #getBidiSource() <em>Bidi Source</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBidiSource()
- * @generated
- * @ordered
- */
- protected EList bidiSource = null;
-
- /**
- * The cached value of the '{@link #getBidiTarget() <em>Bidi Target</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBidiTarget()
- * @generated
- * @ordered
- */
- protected EList bidiTarget = null;
-
- /**
- * The default value of the '{@link #getStringFeature2() <em>String Feature2</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getStringFeature2()
- * @generated
- * @ordered
- */
- protected static final String STRING_FEATURE2_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getStringFeature2() <em>String Feature2</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getStringFeature2()
- * @generated
- * @ordered
- */
- protected String stringFeature2 = STRING_FEATURE2_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ExtendedNodeImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return TestModel1Package.Literals.EXTENDED_NODE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getBidiSource()
- {
- cdoLoad();
- if (bidiSource == null)
- {
- bidiSource = new EObjectWithInverseResolvingEList.ManyInverse(ExtendedNode.class, this,
- TestModel1Package.EXTENDED_NODE__BIDI_SOURCE,
- TestModel1Package.EXTENDED_NODE__BIDI_TARGET);
- }
- return bidiSource;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getBidiTarget()
- {
- cdoLoad();
- if (bidiTarget == null)
- {
- bidiTarget = new EObjectWithInverseResolvingEList.ManyInverse(ExtendedNode.class, this,
- TestModel1Package.EXTENDED_NODE__BIDI_TARGET,
- TestModel1Package.EXTENDED_NODE__BIDI_SOURCE);
- }
- return bidiTarget;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getStringFeature2()
- {
- cdoLoad();
- return stringFeature2;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setStringFeature2(String newStringFeature2)
- {
- cdoLoad();
- String oldStringFeature2 = stringFeature2;
- stringFeature2 = newStringFeature2;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- TestModel1Package.EXTENDED_NODE__STRING_FEATURE2, oldStringFeature2, stringFeature2));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID,
- NotificationChain msgs)
- {
- switch (featureID)
- {
- case TestModel1Package.EXTENDED_NODE__BIDI_SOURCE:
- return ((InternalEList) getBidiSource()).basicAdd(otherEnd, msgs);
- case TestModel1Package.EXTENDED_NODE__BIDI_TARGET:
- return ((InternalEList) getBidiTarget()).basicAdd(otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
- NotificationChain msgs)
- {
- switch (featureID)
- {
- case TestModel1Package.EXTENDED_NODE__BIDI_SOURCE:
- return ((InternalEList) getBidiSource()).basicRemove(otherEnd, msgs);
- case TestModel1Package.EXTENDED_NODE__BIDI_TARGET:
- return ((InternalEList) getBidiTarget()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case TestModel1Package.EXTENDED_NODE__BIDI_SOURCE:
- return getBidiSource();
- case TestModel1Package.EXTENDED_NODE__BIDI_TARGET:
- return getBidiTarget();
- case TestModel1Package.EXTENDED_NODE__STRING_FEATURE2:
- return getStringFeature2();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case TestModel1Package.EXTENDED_NODE__BIDI_SOURCE:
- getBidiSource().clear();
- getBidiSource().addAll((Collection) newValue);
- return;
- case TestModel1Package.EXTENDED_NODE__BIDI_TARGET:
- getBidiTarget().clear();
- getBidiTarget().addAll((Collection) newValue);
- return;
- case TestModel1Package.EXTENDED_NODE__STRING_FEATURE2:
- setStringFeature2((String) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case TestModel1Package.EXTENDED_NODE__BIDI_SOURCE:
- getBidiSource().clear();
- return;
- case TestModel1Package.EXTENDED_NODE__BIDI_TARGET:
- getBidiTarget().clear();
- return;
- case TestModel1Package.EXTENDED_NODE__STRING_FEATURE2:
- setStringFeature2(STRING_FEATURE2_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case TestModel1Package.EXTENDED_NODE__BIDI_SOURCE:
- return bidiSource != null && !bidiSource.isEmpty();
- case TestModel1Package.EXTENDED_NODE__BIDI_TARGET:
- return bidiTarget != null && !bidiTarget.isEmpty();
- case TestModel1Package.EXTENDED_NODE__STRING_FEATURE2:
- return STRING_FEATURE2_EDEFAULT == null ? stringFeature2 != null
- : !STRING_FEATURE2_EDEFAULT.equals(stringFeature2);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (stringFeature2: ");
- result.append(stringFeature2);
- result.append(')');
- return result.toString();
- }
-
-} //ExtendedNodeImpl \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TestModel1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TestModel1FactoryImpl.java
deleted file mode 100644
index de3344d..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TestModel1FactoryImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import testmodel1.*;
-import testmodel1.EmptyNode;
-import testmodel1.EmptyRefNode;
-import testmodel1.ExtendedNode;
-import testmodel1.TestModel1Factory;
-import testmodel1.TestModel1Package;
-import testmodel1.TreeNode;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TestModel1FactoryImpl extends EFactoryImpl implements TestModel1Factory
-{
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static TestModel1Factory init()
- {
- try
- {
- TestModel1Factory theTestModel1Factory = (TestModel1Factory) EPackage.Registry.INSTANCE
- .getEFactory("http://www.eclipse.org/emf/cdo/2006/TestModel1");
- if (theTestModel1Factory != null)
- {
- return theTestModel1Factory;
- }
- }
- catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new TestModel1FactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TestModel1FactoryImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass)
- {
- switch (eClass.getClassifierID())
- {
- case TestModel1Package.TREE_NODE:
- return createTreeNode();
- case TestModel1Package.EXTENDED_NODE:
- return createExtendedNode();
- case TestModel1Package.EMPTY_NODE:
- return createEmptyNode();
- case TestModel1Package.EMPTY_REF_NODE:
- return createEmptyRefNode();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName()
- + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TreeNode createTreeNode()
- {
- TreeNodeImpl treeNode = new TreeNodeImpl();
- return treeNode;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ExtendedNode createExtendedNode()
- {
- ExtendedNodeImpl extendedNode = new ExtendedNodeImpl();
- return extendedNode;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EmptyNode createEmptyNode()
- {
- EmptyNodeImpl emptyNode = new EmptyNodeImpl();
- return emptyNode;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EmptyRefNode createEmptyRefNode()
- {
- EmptyRefNodeImpl emptyRefNode = new EmptyRefNodeImpl();
- return emptyRefNode;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TestModel1Package getTestModel1Package()
- {
- return (TestModel1Package) getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static TestModel1Package getPackage()
- {
- return TestModel1Package.eINSTANCE;
- }
-
-} //TestModel1FactoryImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TestModel1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TestModel1PackageImpl.java
deleted file mode 100644
index 78af6e0..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TestModel1PackageImpl.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1.impl;
-
-
-import org.eclipse.emf.cdo.client.CDOPackage;
-
-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;
-
-import testmodel1.EmptyNode;
-import testmodel1.EmptyRefNode;
-import testmodel1.ExtendedNode;
-import testmodel1.TestModel1Factory;
-import testmodel1.TestModel1Package;
-import testmodel1.TreeNode;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TestModel1PackageImpl extends EPackageImpl implements TestModel1Package
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass treeNodeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass extendedNodeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass emptyNodeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass emptyRefNodeEClass = 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 testmodel1.TestModel1Package#eNS_URI
- * @see #init()
- * @generated
- */
- private TestModel1PackageImpl()
- {
- super(eNS_URI, TestModel1Factory.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 TestModel1Package init()
- {
- if (isInited)
- return (TestModel1Package) EPackage.Registry.INSTANCE.getEPackage(TestModel1Package.eNS_URI);
-
- // Obtain or create and register package
- TestModel1PackageImpl theTestModel1Package = (TestModel1PackageImpl) (EPackage.Registry.INSTANCE
- .getEPackage(eNS_URI) instanceof TestModel1PackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(eNS_URI) : new TestModel1PackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- CDOPackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theTestModel1Package.createPackageContents();
-
- // Initialize created meta-data
- theTestModel1Package.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theTestModel1Package.freeze();
-
- return theTestModel1Package;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getTreeNode()
- {
- return treeNodeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getTreeNode_Parent()
- {
- return (EReference) treeNodeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getTreeNode_Children()
- {
- return (EReference) treeNodeEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getTreeNode_References()
- {
- return (EReference) treeNodeEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getTreeNode_BooleanFeature()
- {
- return (EAttribute) treeNodeEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getTreeNode_IntFeature()
- {
- return (EAttribute) treeNodeEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getTreeNode_StringFeature()
- {
- return (EAttribute) treeNodeEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getExtendedNode()
- {
- return extendedNodeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getExtendedNode_BidiSource()
- {
- return (EReference) extendedNodeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getExtendedNode_BidiTarget()
- {
- return (EReference) extendedNodeEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getExtendedNode_StringFeature2()
- {
- return (EAttribute) extendedNodeEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getEmptyNode()
- {
- return emptyNodeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getEmptyRefNode()
- {
- return emptyRefNodeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEmptyRefNode_MoreReferences()
- {
- return (EReference) emptyRefNodeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TestModel1Factory getTestModel1Factory()
- {
- return (TestModel1Factory) 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
- treeNodeEClass = createEClass(TREE_NODE);
- createEReference(treeNodeEClass, TREE_NODE__PARENT);
- createEReference(treeNodeEClass, TREE_NODE__CHILDREN);
- createEReference(treeNodeEClass, TREE_NODE__REFERENCES);
- createEAttribute(treeNodeEClass, TREE_NODE__BOOLEAN_FEATURE);
- createEAttribute(treeNodeEClass, TREE_NODE__INT_FEATURE);
- createEAttribute(treeNodeEClass, TREE_NODE__STRING_FEATURE);
-
- extendedNodeEClass = createEClass(EXTENDED_NODE);
- createEReference(extendedNodeEClass, EXTENDED_NODE__BIDI_SOURCE);
- createEReference(extendedNodeEClass, EXTENDED_NODE__BIDI_TARGET);
- createEAttribute(extendedNodeEClass, EXTENDED_NODE__STRING_FEATURE2);
-
- emptyNodeEClass = createEClass(EMPTY_NODE);
-
- emptyRefNodeEClass = createEClass(EMPTY_REF_NODE);
- createEReference(emptyRefNodeEClass, EMPTY_REF_NODE__MORE_REFERENCES);
- }
-
- /**
- * <!-- 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
- CDOPackage theCDOPackage = (CDOPackage) EPackage.Registry.INSTANCE
- .getEPackage(CDOPackage.eNS_URI);
-
- // Add supertypes to classes
- treeNodeEClass.getESuperTypes().add(theCDOPackage.getCDOPersistent());
- extendedNodeEClass.getESuperTypes().add(this.getTreeNode());
- emptyNodeEClass.getESuperTypes().add(this.getTreeNode());
- emptyRefNodeEClass.getESuperTypes().add(this.getTreeNode());
-
- // Initialize classes and features; add operations and parameters
- initEClass(treeNodeEClass, TreeNode.class, "TreeNode", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEReference(getTreeNode_Parent(), this.getTreeNode(), this.getTreeNode_Children(), "parent",
- null, 0, 1, TreeNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
- !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getTreeNode_Children(), this.getTreeNode(), this.getTreeNode_Parent(),
- "children", null, 0, -1, TreeNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getTreeNode_References(), this.getTreeNode(), null, "references", null, 0, -1,
- TreeNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
- IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTreeNode_BooleanFeature(), ecorePackage.getEBoolean(), "booleanFeature",
- null, 0, 1, TreeNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTreeNode_IntFeature(), ecorePackage.getEInt(), "intFeature", null, 0, 1,
- TreeNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getTreeNode_StringFeature(), ecorePackage.getEString(), "stringFeature", null,
- 0, 1, TreeNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(extendedNodeEClass, ExtendedNode.class, "ExtendedNode", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEReference(getExtendedNode_BidiSource(), this.getExtendedNode(), this
- .getExtendedNode_BidiTarget(), "bidiSource", null, 0, -1, ExtendedNode.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getExtendedNode_BidiTarget(), this.getExtendedNode(), this
- .getExtendedNode_BidiSource(), "bidiTarget", null, 0, -1, ExtendedNode.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getExtendedNode_StringFeature2(), ecorePackage.getEString(), "stringFeature2",
- null, 0, 1, ExtendedNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(emptyNodeEClass, EmptyNode.class, "EmptyNode", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(emptyRefNodeEClass, EmptyRefNode.class, "EmptyRefNode", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEReference(getEmptyRefNode_MoreReferences(), this.getTreeNode(), null, "moreReferences",
- null, 0, -1, EmptyRefNode.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);
- }
-
-} //TestModel1PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TreeNodeImpl.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TreeNodeImpl.java
deleted file mode 100644
index b5f4a20..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/impl/TreeNodeImpl.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1.impl;
-
-
-import org.eclipse.emf.cdo.client.impl.CDOPersistentImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import testmodel1.TestModel1Package;
-import testmodel1.TreeNode;
-
-import java.util.Collection;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tree Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link testmodel1.impl.TreeNodeImpl#getParent <em>Parent</em>}</li>
- * <li>{@link testmodel1.impl.TreeNodeImpl#getChildren <em>Children</em>}</li>
- * <li>{@link testmodel1.impl.TreeNodeImpl#getReferences <em>References</em>}</li>
- * <li>{@link testmodel1.impl.TreeNodeImpl#isBooleanFeature <em>Boolean Feature</em>}</li>
- * <li>{@link testmodel1.impl.TreeNodeImpl#getIntFeature <em>Int Feature</em>}</li>
- * <li>{@link testmodel1.impl.TreeNodeImpl#getStringFeature <em>String Feature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TreeNodeImpl extends CDOPersistentImpl implements TreeNode
-{
- /**
- * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getChildren()
- * @generated
- * @ordered
- */
- protected EList children = null;
-
- /**
- * The cached value of the '{@link #getReferences() <em>References</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getReferences()
- * @generated
- * @ordered
- */
- protected EList references = null;
-
- /**
- * The default value of the '{@link #isBooleanFeature() <em>Boolean Feature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isBooleanFeature()
- * @generated
- * @ordered
- */
- protected static final boolean BOOLEAN_FEATURE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isBooleanFeature() <em>Boolean Feature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isBooleanFeature()
- * @generated
- * @ordered
- */
- protected boolean booleanFeature = BOOLEAN_FEATURE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getIntFeature() <em>Int Feature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIntFeature()
- * @generated
- * @ordered
- */
- protected static final int INT_FEATURE_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getIntFeature() <em>Int Feature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIntFeature()
- * @generated
- * @ordered
- */
- protected int intFeature = INT_FEATURE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getStringFeature() <em>String Feature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getStringFeature()
- * @generated
- * @ordered
- */
- protected static final String STRING_FEATURE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getStringFeature() <em>String Feature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getStringFeature()
- * @generated
- * @ordered
- */
- protected String stringFeature = STRING_FEATURE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected TreeNodeImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass()
- {
- return TestModel1Package.Literals.TREE_NODE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TreeNode getParent()
- {
- cdoLoad();
- if (eContainerFeatureID != TestModel1Package.TREE_NODE__PARENT) return null;
- return (TreeNode) eContainer();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetParent(TreeNode newParent, NotificationChain msgs)
- {
- cdoLoad();
- msgs = eBasicSetContainer((InternalEObject) newParent, TestModel1Package.TREE_NODE__PARENT,
- msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParent(TreeNode newParent)
- {
-
- if (newParent != eInternalContainer()
- || (eContainerFeatureID != TestModel1Package.TREE_NODE__PARENT && newParent != null))
- {
- if (EcoreUtil.isAncestor(this, newParent))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eInternalContainer() != null) msgs = eBasicRemoveFromContainer(msgs);
- if (newParent != null)
- msgs = ((InternalEObject) newParent).eInverseAdd(this,
- TestModel1Package.TREE_NODE__CHILDREN, TreeNode.class, msgs);
- msgs = basicSetParent(newParent, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TestModel1Package.TREE_NODE__PARENT,
- newParent, newParent));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getChildren()
- {
- cdoLoad();
- if (children == null)
- {
- children = new EObjectContainmentWithInverseEList(TreeNode.class, this,
- TestModel1Package.TREE_NODE__CHILDREN, TestModel1Package.TREE_NODE__PARENT);
- }
- return children;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getReferences()
- {
- cdoLoad();
- if (references == null)
- {
- references = new EObjectResolvingEList(TreeNode.class, this,
- TestModel1Package.TREE_NODE__REFERENCES);
- }
- return references;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isBooleanFeature()
- {
- cdoLoad();
- return booleanFeature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setBooleanFeature(boolean newBooleanFeature)
- {
- cdoLoad();
- boolean oldBooleanFeature = booleanFeature;
- booleanFeature = newBooleanFeature;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- TestModel1Package.TREE_NODE__BOOLEAN_FEATURE, oldBooleanFeature, booleanFeature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getIntFeature()
- {
- cdoLoad();
- return intFeature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIntFeature(int newIntFeature)
- {
- cdoLoad();
- int oldIntFeature = intFeature;
- intFeature = newIntFeature;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- TestModel1Package.TREE_NODE__INT_FEATURE, oldIntFeature, intFeature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getStringFeature()
- {
- cdoLoad();
- return stringFeature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setStringFeature(String newStringFeature)
- {
- cdoLoad();
- String oldStringFeature = stringFeature;
- stringFeature = newStringFeature;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- TestModel1Package.TREE_NODE__STRING_FEATURE, oldStringFeature, stringFeature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID,
- NotificationChain msgs)
- {
- switch (featureID)
- {
- case TestModel1Package.TREE_NODE__PARENT:
- if (eInternalContainer() != null) msgs = eBasicRemoveFromContainer(msgs);
- return basicSetParent((TreeNode) otherEnd, msgs);
- case TestModel1Package.TREE_NODE__CHILDREN:
- return ((InternalEList) getChildren()).basicAdd(otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
- NotificationChain msgs)
- {
- switch (featureID)
- {
- case TestModel1Package.TREE_NODE__PARENT:
- return basicSetParent(null, msgs);
- case TestModel1Package.TREE_NODE__CHILDREN:
- return ((InternalEList) getChildren()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
- {
- switch (eContainerFeatureID)
- {
- case TestModel1Package.TREE_NODE__PARENT:
- return eInternalContainer().eInverseRemove(this, TestModel1Package.TREE_NODE__CHILDREN,
- TreeNode.class, msgs);
- }
- return super.eBasicRemoveFromContainerFeature(msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case TestModel1Package.TREE_NODE__PARENT:
- return getParent();
- case TestModel1Package.TREE_NODE__CHILDREN:
- return getChildren();
- case TestModel1Package.TREE_NODE__REFERENCES:
- return getReferences();
- case TestModel1Package.TREE_NODE__BOOLEAN_FEATURE:
- return isBooleanFeature() ? Boolean.TRUE : Boolean.FALSE;
- case TestModel1Package.TREE_NODE__INT_FEATURE:
- return new Integer(getIntFeature());
- case TestModel1Package.TREE_NODE__STRING_FEATURE:
- return getStringFeature();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case TestModel1Package.TREE_NODE__PARENT:
- setParent((TreeNode) newValue);
- return;
- case TestModel1Package.TREE_NODE__CHILDREN:
- getChildren().clear();
- getChildren().addAll((Collection) newValue);
- return;
- case TestModel1Package.TREE_NODE__REFERENCES:
- getReferences().clear();
- getReferences().addAll((Collection) newValue);
- return;
- case TestModel1Package.TREE_NODE__BOOLEAN_FEATURE:
- setBooleanFeature(((Boolean) newValue).booleanValue());
- return;
- case TestModel1Package.TREE_NODE__INT_FEATURE:
- setIntFeature(((Integer) newValue).intValue());
- return;
- case TestModel1Package.TREE_NODE__STRING_FEATURE:
- setStringFeature((String) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case TestModel1Package.TREE_NODE__PARENT:
- setParent((TreeNode) null);
- return;
- case TestModel1Package.TREE_NODE__CHILDREN:
- getChildren().clear();
- return;
- case TestModel1Package.TREE_NODE__REFERENCES:
- getReferences().clear();
- return;
- case TestModel1Package.TREE_NODE__BOOLEAN_FEATURE:
- setBooleanFeature(BOOLEAN_FEATURE_EDEFAULT);
- return;
- case TestModel1Package.TREE_NODE__INT_FEATURE:
- setIntFeature(INT_FEATURE_EDEFAULT);
- return;
- case TestModel1Package.TREE_NODE__STRING_FEATURE:
- setStringFeature(STRING_FEATURE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case TestModel1Package.TREE_NODE__PARENT:
- return getParent() != null;
- case TestModel1Package.TREE_NODE__CHILDREN:
- return children != null && !children.isEmpty();
- case TestModel1Package.TREE_NODE__REFERENCES:
- return references != null && !references.isEmpty();
- case TestModel1Package.TREE_NODE__BOOLEAN_FEATURE:
- return booleanFeature != BOOLEAN_FEATURE_EDEFAULT;
- case TestModel1Package.TREE_NODE__INT_FEATURE:
- return intFeature != INT_FEATURE_EDEFAULT;
- case TestModel1Package.TREE_NODE__STRING_FEATURE:
- return STRING_FEATURE_EDEFAULT == null ? stringFeature != null : !STRING_FEATURE_EDEFAULT
- .equals(stringFeature);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (booleanFeature: ");
- result.append(booleanFeature);
- result.append(", intFeature: ");
- result.append(intFeature);
- result.append(", stringFeature: ");
- result.append(stringFeature);
- result.append(')');
- return result.toString();
- }
-
-} //TreeNodeImpl \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/util/TestModel1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/util/TestModel1AdapterFactory.java
deleted file mode 100644
index 6e1acc7..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/util/TestModel1AdapterFactory.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1.util;
-
-
-import org.eclipse.emf.cdo.client.CDOPersistable;
-import org.eclipse.emf.cdo.client.CDOPersistent;
-
-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;
-
-import testmodel1.*;
-import testmodel1.EmptyNode;
-import testmodel1.EmptyRefNode;
-import testmodel1.ExtendedNode;
-import testmodel1.TestModel1Package;
-import testmodel1.TreeNode;
-
-
-/**
- * <!-- 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 testmodel1.TestModel1Package
- * @generated
- */
-public class TestModel1AdapterFactory extends AdapterFactoryImpl
-{
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static TestModel1Package modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TestModel1AdapterFactory()
- {
- if (modelPackage == null)
- {
- modelPackage = TestModel1Package.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
- */
- public boolean isFactoryForType(Object object)
- {
- if (object == modelPackage)
- {
- return true;
- }
- if (object instanceof EObject)
- {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected TestModel1Switch modelSwitch = new TestModel1Switch()
- {
- public Object caseTreeNode(TreeNode object)
- {
- return createTreeNodeAdapter();
- }
-
- public Object caseExtendedNode(ExtendedNode object)
- {
- return createExtendedNodeAdapter();
- }
-
- public Object caseEmptyNode(EmptyNode object)
- {
- return createEmptyNodeAdapter();
- }
-
- public Object caseEmptyRefNode(EmptyRefNode object)
- {
- return createEmptyRefNodeAdapter();
- }
-
- public Object caseCDOPersistable(CDOPersistable object)
- {
- return createCDOPersistableAdapter();
- }
-
- public Object caseCDOPersistent(CDOPersistent object)
- {
- return createCDOPersistentAdapter();
- }
-
- public Object 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
- */
- public Adapter createAdapter(Notifier target)
- {
- return (Adapter) modelSwitch.doSwitch((EObject) target);
- }
-
- /**
- * Creates a new adapter for an object of class '{@link testmodel1.TreeNode <em>Tree Node</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 testmodel1.TreeNode
- * @generated
- */
- public Adapter createTreeNodeAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link testmodel1.ExtendedNode <em>Extended Node</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 testmodel1.ExtendedNode
- * @generated
- */
- public Adapter createExtendedNodeAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link testmodel1.EmptyNode <em>Empty Node</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 testmodel1.EmptyNode
- * @generated
- */
- public Adapter createEmptyNodeAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link testmodel1.EmptyRefNode <em>Empty Ref Node</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 testmodel1.EmptyRefNode
- * @generated
- */
- public Adapter createEmptyRefNodeAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.client.CDOPersistable <em>Persistable</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.client.CDOPersistable
- * @generated
- */
- public Adapter createCDOPersistableAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.client.CDOPersistent <em>Persistent</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.client.CDOPersistent
- * @generated
- */
- public Adapter createCDOPersistentAdapter()
- {
- 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;
- }
-
-} //TestModel1AdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/util/TestModel1Switch.java b/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/util/TestModel1Switch.java
deleted file mode 100644
index dd9f06d..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/testmodel1/util/TestModel1Switch.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package testmodel1.util;
-
-
-import org.eclipse.emf.cdo.client.CDOPersistable;
-import org.eclipse.emf.cdo.client.CDOPersistent;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import testmodel1.*;
-import testmodel1.EmptyNode;
-import testmodel1.EmptyRefNode;
-import testmodel1.ExtendedNode;
-import testmodel1.TestModel1Package;
-import testmodel1.TreeNode;
-
-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 testmodel1.TestModel1Package
- * @generated
- */
-public class TestModel1Switch
-{
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static TestModel1Package modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TestModel1Switch()
- {
- if (modelPackage == null)
- {
- modelPackage = TestModel1Package.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 Object 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 Object doSwitch(EClass theEClass, EObject theEObject)
- {
- if (theEClass.eContainer() == modelPackage)
- {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else
- {
- List eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(
- (EClass) 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 Object doSwitch(int classifierID, EObject theEObject)
- {
- switch (classifierID)
- {
- case TestModel1Package.TREE_NODE:
- {
- TreeNode treeNode = (TreeNode) theEObject;
- Object result = caseTreeNode(treeNode);
- if (result == null) result = caseCDOPersistent(treeNode);
- if (result == null) result = caseCDOPersistable(treeNode);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case TestModel1Package.EXTENDED_NODE:
- {
- ExtendedNode extendedNode = (ExtendedNode) theEObject;
- Object result = caseExtendedNode(extendedNode);
- if (result == null) result = caseTreeNode(extendedNode);
- if (result == null) result = caseCDOPersistent(extendedNode);
- if (result == null) result = caseCDOPersistable(extendedNode);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case TestModel1Package.EMPTY_NODE:
- {
- EmptyNode emptyNode = (EmptyNode) theEObject;
- Object result = caseEmptyNode(emptyNode);
- if (result == null) result = caseTreeNode(emptyNode);
- if (result == null) result = caseCDOPersistent(emptyNode);
- if (result == null) result = caseCDOPersistable(emptyNode);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case TestModel1Package.EMPTY_REF_NODE:
- {
- EmptyRefNode emptyRefNode = (EmptyRefNode) theEObject;
- Object result = caseEmptyRefNode(emptyRefNode);
- if (result == null) result = caseTreeNode(emptyRefNode);
- if (result == null) result = caseCDOPersistent(emptyRefNode);
- if (result == null) result = caseCDOPersistable(emptyRefNode);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default:
- return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Tree Node</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 interpretting the object as an instance of '<em>Tree Node</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseTreeNode(TreeNode object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Extended Node</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 interpretting the object as an instance of '<em>Extended Node</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseExtendedNode(ExtendedNode object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Empty Node</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 interpretting the object as an instance of '<em>Empty Node</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEmptyNode(EmptyNode object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Empty Ref Node</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 interpretting the object as an instance of '<em>Empty Ref Node</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEmptyRefNode(EmptyRefNode object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Persistable</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 interpretting the object as an instance of '<em>Persistable</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseCDOPersistable(CDOPersistable object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Persistent</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 interpretting the object as an instance of '<em>Persistent</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseCDOPersistent(CDOPersistent object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpretting 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 interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object)
- {
- return null;
- }
-
-} //TestModel1Switch
diff --git a/plugins/org.eclipse.emf.cdo.tests/test.xml b/plugins/org.eclipse.emf.cdo.tests/test.xml
deleted file mode 100644
index a187992..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/test.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-/**
- * <copyright>
- *
- * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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>
- *
- * $Id$
- */
--->
-
-<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.emf.cdo.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">
- <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="emft-folder" value="${eclipse-home}/emf_folder"/>
- <delete dir="${emft-folder}" quiet="true"/>
- <property name="core.test.vmargs" value="-DJ2SE-1.5=${bootclasspath} -Djava15-home=${java.home}"/>
-
- <echo message="About to run core-test:"/>
- <echo message="library-file = ${library-file}"/>
- <echo message="eclipse-home = ${eclipse-home}"/>
- <echo message="data-dir = ${emft-folder}"/>
- <echo message="plugin-name = ${plugin-name}"/>
- <echo message="classname = org.eclipse.emf.cdo.tests.AllSuites"/>
- <echo message="vmargs = ${core.test.vmargs}"/>
-
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}" >
- <property name="data-dir" value="${emft-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.emf.cdo.tests.AllSuites"/>
- <property name="vmargs" value="${core.test.vmargs}"/>
- </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>