[458349] Consolidate UI

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349

25 files changed, 0 insertions, 2499 deletions

diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.classpath b/plugins/org.eclipse.emf.cdo.workspace.efs/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.options b/plugins/org.eclipse.emf.cdo.workspace.efs/.options
deleted file mode 100644
index a2b494f3b4..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debugging and tracing options
-
-org.eclipse.emf.cdo.workspace.efs/debug = true
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.project b/plugins/org.eclipse.emf.cdo.workspace.efs/.project
deleted file mode 100644
index 2d6269200f..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.cdo.workspace.efs</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index fcc1d22a85..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jul 04 13:01:47 CEST 2011
-eclipse.preferences.version=1
-
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 48aafaf7ea..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,381 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=2
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 72f4c75fe8..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,119 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=false
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_EMFT
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_EMFT
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=org.eclipse.emf.cdo;org.eclipse.emf.internal.cdo;org.eclipse.net4j;org.eclipse.internal.net4j;org.eclipse.emf;org.eclipse;com;org;javax;java;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2004-2014 Eike Stepper (Berlin, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n *    Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 864e30fe5d..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index b050639a54..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 2f50f36c0c..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-commit.comment.template=[${task.id}] ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 48cfdcfead..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Sun Jul 18 08:53:50 CEST 2010
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
-MISSING_EE_DESCRIPTIONS=Warning
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Ignore
-automatically_removed_unused_problem_filters=Disabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fe01bb701d..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,31 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.build.bin.includes=1
-compilers.p.build.java.compliance=1
-compilers.p.build.missing.output=2
-compilers.p.build.output.library=1
-compilers.p.build.source.library=1
-compilers.p.build.src.includes=1
-compilers.p.deprecated=2
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=1
-compilers.p.missing-version-export-package=1
-compilers.p.missing-version-import-package=1
-compilers.p.missing-version-require-bundle=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.workspace.efs/META-INF/MANIFEST.MF
deleted file mode 100644
index ddb37bfde2..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.emf.cdo.workspace.efs;singleton:=true
-Bundle-Version: 4.0.200.qualifier
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.cdo.location;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.workspace;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Import-Package: org.h2;version="[1.0.0,2.0.0)",
- org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.workspace.efs;version="4.0.200",
- org.eclipse.emf.cdo.workspace.internal.efs;version="4.0.200";x-friends:="org.eclipse.emf.cdo.ui.workspace",
- org.eclipse.emf.cdo.workspace.internal.efs.bundle;version="4.0.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/about.html b/plugins/org.eclipse.emf.cdo.workspace.efs/about.html
deleted file mode 100644
index d35d5aed64..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/build.properties b/plugins/org.eclipse.emf.cdo.workspace.efs/build.properties
deleted file mode 100644
index 0d6a72857d..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2010, 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml
-src.includes = about.html
-
-doc.project = org.eclipse.emf.cdo.doc
-
-generateSourceReferences = true
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/plugin.properties b/plugins/org.eclipse.emf.cdo.workspace.efs/plugin.properties
deleted file mode 100644
index 238601f7b5..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Eike Stepper - initial API and implementation
-
-pluginName = CDO Model Repository Client Workspace EFS
-providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/plugin.xml b/plugins/org.eclipse.emf.cdo.workspace.efs/plugin.xml
deleted file mode 100644
index e8ac4ef176..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
-	Copyright (c) 2010, 2012 Eike Stepper (Berlin, Germany) and others.
-	All rights reserved. This program and the accompanying materials
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-
-	Contributors:
-	  Eike Stepper - initial API and implementation
--->
-
-<plugin>
-
-   <extension
-         id="org.eclipse.core.filesystem.cdo.workspace"
-         point="org.eclipse.core.filesystem.filesystems">
-      <filesystem scheme="cdo.workspace">
-         <run class="org.eclipse.emf.cdo.workspace.internal.efs.CDOWorkspaceFileSystem"/>
-      </filesystem>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java
deleted file mode 100644
index a2a8939167..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/CDOFS.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.workspace.efs;
-
-import org.eclipse.emf.cdo.location.ICheckoutSource;
-import org.eclipse.emf.cdo.location.IRepositoryLocation;
-import org.eclipse.emf.cdo.location.IRepositoryLocationManager;
-import org.eclipse.emf.cdo.server.db.CDODBUtil;
-import org.eclipse.emf.cdo.server.db.IDBStore;
-import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy;
-import org.eclipse.emf.cdo.workspace.CDOWorkspace;
-import org.eclipse.emf.cdo.workspace.CDOWorkspaceBase;
-import org.eclipse.emf.cdo.workspace.CDOWorkspaceConfiguration;
-import org.eclipse.emf.cdo.workspace.CDOWorkspaceUtil;
-import org.eclipse.emf.cdo.workspace.internal.efs.CDOWorkspaceFileSystem;
-import org.eclipse.emf.cdo.workspace.internal.efs.CDOWorkspaceStore;
-
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.IDBConnectionProvider;
-import org.eclipse.net4j.db.h2.H2Adapter;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.h2.jdbcx.JdbcDataSource;
-
-import javax.sql.DataSource;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URI;
-
-/**
- * This class is the main entry point to the {@link org.eclipse.core.filesystem.EFS Eclipse File System (EFS)} implementation
- * for CDO {@link org.eclipse.emf.cdo.workspace.CDOWorkspace workspaces}.
- * @author Eike Stepper
- */
-public final class CDOFS
-{
-  private CDOFS()
-  {
-  }
-
-  public static CDOWorkspace open(String projectName, File projectFolder) throws Exception
-  {
-    IDBStore local = createLocalStore(projectFolder);
-    CDOWorkspaceBase base = createWorkspaceBase(new File(projectFolder, "base"));
-    IRepositoryLocation remote = readRepositoryLocation(projectFolder);
-
-    CDOWorkspaceConfiguration config = CDOWorkspaceUtil.createWorkspaceConfiguration();
-    config.setStore(local);
-    config.setBase(base);
-    config.setRemote(remote);
-
-    CDOWorkspace workspace = config.open();
-    return workspace;
-  }
-
-  public static void checkout(ICheckoutSource checkoutSource, String projectName, IProgressMonitor monitor)
-      throws Exception
-  {
-    IWorkspace workspace = ResourcesPlugin.getWorkspace();
-    IWorkspaceRoot root = workspace.getRoot();
-    IProject project = root.getProject(projectName);
-    if (project.exists())
-    {
-      throw new IOException("Project " + projectName + " already exists");
-    }
-
-    File projectFolder = root.getLocation().append(projectName).toFile();
-    URI uri = checkout(checkoutSource, projectName, projectFolder);
-
-    IProjectDescription description = workspace.newProjectDescription(projectName);
-    description.setLocationURI(uri);
-
-    project.create(description, new NullProgressMonitor());
-    if (!project.isOpen())
-    {
-      project.open(new NullProgressMonitor());
-    }
-  }
-
-  private static URI checkout(ICheckoutSource checkoutSource, String projectName, File projectFolder) throws Exception
-  {
-    IDBStore local = createLocalStore(projectFolder);
-    CDOWorkspaceBase base = createWorkspaceBase(new File(projectFolder, "base"));
-
-    IRepositoryLocation remote = checkoutSource.getRepositoryLocation();
-    writeRepositoryLocation(projectFolder, remote);
-
-    String branchPath = checkoutSource.getBranchPath();
-    long timeStamp = checkoutSource.getTimeStamp();
-
-    CDOWorkspaceConfiguration config = CDOWorkspaceUtil.createWorkspaceConfiguration();
-    config.setStore(local);
-    config.setBase(base);
-    config.setRemote(remote);
-    config.setBranchPath(branchPath);
-    config.setTimeStamp(timeStamp);
-
-    CDOWorkspace workspace = config.checkout();
-    CDOWorkspaceStore store = getFileSystem().addWorkspaceStore(projectName, workspace);
-    return store.toURI();
-  }
-
-  private static CDOWorkspaceFileSystem getFileSystem() throws CoreException
-  {
-    return (CDOWorkspaceFileSystem)EFS.getFileSystem(CDOWorkspaceFileSystem.SCHEME);
-  }
-
-  private static IDBStore createLocalStore(File projectFolder)
-  {
-    DataSource dataSource = createLocalDataSource(new File(projectFolder, "local"));
-
-    IMappingStrategy mappingStrategy = CDODBUtil.createHorizontalMappingStrategy(false);
-    IDBAdapter dbAdapter = createLocalAdapter();
-    IDBConnectionProvider dbConnectionProvider = dbAdapter.createConnectionProvider(dataSource);
-
-    return CDODBUtil.createStore(mappingStrategy, dbAdapter, dbConnectionProvider);
-  }
-
-  private static IDBAdapter createLocalAdapter()
-  {
-    return new H2Adapter();
-  }
-
-  private static DataSource createLocalDataSource(File folder)
-  {
-    folder.mkdirs();
-    String path = folder.getAbsolutePath().replace('\\', '/');
-
-    JdbcDataSource dataSource = new JdbcDataSource();
-    dataSource.setURL("jdbc:h2:" + path + "/db");
-    return dataSource;
-  }
-
-  private static CDOWorkspaceBase createWorkspaceBase(File folder)
-  {
-    folder.mkdirs();
-    return CDOWorkspaceUtil.createFolderWorkspaceBase(folder);
-  }
-
-  private static File getRemotePropertiesFile(File projectFolder)
-  {
-    return new File(projectFolder, "remote.properties");
-  }
-
-  private static void writeRepositoryLocation(File projectFolder, IRepositoryLocation remote) throws IOException
-  {
-    FileOutputStream out = null;
-
-    try
-    {
-      out = new FileOutputStream(getRemotePropertiesFile(projectFolder));
-      remote.write(out);
-    }
-    finally
-    {
-      IOUtil.close(out);
-    }
-  }
-
-  private static IRepositoryLocation readRepositoryLocation(File projectFolder) throws IOException
-  {
-    FileInputStream in = null;
-
-    try
-    {
-      in = new FileInputStream(getRemotePropertiesFile(projectFolder));
-      return IRepositoryLocationManager.INSTANCE.addRepositoryLocation(in);
-    }
-    finally
-    {
-      IOUtil.close(in);
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/package-info.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/package-info.java
deleted file mode 100644
index 0753eead2d..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/efs/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-
-/**
- * Concepts to deal with the {@link org.eclipse.core.filesystem.EFS Eclipse File System (EFS)} implementation
- * for CDO {@link org.eclipse.emf.cdo.workspace.CDOWorkspace workspaces}
- */
-package org.eclipse.emf.cdo.workspace.efs;
-
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/AbstractFileStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/AbstractFileStore.java
deleted file mode 100644
index dc9ff147f6..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/AbstractFileStore.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.workspace.internal.efs;
-
-import org.eclipse.net4j.util.WrappedException;
-
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.provider.FileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractFileStore extends FileStore
-{
-  public AbstractFileStore()
-  {
-  }
-
-  @Override
-  public CDOWorkspaceFileSystem getFileSystem()
-  {
-    return CDOWorkspaceFileSystem.getInstance();
-  }
-
-  @Override
-  public URI toURI()
-  {
-    try
-    {
-      return new URI(getParent().toURI().toString() + "/" + getName());
-    }
-    catch (URISyntaxException ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Invalid extends AbstractFileStore
-  {
-    private IFileStore parent;
-
-    private String name;
-
-    public Invalid(IFileStore parent, String name)
-    {
-      this.parent = parent;
-      this.name = name;
-    }
-
-    @Override
-    public IFileStore getParent()
-    {
-      return parent;
-    }
-
-    @Override
-    public String getName()
-    {
-      return name;
-    }
-
-    @Override
-    public String[] childNames(int options, IProgressMonitor monitor) throws CoreException
-    {
-      return CDOWorkspaceFileSystem.NO_CHILD_NAMES;
-    }
-
-    @Override
-    public IFileStore getChild(String name)
-    {
-      return new Invalid(this, name);
-    }
-
-    @Override
-    public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public InputStream openInputStream(int options, IProgressMonitor monitor) throws CoreException
-    {
-      throw new UnsupportedOperationException();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/AbstractResourceNodeStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/AbstractResourceNodeStore.java
deleted file mode 100644
index 7cc6c71e5a..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/AbstractResourceNodeStore.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.workspace.internal.efs;
-
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-import org.eclipse.emf.cdo.util.CommitException;
-import org.eclipse.emf.cdo.view.CDOView;
-import org.eclipse.emf.cdo.workspace.CDOWorkspace;
-
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.provider.FileInfo;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public abstract class AbstractResourceNodeStore extends AbstractFileStore
-{
-  private CDOID resourceNodeID;
-
-  public AbstractResourceNodeStore()
-  {
-  }
-
-  @Override
-  public String[] childNames(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return new ResourceNodeRunnable<String[]>()
-    {
-      @Override
-      protected String[] run(CDOResourceNode node)
-      {
-        List<String> childNames = new ArrayList<String>();
-        collectChildNames(node, childNames);
-        return childNames.toArray(new String[childNames.size()]);
-      }
-    }.run();
-  }
-
-  @Override
-  public IFileStore getChild(String name)
-  {
-    return new CDOResourceNodeStore(getWorkspaceStore(), this, name);
-  }
-
-  @Override
-  public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return new ResourceNodeRunnable<IFileInfo>()
-    {
-      @Override
-      protected IFileInfo run(CDOResourceNode node)
-      {
-        long lastModified = EFS.NONE;
-        boolean exists = node != null;
-        boolean directory = exists && isDirectory(node);
-        if (!directory)
-        {
-          lastModified = getWorkspaceStore().getLastModified(getPath());
-        }
-
-        FileInfo info = new FileInfo(getName());
-        info.setLastModified(lastModified);
-        info.setExists(exists);
-        info.setDirectory(directory);
-        info.setLength(EFS.NONE);
-        info.setAttribute(EFS.ATTRIBUTE_READ_ONLY, false);
-        info.setAttribute(EFS.ATTRIBUTE_HIDDEN, false);
-        return info;
-      }
-    }.run();
-  }
-
-  public abstract CDOWorkspaceStore getWorkspaceStore();
-
-  @Override
-  public abstract AbstractResourceNodeStore getParent();
-
-  public abstract String getPath();
-
-  protected CDOView getView()
-  {
-    return getWorkspaceStore().getView();
-  }
-
-  protected abstract CDOResourceNode getResourceNode(CDOView view);
-
-  protected abstract boolean isDirectory(CDOResourceNode node);
-
-  protected abstract void collectChildNames(CDOResourceNode node, List<String> childNames);
-
-  /**
-   * @author Eike Stepper
-   */
-  protected abstract class ResourceNodeRunnable<RESULT>
-  {
-    public ResourceNodeRunnable()
-    {
-    }
-
-    public RESULT run()
-    {
-      return run(false);
-    }
-
-    public RESULT run(boolean transactional)
-    {
-      CDOView view = null;
-
-      try
-      {
-        view = openView(transactional);
-        RESULT result = run(view);
-        if (transactional)
-        {
-          CDOTransaction transaction = (CDOTransaction)view;
-          transaction.commit();
-        }
-
-        return result;
-      }
-      catch (CommitException ex)
-      {
-        throw WrappedException.wrap(ex);
-      }
-      finally
-      {
-        if (transactional)
-        {
-          IOUtil.close(view);
-        }
-      }
-    }
-
-    protected RESULT run(CDOView view)
-    {
-      CDOResourceNode node = getResourceNode(view);
-      RESULT result = run(node);
-      return result;
-    }
-
-    protected RESULT run(CDOResourceNode node)
-    {
-      return null;
-    }
-
-    private CDOView openView(boolean transactional)
-    {
-      CDOWorkspace workspace = getWorkspaceStore().getWorkspace();
-      return transactional ? workspace.openTransaction() : getView();
-    }
-
-    private CDOResourceNode getResourceNode(CDOView view)
-    {
-      CDOResourceNode node = null;
-
-      try
-      {
-        if (resourceNodeID == null)
-        {
-          node = AbstractResourceNodeStore.this.getResourceNode(view);
-          resourceNodeID = node.cdoID();
-        }
-        else
-        {
-          node = (CDOResourceNode)view.getObject(resourceNodeID);
-        }
-      }
-      catch (Exception ex)
-      {
-        //$FALL-THROUGH$
-      }
-
-      return node;
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOProjectDescriptionStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOProjectDescriptionStore.java
deleted file mode 100644
index bab2ac6f93..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOProjectDescriptionStore.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.workspace.internal.efs;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * @author Eike Stepper
- */
-public final class CDOProjectDescriptionStore extends AbstractFileStore
-{
-  public static final String DESCRIPTION_FILE_NAME = ".project";
-
-  private CDOWorkspaceStore workspaceStore;
-
-  public CDOProjectDescriptionStore(CDOWorkspaceStore workspaceStore)
-  {
-    this.workspaceStore = workspaceStore;
-  }
-
-  public CDOWorkspaceStore getWorkspaceStore()
-  {
-    return workspaceStore;
-  }
-
-  @Override
-  public IFileStore getParent()
-  {
-    return workspaceStore;
-  }
-
-  @Override
-  public String getName()
-  {
-    return DESCRIPTION_FILE_NAME;
-  }
-
-  @Override
-  public String[] childNames(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return CDOWorkspaceFileSystem.NO_CHILD_NAMES;
-  }
-
-  @Override
-  public IFileStore getChild(String name)
-  {
-    return new AbstractFileStore.Invalid(this, name);
-  }
-
-  @Override
-  public void copy(IFileStore destination, int options, IProgressMonitor monitor) throws CoreException
-  {
-    getLocalFile().copy(destination, options, monitor);
-  }
-
-  @Override
-  public void delete(int options, IProgressMonitor monitor) throws CoreException
-  {
-    getLocalFile().delete(options, monitor);
-  }
-
-  @Override
-  public IFileInfo fetchInfo()
-  {
-    return getLocalFile().fetchInfo();
-  }
-
-  @Override
-  public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return getLocalFile().fetchInfo(options, monitor);
-  }
-
-  @Override
-  public IFileStore getFileStore(IPath path)
-  {
-    return getLocalFile().getFileStore(path);
-  }
-
-  @Override
-  public boolean isParentOf(IFileStore other)
-  {
-    return getLocalFile().isParentOf(other);
-  }
-
-  @Override
-  public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return getLocalFile().mkdir(options, monitor);
-  }
-
-  @Override
-  public void move(IFileStore destination, int options, IProgressMonitor monitor) throws CoreException
-  {
-    getLocalFile().move(destination, options, monitor);
-  }
-
-  @Override
-  public InputStream openInputStream(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return getLocalFile().openInputStream(options, monitor);
-  }
-
-  @Override
-  public OutputStream openOutputStream(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return getLocalFile().openOutputStream(options, monitor);
-  }
-
-  @Override
-  public void putInfo(IFileInfo info, int options, IProgressMonitor monitor) throws CoreException
-  {
-    getLocalFile().putInfo(info, options, monitor);
-  }
-
-  @Override
-  public File toLocalFile(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return getLocalFile().toLocalFile(options, monitor);
-  }
-
-  private IFileStore getLocalFile()
-  {
-    File file = new File(workspaceStore.getLocation(), DESCRIPTION_FILE_NAME);
-    return EFS.getLocalFileSystem().fromLocalFile(file);
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java
deleted file mode 100644
index 94428be7f8..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.workspace.internal.efs;
-
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
-import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-import org.eclipse.emf.cdo.view.CDOView;
-import org.eclipse.emf.cdo.workspace.internal.efs.CDOWorkspaceStore.SaveContext;
-import org.eclipse.emf.cdo.workspace.internal.efs.bundle.OM;
-
-import org.eclipse.net4j.util.WrappedException;
-
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-
-/**
- * @author Eike Stepper
- */
-public final class CDOResourceNodeStore extends AbstractResourceNodeStore
-{
-  private CDOWorkspaceStore workspaceStore;
-
-  private AbstractResourceNodeStore parent;
-
-  private String name;
-
-  public CDOResourceNodeStore(CDOWorkspaceStore workspaceStore, AbstractResourceNodeStore parent, String name)
-  {
-    this.workspaceStore = workspaceStore;
-    this.parent = parent;
-    this.name = name;
-  }
-
-  @Override
-  public AbstractResourceNodeStore getParent()
-  {
-    return parent;
-  }
-
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
-  @Override
-  public String getPath()
-  {
-    return parent.getPath() + "/" + name;
-  }
-
-  @Override
-  public InputStream openInputStream(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return new ResourceNodeRunnable<InputStream>()
-    {
-      @Override
-      protected InputStream run(CDOResourceNode node)
-      {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        CDOResource resource = (CDOResource)node;
-
-        try
-        {
-          resource.save(baos, null);
-        }
-        catch (Exception ex)
-        {
-          OM.LOG.error(ex);
-          throw WrappedException.wrap(ex);
-        }
-
-        return new ByteArrayInputStream(baos.toByteArray());
-      }
-    }.run();
-  }
-
-  @Override
-  public OutputStream openOutputStream(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return new ByteArrayOutputStream()
-    {
-      @Override
-      public void close() throws IOException
-      {
-        byte[] bytes = toByteArray();
-        InputStream in = new ByteArrayInputStream(bytes);
-
-        XMIResource xmiResource = new XMIResourceImpl();
-        xmiResource.load(in, null);
-
-        String path = getPath();
-        getWorkspaceStore().setLastModified(path, System.currentTimeMillis());
-
-        SaveContext saveContext = getWorkspaceStore().getSaveContext();
-        saveContext.save(xmiResource, path);
-      }
-    };
-  }
-
-  @Override
-  public void delete(int options, IProgressMonitor monitor) throws CoreException
-  {
-    // Options can only contain EFS.NONE
-    new ResourceNodeRunnable<Boolean>()
-    {
-      @Override
-      protected Boolean run(CDOResourceNode node)
-      {
-        try
-        {
-          node.delete(null);
-          return true;
-        }
-        catch (IOException ex)
-        {
-          throw WrappedException.wrap(ex);
-        }
-      }
-    }.run(true);
-  }
-
-  @Override
-  public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException
-  {
-    // TODO Respect the SHALLOW option
-    new ResourceNodeRunnable<CDOResourceFolder>()
-    {
-      @Override
-      protected CDOResourceFolder run(CDOView view)
-      {
-        String path = getPath();
-        return ((CDOTransaction)view).getOrCreateResourceFolder(path);
-      }
-    }.run(true);
-
-    return this;
-  }
-
-  @Override
-  public CDOWorkspaceStore getWorkspaceStore()
-  {
-    return workspaceStore;
-  }
-
-  @Override
-  protected CDOResourceNode getResourceNode(CDOView view)
-  {
-    return view.getResourceNode(getPath());
-  }
-
-  @Override
-  protected boolean isDirectory(CDOResourceNode node)
-  {
-    return node instanceof CDOResourceFolder;
-  }
-
-  @Override
-  protected void collectChildNames(CDOResourceNode node, List<String> childNames)
-  {
-    if (node instanceof CDOResourceFolder)
-    {
-      CDOResourceFolder folder = (CDOResourceFolder)node;
-
-      for (CDOResourceNode child : folder.getNodes())
-      {
-        childNames.add(child.getName());
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceFileSystem.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceFileSystem.java
deleted file mode 100644
index 5cd6146361..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceFileSystem.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.workspace.internal.efs;
-
-import org.eclipse.emf.cdo.workspace.CDOWorkspace;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.provider.FileSystem;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-
-import java.io.File;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-/**
- * @author Eike Stepper
- */
-public class CDOWorkspaceFileSystem extends FileSystem implements IResourceChangeListener
-{
-  public static final String SCHEME = "cdo.workspace";
-
-  public static final String[] NO_CHILD_NAMES = {};
-
-  private static CDOWorkspaceFileSystem instance;
-
-  /**
-   * Maps {@link IProject} name to {@link IFileStore}.
-   */
-  private Map<String, CDOWorkspaceStore> workspaceStores = new HashMap<String, CDOWorkspaceStore>();
-
-  /**
-   * <code>true</code> if this {@link CDOWorkspaceFileSystem} is registered as an {@link IResourceChangeListener} with
-   * the {@link IWorkspace}, <code>false</code> otherwise.
-   */
-  private boolean workspaceListenerRegistered;
-
-  /**
-   * Called once by the {@link IExtensionRegistry}.
-   */
-  public CDOWorkspaceFileSystem()
-  {
-    instance = this;
-  }
-
-  public static CDOWorkspaceFileSystem getInstance()
-  {
-    return instance;
-  }
-
-  @Override
-  public int attributes()
-  {
-    return EFS.ATTRIBUTE_OTHER_READ | EFS.ATTRIBUTE_OTHER_WRITE;
-  }
-
-  @Override
-  public boolean isCaseSensitive()
-  {
-    return true;
-  }
-
-  @Override
-  public IFileStore getStore(URI uri)
-  {
-    String path = uri.getSchemeSpecificPart();
-    StringTokenizer tokenizer = new StringTokenizer(path, "/");
-    String name = tokenizer.nextToken();
-
-    IFileStore store = getWorkspaceStore(name);
-
-    while (tokenizer.hasMoreTokens())
-    {
-      name = tokenizer.nextToken();
-      store = store.getChild(name);
-    }
-
-    return store;
-  }
-
-  public void resourceChanged(IResourceChangeEvent event)
-  {
-    IResourceDelta delta = event.getDelta();
-    if (delta != null)
-    {
-      IResourceDelta[] deltas = delta.getAffectedChildren();
-      projectsChanged(deltas);
-    }
-  }
-
-  private void projectsChanged(IResourceDelta[] deltas)
-  {
-    for (IResourceDelta delta : deltas)
-    {
-      int kind = delta.getKind();
-      boolean removed = kind == IResourceDelta.REMOVED;
-      if (!removed)
-      {
-        int flags = delta.getFlags();
-        if ((flags & IResourceDelta.OPEN) != 0)
-        {
-          IProject project = (IProject)delta.getResource();
-          removed = !project.isOpen();
-        }
-      }
-
-      if (removed)
-      {
-        String name = delta.getFullPath().segment(0);
-
-        CDOWorkspaceStore store;
-        synchronized (workspaceStores)
-        {
-          store = workspaceStores.remove(name);
-
-          if (workspaceStores.isEmpty())
-          {
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-            workspaceListenerRegistered = false;
-          }
-        }
-
-        if (store != null)
-        {
-          store.dispose();
-        }
-      }
-    }
-  }
-
-  public CDOWorkspaceStore addWorkspaceStore(String name, CDOWorkspace workspace)
-  {
-    synchronized (workspaceStores)
-    {
-      CDOWorkspaceStore store = createWorkspaceStore(name);
-      store.setWorkspace(workspace);
-      addWorkspaceStore(store);
-      return store;
-    }
-  }
-
-  private void addWorkspaceStore(IFileStore store)
-  {
-    workspaceStores.put(store.getName(), (CDOWorkspaceStore)store);
-
-    if (!workspaceListenerRegistered)
-    {
-      ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-      workspaceListenerRegistered = true;
-    }
-  }
-
-  private IFileStore getWorkspaceStore(String name)
-  {
-    synchronized (workspaceStores)
-    {
-      IFileStore store = workspaceStores.get(name);
-      if (store == null)
-      {
-        store = createWorkspaceStore(name);
-        addWorkspaceStore(store);
-      }
-
-      return store;
-    }
-  }
-
-  private CDOWorkspaceStore createWorkspaceStore(String name)
-  {
-    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-    IPath location = root.getLocation().append(name);
-    return new CDOWorkspaceStore(name, new File(location.toOSString()));
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
deleted file mode 100644
index 41d061b19c..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOWorkspaceStore.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.workspace.internal.efs;
-
-import org.eclipse.emf.cdo.CDOObject;
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.id.CDOIDUtil;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.eresource.CDOResourceNode;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-import org.eclipse.emf.cdo.util.CDOUtil;
-import org.eclipse.emf.cdo.util.CommitException;
-import org.eclipse.emf.cdo.view.CDOView;
-import org.eclipse.emf.cdo.workspace.CDOWorkspace;
-import org.eclipse.emf.cdo.workspace.efs.CDOFS;
-
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.spi.cdo.InternalCDOObject;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-/**
- * @author Eike Stepper
- */
-public final class CDOWorkspaceStore extends AbstractResourceNodeStore
-{
-  private static final AbstractResourceNodeStore NO_PARENT = null;
-
-  private String name;
-
-  private File location;
-
-  private CDOWorkspace workspace;
-
-  private Map<String, Long> lastModifiedTimes = new HashMap<String, Long>();
-
-  private CDOView view;
-
-  private SaveContext saveContext;
-
-  public CDOWorkspaceStore(String name, File location)
-  {
-    this.name = name;
-    this.location = location;
-  }
-
-  public File getLocation()
-  {
-    return location;
-  }
-
-  public synchronized CDOWorkspace getWorkspace()
-  {
-    if (workspace == null)
-    {
-      workspace = openWorkspace();
-    }
-
-    return workspace;
-  }
-
-  public synchronized void setWorkspace(CDOWorkspace workspace)
-  {
-    this.workspace = workspace;
-  }
-
-  private CDOWorkspace openWorkspace()
-  {
-    try
-    {
-      return CDOFS.open(name, location);
-    }
-    catch (Exception ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  @Override
-  public AbstractResourceNodeStore getParent()
-  {
-    return NO_PARENT;
-  }
-
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-
-  @Override
-  public URI toURI()
-  {
-    try
-    {
-      return new URI(CDOWorkspaceFileSystem.SCHEME + "://" + name);
-    }
-    catch (URISyntaxException ex)
-    {
-      throw WrappedException.wrap(ex);
-    }
-  }
-
-  @Override
-  public IFileStore getChild(String name)
-  {
-    if (CDOProjectDescriptionStore.DESCRIPTION_FILE_NAME.equals(name))
-    {
-      return new CDOProjectDescriptionStore(this);
-    }
-
-    return super.getChild(name);
-  }
-
-  @Override
-  public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException
-  {
-    return this;
-  }
-
-  @Override
-  public InputStream openInputStream(int options, IProgressMonitor monitor) throws CoreException
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public void dispose()
-  {
-    if (view != null)
-    {
-      IOUtil.close(view);
-      view = null;
-    }
-  }
-
-  @Override
-  public CDOWorkspaceStore getWorkspaceStore()
-  {
-    return this;
-  }
-
-  public long getLastModified(String path)
-  {
-    Long time = lastModifiedTimes.get(path);
-    return time == null ? EFS.NONE : time;
-  }
-
-  public void setLastModified(String path, long time)
-  {
-    lastModifiedTimes.put(path, time);
-    // TODO Save lastModifiedTimes
-  }
-
-  public SaveContext getSaveContext()
-  {
-    if (saveContext == null)
-    {
-      saveContext = new SaveContext();
-    }
-
-    return saveContext;
-  }
-
-  @Override
-  public String getPath()
-  {
-    return "";
-  }
-
-  @Override
-  protected synchronized CDOView getView()
-  {
-    if (view == null)
-    {
-      view = workspace.openView();
-    }
-
-    return view;
-  }
-
-  @Override
-  protected CDOResourceNode getResourceNode(CDOView view)
-  {
-    return view.getRootResource();
-  }
-
-  @Override
-  protected boolean isDirectory(CDOResourceNode node)
-  {
-    return true;
-  }
-
-  @Override
-  protected void collectChildNames(CDOResourceNode node, List<String> childNames)
-  {
-    childNames.add(CDOProjectDescriptionStore.DESCRIPTION_FILE_NAME);
-
-    CDOResource rootResource = (CDOResource)node;
-    for (EObject content : rootResource.getContents())
-    {
-      if (content instanceof CDOResourceNode)
-      {
-        CDOResourceNode child = (CDOResourceNode)content;
-        childNames.add(child.getName());
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public final class SaveContext
-  {
-    private CDOTransaction transaction = workspace.openTransaction();
-
-    private Map<String, InternalCDOObject> newObjects = new HashMap<String, InternalCDOObject>();
-
-    private Map<String, List<ForwardReference>> forwardReferences = new HashMap<String, List<ForwardReference>>();
-
-    private XMIResource xmiResource;
-
-    public SaveContext()
-    {
-    }
-
-    public void save(XMIResource xmiResource, String cdoPath)
-    {
-      this.xmiResource = xmiResource;
-
-      try
-      {
-        CDOResource cdoResource = transaction.getOrCreateResource(cdoPath);
-        saveContents(xmiResource.getContents(), cdoResource.getContents());
-      }
-      finally
-      {
-        this.xmiResource = null;
-        done();
-      }
-    }
-
-    private void saveContents(EList<EObject> xmiContents, EList<EObject> cdoContents)
-    {
-      int size = xmiContents.size();
-      for (int i = 0; i < size; i++)
-      {
-        EObject xmiObject = xmiContents.get(i);
-        CDOObject cdoObject = getCDOObjectByXMIID(xmiObject);
-        if (cdoObject == null)
-        {
-          cdoObject = createNewCDOObject(xmiObject);
-          cdoContents.add(i, cdoObject);
-        }
-        else
-        {
-          int index = cdoContents.indexOf(cdoObject);
-          if (index != -1)
-          {
-            if (index != i)
-            {
-              cdoContents.move(i, index);
-            }
-          }
-          else
-          {
-            cdoContents.add(i, cdoObject);
-          }
-        }
-
-        saveObject((InternalEObject)xmiObject, (InternalCDOObject)cdoObject);
-      }
-
-      shortenList(cdoContents, size);
-    }
-
-    private void saveObject(InternalEObject xmiObject, InternalCDOObject cdoObject)
-    {
-      // CDOClassInfo classInfo = cdoObject.cdoRevision().getClassInfo();
-      for (EStructuralFeature feature : xmiObject.eClass().getEAllStructuralFeatures())
-      {
-        Object xmiValue = xmiObject.eGet(feature);
-        if (feature instanceof EReference)
-        {
-          EReference reference = (EReference)feature;
-          if (reference.isContainment())
-          {
-            if (reference.isMany())
-            {
-              // Many-valued containment reference
-              @SuppressWarnings("unchecked")
-              EList<EObject> xmiContents = (EList<EObject>)xmiValue;
-
-              @SuppressWarnings("unchecked")
-              EList<EObject> cdoContents = (EList<EObject>)cdoObject.eGet(reference);
-
-              saveContents(xmiContents, cdoContents);
-            }
-            else
-            {
-              // Single-valued containment reference
-              if (xmiValue != null)
-              {
-                InternalCDOObject cdoValue = getCDOObjectByXMIID((EObject)xmiValue);
-                if (cdoValue == null)
-                {
-                  cdoValue = createNewCDOObject((EObject)xmiValue);
-                }
-
-                cdoObject.eSet(reference, cdoValue);
-                saveObject((InternalEObject)xmiValue, cdoValue);
-              }
-              else
-              {
-                cdoObject.eSet(reference, null);
-              }
-            }
-          }
-          else
-          {
-            if (reference.isMany())
-            {
-              // Many-valued cross reference
-              @SuppressWarnings("unchecked")
-              EList<EObject> xmiElements = (EList<EObject>)xmiValue;
-
-              @SuppressWarnings("unchecked")
-              EList<EObject> cdoElements = (EList<EObject>)cdoObject.eGet(reference);
-
-              int size = xmiElements.size();
-              for (int i = 0; i < size; i++)
-              {
-                InternalEObject xmiElement = (InternalEObject)xmiElements.get(i);
-                InternalCDOObject cdoElement;
-
-                org.eclipse.emf.common.util.URI eProxyURI = xmiElement.eProxyURI();
-                if (eProxyURI != null)
-                {
-                  String href = eProxyURI.fragment();
-                  cdoElement = getCDOObjectByHREF(href);
-                  if (cdoElement == null)
-                  {
-                    registerForwardReference(cdoObject, reference, i, href);
-
-                    InternalCDOObject dummy = createNewCDOObject(xmiElement);
-                    cdoElements.add(i, dummy);
-                    continue;
-                  }
-                }
-                else
-                {
-                  cdoElement = getCDOObjectByXMIID(xmiElement);
-                }
-
-                int index = cdoElements.indexOf(cdoElement);
-                if (index != -1)
-                {
-                  cdoElements.move(i, index);
-                }
-                else
-                {
-                  cdoElements.add(i, cdoElement);
-                }
-              }
-
-              shortenList(cdoElements, size);
-            }
-            else
-            {
-              // Single-valued cross reference
-              CDOObject cdoValue = null;
-              if (xmiValue != null)
-              {
-                org.eclipse.emf.common.util.URI eProxyURI = ((InternalEObject)xmiValue).eProxyURI();
-                if (eProxyURI != null)
-                {
-                  String href = eProxyURI.fragment();
-                  cdoValue = getCDOObjectByHREF(href);
-                  if (cdoValue == null)
-                  {
-                    registerForwardReference(cdoObject, reference, -1, href);
-                  }
-                }
-                else
-                {
-                  cdoValue = getCDOObjectByXMIID((EObject)xmiValue);
-                }
-              }
-
-              cdoObject.eSet(reference, cdoValue);
-            }
-          }
-        }
-        else
-        {
-          EAttribute attribute = (EAttribute)feature;
-          if (attribute.isMany())
-          {
-            // Many-valued attribute
-            @SuppressWarnings("unchecked")
-            EList<Object> xmiElements = (EList<Object>)xmiValue;
-
-            @SuppressWarnings("unchecked")
-            EList<Object> cdoElements = (EList<Object>)cdoObject.eGet(attribute);
-            cdoElements.clear();
-
-            int size = xmiElements.size();
-            for (int i = 0; i < size; i++)
-            {
-              Object xmiElement = xmiElements.get(i);
-              cdoElements.add(xmiElement);
-            }
-          }
-          else
-          {
-            // Single-valued attribute
-            cdoObject.eSet(attribute, xmiValue);
-          }
-        }
-      }
-    }
-
-    private InternalCDOObject getCDOObjectByXMIID(EObject xmiObject)
-    {
-      String xmiID = xmiResource.getID(xmiObject);
-      if (xmiID != null)
-      {
-        try
-        {
-          CDOID id = CDOIDUtil.read(xmiID);
-          if (!CDOIDUtil.isNull(id))
-          {
-            return (InternalCDOObject)transaction.getObject(id);
-          }
-        }
-        catch (Exception ex)
-        {
-          ex.printStackTrace();
-          //$FALL-THROUGH$
-        }
-      }
-
-      return null;
-    }
-
-    private InternalCDOObject createNewCDOObject(EObject xmiObject)
-    {
-      // Create new object
-      EObject newInstance = EcoreUtil.create(xmiObject.eClass());
-      InternalCDOObject cdoObject = (InternalCDOObject)CDOUtil.getCDOObject(newInstance);
-
-      // Remember new object
-      String fragment = xmiResource.getURIFragment(xmiObject);
-      newObjects.put(fragment, cdoObject);
-
-      return cdoObject;
-    }
-
-    private void shortenList(EList<EObject> list, int size)
-    {
-      int remove = list.size() - size;
-      while (remove-- != 0)
-      {
-        list.remove(list.size() - 1);
-      }
-    }
-
-    private InternalCDOObject getCDOObjectByHREF(String href)
-    {
-      InternalCDOObject cdoObject = null;
-
-      try
-      {
-        CDOID id = CDOIDUtil.read(href);
-        cdoObject = (InternalCDOObject)transaction.getObject(id);
-      }
-      catch (Exception ex)
-      {
-        //$FALL-THROUGH$
-      }
-
-      if (cdoObject == null)
-      {
-        cdoObject = newObjects.get(href);
-      }
-
-      return cdoObject;
-    }
-
-    private void done()
-    {
-      if (resolveForwardReferences())
-      {
-        commit();
-      }
-    }
-
-    private void registerForwardReference(InternalCDOObject cdoObject, EReference reference, int index, String href)
-    {
-      List<ForwardReference> list = forwardReferences.get(href);
-      if (list == null)
-      {
-        list = new ArrayList<ForwardReference>();
-        forwardReferences.put(href, list);
-      }
-
-      list.add(new ForwardReference(cdoObject, reference, index));
-    }
-
-    private boolean resolveForwardReferences()
-    {
-      Set<Entry<String, List<ForwardReference>>> entrySet = forwardReferences.entrySet();
-      for (Iterator<Entry<String, List<ForwardReference>>> it = entrySet.iterator(); it.hasNext();)
-      {
-        Entry<String, List<ForwardReference>> entry = it.next();
-        String href = entry.getKey();
-
-        InternalCDOObject target = getCDOObjectByHREF(href);
-        if (target != null)
-        {
-          List<ForwardReference> list = entry.getValue();
-          for (ForwardReference forwardReference : list)
-          {
-            forwardReference.resolve(target);
-          }
-
-          it.remove();
-        }
-      }
-
-      return forwardReferences.isEmpty();
-    }
-
-    private void commit()
-    {
-      try
-      {
-        transaction.commit();
-      }
-      catch (CommitException ex)
-      {
-        throw WrappedException.wrap(ex);
-      }
-      finally
-      {
-        IOUtil.closeSilent(transaction);
-        transaction = null;
-        forwardReferences = null;
-        newObjects = null;
-        saveContext = null;
-      }
-    }
-
-    /**
-     * @author Eike Stepper
-     */
-    private final class ForwardReference
-    {
-      private InternalCDOObject source;
-
-      private EReference reference;
-
-      private int index;
-
-      public ForwardReference(InternalCDOObject source, EReference reference, int index)
-      {
-        this.source = source;
-        this.reference = reference;
-        this.index = index;
-      }
-
-      public void resolve(InternalCDOObject target)
-      {
-        if (reference.isMany())
-        {
-          @SuppressWarnings("unchecked")
-          EList<EObject> list = (EList<EObject>)source.eGet(reference);
-          list.set(index, target);
-        }
-        else
-        {
-          source.eSet(reference, target);
-        }
-      }
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/bundle/OM.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/bundle/OM.java
deleted file mode 100644
index 4227ea54bd..0000000000
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/bundle/OM.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.workspace.internal.efs.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- * 
- * @author Eike Stepper
- */
-public abstract class OM
-{
-  public static final String BUNDLE_ID = "org.eclipse.emf.cdo.workspace.efs"; //$NON-NLS-1$
-
-  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
-  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
-  public static final OMLogger LOG = BUNDLE.logger();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static final class Activator extends OSGiActivator
-  {
-    public Activator()
-    {
-      super(BUNDLE);
-    }
-  }
-}