Cleanup
diff --git a/bundles/org.eclipse.emf.emfstore.jax/.project b/bundles/org.eclipse.emf.emfstore.jax/.project
deleted file mode 100644
index 8fe1283..0000000
--- a/bundles/org.eclipse.emf.emfstore.jax/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.emfstore.jax.server.services</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.emf.emfstore.jax.client/.checkstyle b/org.eclipse.emf.emfstore.jax.client/.checkstyle
deleted file mode 100644
index c758032..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.checkstyle
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
- <local-check-config name="ESM Checkstyle" location="http://download.eclipse.org/emfclient/config/esmCheckstyle.xml" type="remote" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1375458582796_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1375458582796_cache.xml"/>
- </local-check-config>
- <fileset name="all" enabled="true" check-config-name="ESM Checkstyle" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
diff --git a/org.eclipse.emf.emfstore.jax.client/.classpath b/org.eclipse.emf.emfstore.jax.client/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.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/org.eclipse.emf.emfstore.jax.client/.project b/org.eclipse.emf.emfstore.jax.client/.project
deleted file mode 100644
index ca6e90f..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.emfstore.jax.client</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.core.resources.prefs b/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f548abb..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-
-encoding//model/etypes.ecore=UTF-8
-
-
-encoding/<project>=UTF-8
diff --git a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 83b8580..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,418 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-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.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-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.maxProblemPerUnit=100
-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.explicitlyClosedAutoCloseable=ignore
-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.includeNullInfoFromAsserts=disabled
-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.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-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.missingJavadocTagsMethodTypeParameters=disabled
-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=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=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.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=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.unusedTypeParameter=ignore
-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,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-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=0
-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=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_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=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-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=4
-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=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not 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=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not 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=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=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-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=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-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
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb2352..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 791508d..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,115 +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=false
-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=true
-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=true
-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=false
-cleanup.remove_unnecessary_nls_tags=false
-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=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><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) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \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 * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" 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 ${user}\r\n *\r\n * ${tags}\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\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><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">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><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">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" 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}\r\n// ${todo} Auto-generated constructor stub</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=true
-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=true
-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=true
-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=true
-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=false
-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/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 864e30f..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.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/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 4f9ce07..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,97 +0,0 @@
-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
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=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=Warning
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
-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
-MISSING_EE_DESCRIPTIONS=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=Warning
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Warning
-malformed_since_tag=Warning
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.pde.prefs b/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 0bbee3c..0000000
--- a/org.eclipse.emf.emfstore.jax.client/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,32 +0,0 @@
-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.encodings=2
-compilers.p.build.java.compiler=2
-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=1
-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/org.eclipse.emf.emfstore.jax.client/META-INF/MANIFEST.MF b/org.eclipse.emf.emfstore.jax.client/META-INF/MANIFEST.MF
deleted file mode 100644
index 4585916..0000000
--- a/org.eclipse.emf.emfstore.jax.client/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EMFStore JAX RS Client
-Bundle-SymbolicName: org.eclipse.emf.emfstore.jax.client;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.common;bundle-version="2.9.1",
- org.eclipse.emf.emfstore.client;bundle-version="[1.2.0,2.0.0)",
- com.eclipsesource.jaxrs.consumer;bundle-version="2.2.0",
- org.eclipse.emf.emfstore.jax.common;bundle-version="1.1.0",
- javax.ws.rs-api;bundle-version="[2.0.0,3.0.0)",
- org.apache.commons.codec;bundle-version="1.3.0",
- org.glassfish.jersey.core.jersey-client;bundle-version="2.5.0"
-Export-Package: org.eclipse.emf.emfstore.jax.client;version="1.2.0"
diff --git a/org.eclipse.emf.emfstore.jax.client/build.properties b/org.eclipse.emf.emfstore.jax.client/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/org.eclipse.emf.emfstore.jax.client/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml
diff --git a/org.eclipse.emf.emfstore.jax.client/plugin.xml b/org.eclipse.emf.emfstore.jax.client/plugin.xml
deleted file mode 100644
index 19203e1..0000000
--- a/org.eclipse.emf.emfstore.jax.client/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.emf.emfstore.client.connectionManager">
- <connectionManager
- class="org.eclipse.emf.emfstore.jax.client.JaxrsConnectionManager">
- </connectionManager>
- </extension>
-
-</plugin>
diff --git a/org.eclipse.emf.emfstore.jax.client/src/org/eclipse/emf/emfstore/jax/client/JaxrsClientManager.java b/org.eclipse.emf.emfstore.jax.client/src/org/eclipse/emf/emfstore/jax/client/JaxrsClientManager.java
deleted file mode 100644
index 62561b2..0000000
--- a/org.eclipse.emf.emfstore.jax.client/src/org/eclipse/emf/emfstore/jax/client/JaxrsClientManager.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.emf.emfstore.jax.client;
-
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-
-import org.eclipse.emf.emfstore.client.exceptions.ESCertificateException;
-import org.eclipse.emf.emfstore.internal.client.model.ServerInfo;
-import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.KeyStoreManager;
-import org.eclipse.emf.emfstore.internal.server.exceptions.ConnectionException;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.RequestEntityProcessing;
-import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-
-/**
- * manager for handling a JAX-RS client (contains the proper WebTarget, username, password)
- *
- * @author Pascal Schliski
- *
- */
-@SuppressWarnings("restriction")
-public class JaxrsClientManager {
-
- private static final int CHUNKED_ENCODING_SIZE = 1024;
- private WebTarget target;
- private final String username;
- private final String password;
-
- /**
- * default constructor
- *
- * @param serverInfo the serverInfo of the server that is targeted
- * @param username username of the client
- * @param password password of the client, already encoded
- * @throws ESCertificateException
- */
- public JaxrsClientManager(ServerInfo serverInfo, String username, String password) throws
- ESCertificateException {
-
- this.username = username;
- this.password = password;
-
- initWebTarget(serverInfo, username, password);
-
- }
-
- /**
- * initialize the webTarget
- *
- * @param serverInfo
- * @param username
- * @param password
- * @throws ConnectionException
- * @throws ESCertificateException
- */
- private void initWebTarget(ServerInfo serverInfo, String username, String password) throws ESCertificateException {
-
- // enable HTTP BasicAuth
- final HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic(username, password);
-
- // enable ssl connection
- final SSLContext sslContext = KeyStoreManager.getInstance().getSSLContext();
-
- // create the client with SSL, BasicAuth and chunked encoding (the lather is crucial for getting real
- // streaming)
- final Client client = ClientBuilder.newBuilder().sslContext(sslContext).register(feature)
- .property(ClientProperties.CHUNKED_ENCODING_SIZE, CHUNKED_ENCODING_SIZE)
- .property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED).build();
-
- // target the server
- target = client.target("https://" + serverInfo.getUrl() + ":" + serverInfo.getPort() + "/" + "services"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
- }
-
- /**
- * @return the webTarget, on which calls are created
- */
- public WebTarget getTarget() {
- return target;
- }
-
- public String getUsername() {
- return username;
- }
-
- public String getPassword() {
- return password;
- }
-}
diff --git a/org.eclipse.emf.emfstore.jax.client/src/org/eclipse/emf/emfstore/jax/client/JaxrsConnectionManager.java b/org.eclipse.emf.emfstore.jax.client/src/org/eclipse/emf/emfstore/jax/client/JaxrsConnectionManager.java
deleted file mode 100644
index f6802c9..0000000
--- a/org.eclipse.emf.emfstore.jax.client/src/org/eclipse/emf/emfstore/jax/client/JaxrsConnectionManager.java
+++ /dev/null
@@ -1,851 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH 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:
- * Pascal - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emf.emfstore.jax.client;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.BRANCHES_PATH_AFTER_PROJECTID;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.BRANCHES_PATH_BEFORE_PROJECTID;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.DELETE_FILES_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.FILE_SIZE_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.HISTORIES_PATH;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PACKAGES_PATH;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_CHANGES;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_FILES;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_PROPERTIES;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_RESOLVE_VERSION_SPEC;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_TAGS;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_VERSIONS;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.SOURCE_VERSION_SPEC_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.TARGET_VERSION_SPEC_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.USERS_PATH;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.VERSION_SPEC_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.convertSerializableIntoStreamingOutput;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.getEObjectFromResponse;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.getExceptionFromExceptionResponse;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.getFileChunkFromResponse;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.emfstore.client.exceptions.ESCertificateException;
-import org.eclipse.emf.emfstore.internal.client.model.ServerInfo;
-import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.AbstractConnectionManager;
-import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.ConnectionManager;
-import org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty;
-import org.eclipse.emf.emfstore.internal.common.model.Project;
-import org.eclipse.emf.emfstore.internal.server.filetransfer.FileChunk;
-import org.eclipse.emf.emfstore.internal.server.filetransfer.FileTransferInformation;
-import org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation;
-import org.eclipse.emf.emfstore.internal.server.model.ClientVersionInfo;
-import org.eclipse.emf.emfstore.internal.server.model.ModelFactory;
-import org.eclipse.emf.emfstore.internal.server.model.ProjectHistory;
-import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
-import org.eclipse.emf.emfstore.internal.server.model.ProjectInfo;
-import org.eclipse.emf.emfstore.internal.server.model.SessionId;
-import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnitId;
-import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACUser;
-import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.OrgUnitProperty;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.BranchInfo;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.BranchVersionSpec;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryQuery;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.TagVersionSpec;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.VersionSpec;
-import org.eclipse.emf.emfstore.jax.common.TransferUtil;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- * JAX-RS based Implementation of ConnectionManager
- *
- * @author Pascal Schliski
- *
- */
-@SuppressWarnings("restriction")
-public class JaxrsConnectionManager extends AbstractConnectionManager<JaxrsClientManager> implements ConnectionManager {
-
- public JaxrsConnectionManager() {
-
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#getProjectList(org.eclipse.emf.emfstore.internal.server.model.SessionId)
- */
- public List<ProjectInfo> getProjectList(SessionId sessionId) throws ESException {
-
- final Builder builder = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .request(MediaType.APPLICATION_XML);
- final Response response = builder.get();
-
- checkResponseStatus(response);
-
- final List<ProjectInfo> projectInfoList = TransferUtil
- .<ProjectInfo> getEObjectListFromResponse(response);
-
- return projectInfoList;
- }
-
- /**
- * checks if the status of the response is OK, if not it will throw an ESException if there is an entity with an
- * ESException Message
- *
- * @param response
- * @throws ESException
- */
- private void checkResponseStatus(Response response) throws ESException {
-
- final int status = response.getStatus();
-
- if (isStatusNotSuccessful(status)) {
-
- if (response.hasEntity()) {
-
- String entity;
- try {
- entity = response.readEntity(String.class);
- final ESException exception = getExceptionFromExceptionResponse(entity);
- if (exception == null) {
- throw new ESException(String.valueOf(status));
- }
- throw exception;
- } catch (final ProcessingException ex) {
- throw new ESException(String.valueOf(status));
- } catch (final IllegalStateException ex) {
- throw new ESException(String.valueOf(status));
- }
- }
- throw new ESException(String.valueOf(status) + response.getStatusInfo().getReasonPhrase());
- }
- }
-
- /**
- * @param status
- * @return
- */
- private boolean isStatusNotSuccessful(final int status) {
-
- return status / 100 != 2;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#getProject(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.VersionSpec)
- */
- public Project getProject(SessionId sessionId, ProjectId projectId, VersionSpec versionSpec) throws ESException {
-
- PrimaryVersionSpec primaryVersionSpec;
- if (versionSpec instanceof PrimaryVersionSpec) {
- primaryVersionSpec = (PrimaryVersionSpec) versionSpec;
- }
- else {
- primaryVersionSpec = resolveVersionSpec(sessionId, projectId, versionSpec);
- }
-
- final String subpath = projectId.getId();
- final String versionSpecQueryParam = String.valueOf(primaryVersionSpec.getIdentifier());
-
- // make the http call and get the input stream and extract the Project
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(subpath).queryParam(VERSION_SPEC_QUERY_PARAM, versionSpecQueryParam)
- .request(MediaType.APPLICATION_XML).get();
-
- checkResponseStatus(response);
-
- // read the entity
- final Project project = getEObjectFromResponse(response);
-
- return project;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#createProject(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * java.lang.String, java.lang.String, org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage,
- * org.eclipse.emf.emfstore.internal.common.model.Project)
- */
- public ProjectInfo createProject(SessionId sessionId, String name, String description,
- LogMessage logMessage, Project project) throws ESException {
-
- final List<EObject> eObjects = new ArrayList<EObject>();
-
- final ProjectInfo projectInfo = ModelFactory.eINSTANCE.createProjectInfo();
- projectInfo.setName(name);
- projectInfo.setDescription(description);
- eObjects.add(projectInfo);
- if (logMessage != null) {
- eObjects.add(logMessage);
- }
- if (project != null) {
- eObjects.add(project);
- }
-
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(eObjects);
-
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .request(MediaType.APPLICATION_XML)
- .post(Entity.entity(streamingOutput, MediaType.APPLICATION_XML));
-
- checkResponseStatus(response);
-
- // read the entity
- return getEObjectFromResponse(response);
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#deleteProject(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId, boolean)
- */
- public void deleteProject(SessionId sessionId, ProjectId projectId, boolean deleteFiles)
- throws ESException {
-
- final String subpath = projectId.getId();
-
- // make the http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(subpath).queryParam(DELETE_FILES_QUERY_PARAM, deleteFiles).request()
- .delete();
-
- checkResponseStatus(response);
-
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#importProjectHistoryToServer(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectHistory)
- */
- public ProjectId importProjectHistoryToServer(SessionId sessionId, ProjectHistory projectHistory)
- throws ESException {
-
- // create StreamingOutput
- final List<ProjectHistory> projectHistoryList = new ArrayList<ProjectHistory>();
- projectHistoryList.add(projectHistory);
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(projectHistoryList);
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(HISTORIES_PATH)
- .request(MediaType.APPLICATION_XML)
- .post(Entity.entity(streamingOutput, MediaType.APPLICATION_XML));
-
- checkResponseStatus(response);
-
- return getEObjectFromResponse(response);
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#exportProjectHistoryFromServer(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId)
- */
- public ProjectHistory exportProjectHistoryFromServer(SessionId sessionId, ProjectId projectId) throws ESException {
-
- final String projectIdPathParam = projectId.getId();
-
- final Response response = getConnectionProxy(sessionId).getTarget().path(HISTORIES_PATH)
- .path(projectIdPathParam).request(MediaType.APPLICATION_XML).get();
-
- checkResponseStatus(response);
-
- final ProjectHistory projectHistory = getEObjectFromResponse(response);
-
- return projectHistory;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#getBranches(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId)
- */
- public List<BranchInfo> getBranches(SessionId sessionId, ProjectId projectId) throws ESException {
-
- final String projectIdPathParam = projectId.getId();
-
- // make the http call
- final Response response = getConnectionProxy(sessionId).getTarget()
- .path(BRANCHES_PATH_BEFORE_PROJECTID)
- .path(projectIdPathParam)
- .path(BRANCHES_PATH_AFTER_PROJECTID)
- .request(MediaType.APPLICATION_XML).get();
-
- checkResponseStatus(response);
-
- final List<BranchInfo> branchInfoList = TransferUtil
- .<BranchInfo> getEObjectListFromResponse(response);
-
- return branchInfoList;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#createVersion(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.BranchVersionSpec,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage)
- */
- public PrimaryVersionSpec createVersion(SessionId sessionId, ProjectId projectId,
- PrimaryVersionSpec baseVersionSpec, ChangePackage changePackage,
- BranchVersionSpec targetBranch, PrimaryVersionSpec sourceVersion,
- LogMessage logMessage) throws ESException {
-
- // create path param as String
- final String projectIdPathParam = projectId.getId();
-
- final List<EObject> eObjects = new ArrayList<EObject>();
- if (baseVersionSpec != null) {
- eObjects.add(baseVersionSpec);
- }
- if (changePackage != null) {
- eObjects.add(changePackage);
- }
- if (sourceVersion != null) {
- eObjects.add(sourceVersion);
- }
- if (logMessage != null) {
- eObjects.add(logMessage);
- }
- if (targetBranch != null) {
- eObjects.add(targetBranch);
- }
-
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(eObjects);
-
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdPathParam).request(MediaType.APPLICATION_XML)
- .post(Entity.entity(streamingOutput, MediaType.APPLICATION_XML));
-
- checkResponseStatus(response);
-
- final PrimaryVersionSpec baseVersionSpecResult = getEObjectFromResponse(response);
-
- return baseVersionSpecResult;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#getChanges(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.VersionSpec,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.VersionSpec)
- */
- public List<ChangePackage> getChanges(SessionId sessionId, ProjectId projectId,
- final VersionSpec sourceSpec, final VersionSpec targetSpec) throws ESException {
-
- PrimaryVersionSpec source;
- PrimaryVersionSpec target;
- // convert params to Strings
- final String projectIdAsString = projectId.getId();
-
- if (sourceSpec instanceof PrimaryVersionSpec) {
- source = (PrimaryVersionSpec) sourceSpec;
- } else {
- source = resolveVersionSpec(sessionId, projectId, sourceSpec);
- }
- if (targetSpec instanceof PrimaryVersionSpec) {
- target = (PrimaryVersionSpec) targetSpec;
- } else {
- target = resolveVersionSpec(sessionId, projectId, targetSpec);
- }
-
- final String sourceAsString = String
- .valueOf(source.getIdentifier());
- final String targetAsString = String
- .valueOf(target.getIdentifier());
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdAsString)
- .path(PROJECTS_PATH_CHANGES)
- .queryParam(SOURCE_VERSION_SPEC_QUERY_PARAM, sourceAsString)
- .queryParam(TARGET_VERSION_SPEC_QUERY_PARAM, targetAsString)
- .request(MediaType.APPLICATION_XML).get();
-
- checkResponseStatus(response);
-
- final List<ChangePackage> changes = TransferUtil
- .<ChangePackage> getEObjectListFromResponse(response);
-
- return changes;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#resolveVersionSpec(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.VersionSpec)
- */
- public PrimaryVersionSpec resolveVersionSpec(SessionId sessionId, ProjectId projectId,
- VersionSpec versionSpec) throws ESException {
-
- // convert params
- final String projectIdAsString = projectId.getId();
- final List<VersionSpec> versionSpecList = new ArrayList<VersionSpec>();
- versionSpecList.add(versionSpec);
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(versionSpecList);
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdAsString)
- .path(PROJECTS_PATH_RESOLVE_VERSION_SPEC)
- .request(MediaType.APPLICATION_XML)
- .post(Entity.entity(streamingOutput, MediaType.APPLICATION_XML));
-
- checkResponseStatus(response);
-
- return getEObjectFromResponse(response);
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#getHistoryInfo(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryQuery)
- */
- public List<HistoryInfo> getHistoryInfo(SessionId sessionId, ProjectId projectId,
- HistoryQuery<?> historyQuery) throws ESException {
-
- // convert params
- final String projectIdAsString = projectId.getId();
- @SuppressWarnings("rawtypes")
- final List<HistoryQuery> historyQueryList = new ArrayList<HistoryQuery>();
- historyQueryList.add(historyQuery);
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(historyQueryList);
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdAsString)
- .path(PROJECTS_PATH_VERSIONS)
- .request(MediaType.APPLICATION_XML)
- .post(Entity.entity(streamingOutput, MediaType.APPLICATION_XML));
-
- checkResponseStatus(response);
-
- final List<HistoryInfo> historyInfoList = TransferUtil
- .<HistoryInfo> getEObjectListFromResponse(response);
-
- return historyInfoList;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#addTag(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.TagVersionSpec)
- */
- public void addTag(SessionId sessionId, ProjectId projectId, PrimaryVersionSpec versionSpec,
- TagVersionSpec tag) throws ESException {
-
- // convert params
- final String projectIdAsString = projectId.getId();
- final List<VersionSpec> versionSpecList = new ArrayList<VersionSpec>();
- versionSpecList.add(versionSpec);
- versionSpecList.add(tag);
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(versionSpecList);
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdAsString)
- .path(PROJECTS_PATH_TAGS)
- .request(MediaType.APPLICATION_XML)
- .post(Entity.entity(streamingOutput, MediaType.APPLICATION_XML));
-
- checkResponseStatus(response);
-
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#removeTag(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec,
- * org.eclipse.emf.emfstore.internal.server.model.versioning.TagVersionSpec)
- */
- public void removeTag(SessionId sessionId, ProjectId projectId, PrimaryVersionSpec versionSpec,
- TagVersionSpec tag) throws ESException {
-
- // convert params
- // TODO: ensure that it is compatible to all kinds of versionSpecs including the branch info!!!
- final String projectIdAsString = projectId.getId();
- final String primaryVersionSpecAsString = String.valueOf(versionSpec.getIdentifier());
- final String tagVersionSpecAsString = tag.getName(); // this is unique for identifying a TagVersionSpec
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdAsString)
- .path(PROJECTS_PATH_TAGS).path(primaryVersionSpecAsString).path(tagVersionSpecAsString)
- .request().delete();
-
- checkResponseStatus(response);
-
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#setEMFProperties(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * java.util.List, org.eclipse.emf.emfstore.internal.server.model.ProjectId)
- */
- public List<EMFStoreProperty> setEMFProperties(
- SessionId sessionId, List<EMFStoreProperty> property, ProjectId projectId) throws ESException {
-
- // convert params
- final String projectIdAsString = projectId.getId();
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(property);
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdAsString)
- .path(PROJECTS_PATH_PROPERTIES)
- .request(MediaType.APPLICATION_XML)
- .post(Entity.entity(streamingOutput, MediaType.APPLICATION_XML));
-
- checkResponseStatus(response);
-
- final List<EMFStoreProperty> properties = TransferUtil
- .<EMFStoreProperty> getEObjectListFromResponse(response);
-
- return properties;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#getEMFProperties(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId)
- */
- public List<EMFStoreProperty> getEMFProperties(SessionId sessionId, ProjectId projectId) throws ESException {
-
- // convert params to Strings
- final String projectIdAsString = projectId.getId();
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdAsString)
- .path(PROJECTS_PATH_PROPERTIES)
- .request(MediaType.APPLICATION_XML).get();
-
- checkResponseStatus(response);
-
- final List<EMFStoreProperty> properties = TransferUtil
- .<EMFStoreProperty> getEObjectListFromResponse(response);
-
- return properties;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#createEmptyProject(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * java.lang.String, java.lang.String, org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage)
- */
- public ProjectInfo createEmptyProject(SessionId sessionId, String name,
- String description, LogMessage logMessage) throws ESException {
-
- return createProject(sessionId, name, description, logMessage, null);
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#resolveUser(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnitId)
- */
- public ACUser resolveUser(SessionId sessionId, ACOrgUnitId id)
- throws ESException {
-
- final String username;
- if (id != null && id.getId() != null) {
- username = id.getId();
- } else {
- username = getConnectionProxy(sessionId).getUsername();
- }
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(USERS_PATH)
- .path(username)
- .request(MediaType.APPLICATION_XML).get();
-
- checkResponseStatus(response);
-
- final ACUser resolvedUser = getEObjectFromResponse(response);
-
- return resolvedUser;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#uploadFileChunk(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId,
- * org.eclipse.emf.emfstore.internal.server.filetransfer.FileChunk)
- */
- public FileTransferInformation uploadFileChunk(SessionId sessionId,
- ProjectId projectId, FileChunk fileChunk) throws ESException {
-
- // convert params to Strings
- final String projectIdAsString = projectId.getId();
- final StreamingOutput streamingOutput = convertSerializableIntoStreamingOutput(fileChunk);
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdAsString)
- .path(PROJECTS_PATH_FILES)
- .request(MediaType.WILDCARD).post(Entity.entity(streamingOutput, MediaType.WILDCARD));
-
- checkResponseStatus(response);
-
- FileTransferInformation fileTransferInformation = null;
- try {
- fileTransferInformation = TransferUtil
- .getFileTransferInformationFromResponse(response);
- } catch (final ClassNotFoundException e) {
- throw new ESException(e);
- } catch (final IOException e) {
- throw new ESException(e);
- }
-
- return fileTransferInformation;
-
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#downloadFileChunk(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId,
- * org.eclipse.emf.emfstore.internal.server.filetransfer.FileTransferInformation)
- */
- public FileChunk downloadFileChunk(SessionId sessionId,
- ProjectId projectId, FileTransferInformation fileInformation)
- throws ESException {
-
- // convert params to Strings
- final String projectIdAsString = projectId.getId();
- final String fileIdentifier = fileInformation.getFileIdentifier().getIdentifier(); // this identifier is unique
- final String chunkNumberAsString = String.valueOf(fileInformation.getChunkNumber());
- final String fileSizeAsString = String.valueOf(fileInformation.getFileSize());
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget().path(PROJECTS_PATH)
- .path(projectIdAsString)
- .path(PROJECTS_PATH_FILES)
- .path(fileIdentifier).path(chunkNumberAsString)
- .queryParam(FILE_SIZE_QUERY_PARAM, fileSizeAsString).request(MediaType.WILDCARD).get();
-
- checkResponseStatus(response);
-
- try {
- final FileChunk fileChunkFromResponse = getFileChunkFromResponse(response);
- return fileChunkFromResponse;
- } catch (final ClassNotFoundException e) {
- throw new ESException(e);
- } catch (final IOException e) {
- throw new ESException(e);
- }
-
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#transmitProperty(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.emfstore.internal.server.model.accesscontrol.OrgUnitProperty,
- * org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACUser,
- * org.eclipse.emf.emfstore.internal.server.model.ProjectId)
- */
- public void transmitProperty(SessionId sessionId,
- OrgUnitProperty changedProperty, ACUser tmpUser, ProjectId projectId)
- throws ESException {
-
- throw new UnsupportedOperationException();
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.EMFStore#registerEPackage(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * org.eclipse.emf.ecore.EPackage)
- */
- public void registerEPackage(SessionId sessionId, EPackage pkg)
- throws ESException {
-
- // convert params
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectToXmlIntoStreamingOutput(pkg);
-
- // make http call
- final Response response = getConnectionProxy(sessionId).getTarget()
- .path(PACKAGES_PATH).request()
- .post(Entity.entity(streamingOutput, MediaType.APPLICATION_XML));
-
- checkResponseStatus(response);
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.client.model.connectionmanager.ConnectionManager#logIn(java.lang.String,
- * java.lang.String, org.eclipse.emf.emfstore.internal.client.model.ServerInfo,
- * org.eclipse.emf.emfstore.internal.server.model.ClientVersionInfo)
- */
- public AuthenticationInformation logIn(String username, String password,
- ServerInfo severInfo, ClientVersionInfo clientVersionInfo)
- throws ESException {
-
- // create clientManager which creates the WebTarget
- JaxrsClientManager clientManager;
- try {
- clientManager = new JaxrsClientManager(
- severInfo, username, password);
- } catch (final ESCertificateException ex) {
- throw new ESException(ex);
- }
-
- // retrieve ResolvedACUser from Server
- final ACUser acUser = resolveUserWithClientVersionInfo(clientVersionInfo, clientManager);
-
- final SessionId sessionId = createSessionId(username);
-
- // create AuthenticationInformation
- final AuthenticationInformation authenticationInformation = org.eclipse.emf.emfstore.internal.server.model.ModelFactory.eINSTANCE
- .createAuthenticationInformation();
- authenticationInformation.setResolvedACUser(acUser);
- authenticationInformation.setSessionId(sessionId);
-
- // add the proxy to the map
- addConnectionProxy(authenticationInformation.getSessionId(), clientManager);
-
- return authenticationInformation;
- }
-
- /**
- * resolve a User when he logs in, returns data needed to create the ConnectionProxy on client side
- *
- * @param clientVersionInfo
- * @param clientManager
- * @return the resolved ACUser
- * @throws ESException
- */
- private ACUser resolveUserWithClientVersionInfo(ClientVersionInfo clientVersionInfo,
- final JaxrsClientManager clientManager) throws ESException {
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectToXmlIntoStreamingOutput(clientVersionInfo);
- final Response response = clientManager.getTarget().path(USERS_PATH)
- .path(clientManager.getUsername()).request(MediaType.APPLICATION_XML)
- .put(Entity.entity(streamingOutput, MediaType.APPLICATION_XML));
-
- checkResponseStatus(response);
-
- final ACUser acUser = getEObjectFromResponse(response);
- return acUser;
- }
-
- /**
- * creates a local SessionId which is unique
- *
- * @param username
- * @return a SessionId
- */
- private SessionId createSessionId(String username) {
-
- final SessionId sessionId = org.eclipse.emf.emfstore.internal.server.model.ModelFactory.eINSTANCE
- .createSessionId();
- final String id = UUID.randomUUID().toString();
- sessionId.setId(id);
- return sessionId;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.client.model.connectionmanager.ConnectionManager#logout(org.eclipse.emf.emfstore.internal.server.model.SessionId)
- */
- public void logout(SessionId sessionId) throws ESException {
-
- removeConnectionProxy(sessionId);
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.client.model.connectionmanager.ConnectionManager#isLoggedIn(org.eclipse.emf.emfstore.internal.server.model.SessionId)
- */
- public boolean isLoggedIn(SessionId id) {
-
- return hasConnectionProxy(id);
- }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax.common/.checkstyle b/org.eclipse.emf.emfstore.jax.common/.checkstyle
deleted file mode 100644
index c758032..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.checkstyle
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
- <local-check-config name="ESM Checkstyle" location="http://download.eclipse.org/emfclient/config/esmCheckstyle.xml" type="remote" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1375458582796_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1375458582796_cache.xml"/>
- </local-check-config>
- <fileset name="all" enabled="true" check-config-name="ESM Checkstyle" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
diff --git a/org.eclipse.emf.emfstore.jax.common/.classpath b/org.eclipse.emf.emfstore.jax.common/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.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/org.eclipse.emf.emfstore.jax.common/.project b/org.eclipse.emf.emfstore.jax.common/.project
deleted file mode 100644
index cf7610b..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.emfstore.jax.common</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.core.resources.prefs b/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f548abb..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-
-encoding//model/etypes.ecore=UTF-8
-
-
-encoding/<project>=UTF-8
diff --git a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 83b8580..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,418 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-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.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-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.maxProblemPerUnit=100
-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.explicitlyClosedAutoCloseable=ignore
-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.includeNullInfoFromAsserts=disabled
-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.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-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.missingJavadocTagsMethodTypeParameters=disabled
-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=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=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.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=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.unusedTypeParameter=ignore
-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,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-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=0
-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=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_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=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-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=4
-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=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not 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=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not 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=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=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-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=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-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
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb2352..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 791508d..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,115 +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=false
-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=true
-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=true
-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=false
-cleanup.remove_unnecessary_nls_tags=false
-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=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><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) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \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 * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" 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 ${user}\r\n *\r\n * ${tags}\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\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><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">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><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">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" 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}\r\n// ${todo} Auto-generated constructor stub</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=true
-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=true
-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=true
-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=true
-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=false
-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/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 864e30f..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.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/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 4f9ce07..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,97 +0,0 @@
-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
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=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=Warning
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
-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
-MISSING_EE_DESCRIPTIONS=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=Warning
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Warning
-malformed_since_tag=Warning
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.pde.prefs b/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 0bbee3c..0000000
--- a/org.eclipse.emf.emfstore.jax.common/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,32 +0,0 @@
-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.encodings=2
-compilers.p.build.java.compiler=2
-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=1
-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/org.eclipse.emf.emfstore.jax.common/META-INF/MANIFEST.MF b/org.eclipse.emf.emfstore.jax.common/META-INF/MANIFEST.MF
deleted file mode 100644
index c20f8d8..0000000
--- a/org.eclipse.emf.emfstore.jax.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EMFStore JAX RS Common Functionality
-Bundle-SymbolicName: org.eclipse.emf.emfstore.jax.common
-Bundle-Version: 1.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.emfstore.jax.common;version="1.2.0"
-Require-Bundle: org.eclipse.emf.common;bundle-version="2.9.2",
- org.eclipse.emf.emfstore.server.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.2.0,2.0.0)",
- javax.ws.rs-api;bundle-version="[2.0.0,3.0.0)"
diff --git a/org.eclipse.emf.emfstore.jax.common/build.properties b/org.eclipse.emf.emfstore.jax.common/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/org.eclipse.emf.emfstore.jax.common/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/org.eclipse.emf.emfstore.jax.common/src/org/eclipse/emf/emfstore/jax/common/CallParamStrings.java b/org.eclipse.emf.emfstore.jax.common/src/org/eclipse/emf/emfstore/jax/common/CallParamStrings.java
deleted file mode 100644
index 53fcf38..0000000
--- a/org.eclipse.emf.emfstore.jax.common/src/org/eclipse/emf/emfstore/jax/common/CallParamStrings.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.emf.emfstore.jax.common;
-
-/**
- * class which contains static Strings for URIs, PathParams etc.
- *
- * @author Pascal Schliski
- *
- */
-public interface CallParamStrings {
-
- // Path & Query param constants
- public static final String PROJECT_ID_PATH_PARAM = "projectId"; //$NON-NLS-1$
- public static final String BRANCH_ID_PATH_PARAM = "branchId"; //$NON-NLS-1$
- public static final String PRIMARY_TAG_ID = "primaryVersionSpecId"; //$NON-NLS-1$
- public static final String SECONDARY_TAG_ID = "tagVersionSpecId"; //$NON-NLS-1$
- public static final String USER_NAME_PATH_PARAM = "username"; //$NON-NLS-1$
- public static final String FILE_IDENTIFIER_PATH_PARAM = "fileIdentifier"; //$NON-NLS-1$
- public static final String CHUNK_NUMBER_PATH_PARAM = "chunkNumber"; //$NON-NLS-1$
- public static final String FILE_SIZE_QUERY_PARAM = "fileSize"; //$NON-NLS-1$
- public static final String VERSION_SPEC_QUERY_PARAM = "versionSpec"; //$NON-NLS-1$
- public static final String DELETE_FILES_QUERY_PARAM = "deleteFiles"; //$NON-NLS-1$
- public static final String SOURCE_VERSION_SPEC_QUERY_PARAM = "sourceVersionSpec"; //$NON-NLS-1$
- public static final String TARGET_VERSION_SPEC_QUERY_PARAM = "targetVersionSpec"; //$NON-NLS-1$
-
- // Base uri where the services are published
- public final static String BASE_URI = "https://localhost:8443/services"; //$NON-NLS-1$
- // public static final String BASE_URI_SSL = "https://localhost:9090/services";
-
- // path constants
- public final static String PROJECTS_PATH = "projects"; //$NON-NLS-1$
- public final static String BRANCHES_PATH_BEFORE_PROJECTID = PROJECTS_PATH;
- public final static String BRANCHES_PATH_AFTER_PROJECTID = "branches"; //$NON-NLS-1$
- public final static String BRANCHES_PATH_COMPLETE = BRANCHES_PATH_BEFORE_PROJECTID + "/" + "{" //$NON-NLS-1$ //$NON-NLS-2$
- + PROJECT_ID_PATH_PARAM + "}" + "/" + BRANCHES_PATH_AFTER_PROJECTID; //$NON-NLS-1$ //$NON-NLS-2$
- public static final String BRANCHES_PATH_CHANGES = "changes"; //$NON-NLS-1$
- public static final String PROJECTS_PATH_CHANGES = "changes"; //$NON-NLS-1$
- public static final String PROJECTS_PATH_PROPERTIES = "properties"; //$NON-NLS-1$
- public static final String PROJECTS_PATH_RESOLVE_VERSION_SPEC = "resolveVersionSpec"; //$NON-NLS-1$
- public static final String PROJECTS_PATH_TAGS = "tags"; //$NON-NLS-1$
- public static final String PROJECTS_PATH_VERSIONS = "versions"; //$NON-NLS-1$
- public static final String HISTORIES_PATH = "histories"; //$NON-NLS-1$
- public static final String USERS_PATH = "users"; //$NON-NLS-1$
- public static final String PACKAGES_PATH = "packages"; //$NON-NLS-1$
- public static final String PROJECTS_PATH_FILES = "files"; //$NON-NLS-1$
-
-}
diff --git a/org.eclipse.emf.emfstore.jax.common/src/org/eclipse/emf/emfstore/jax/common/TransferUtil.java b/org.eclipse.emf.emfstore.jax.common/src/org/eclipse/emf/emfstore/jax/common/TransferUtil.java
deleted file mode 100644
index 52f3132..0000000
--- a/org.eclipse.emf.emfstore.jax.common/src/org/eclipse/emf/emfstore/jax/common/TransferUtil.java
+++ /dev/null
@@ -1,449 +0,0 @@
-package org.eclipse.emf.emfstore.jax.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-
-import org.apache.commons.lang.SerializationUtils;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.emf.emfstore.internal.common.model.IdEObjectCollection;
-import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
-import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.ClientVersionOutOfDateException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.ConnectionException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.FileNotOnServerException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.FileTransferException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.InvalidInputException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.InvalidProjectIdException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.InvalidVersionSpecException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.SerializationException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.ServerKeyStoreException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.SessionTimedOutException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.StorageException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.UnknownSessionException;
-import org.eclipse.emf.emfstore.internal.server.filetransfer.FileChunk;
-import org.eclipse.emf.emfstore.internal.server.filetransfer.FileTransferInformation;
-import org.eclipse.emf.emfstore.internal.server.model.FileIdentifier;
-import org.eclipse.emf.emfstore.internal.server.model.ModelFactory;
-import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.TagVersionSpec;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningFactory;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-import org.eclipse.emf.emfstore.server.exceptions.ESUpdateRequiredException;
-
-/**
- * helper class with methods for Serialization & Deserialization
- *
- * @author Pascal Schliski
- *
- */
-@SuppressWarnings("restriction")
-public final class TransferUtil {
-
- private static final Integer FLUSH_THRESHOLD = Integer.valueOf(1024);
- private static final String EXCEPTION_MESSAGE_SEPERATOR = "\n"; //$NON-NLS-1$
-
- /**
- * Private constructor.
- */
- private TransferUtil() {
- // private constructor since util class
- }
-
- /**
- * converts a {@link java.io.Serializable} into a {@link StreamingOutput}
- *
- * @param s the {@link java.io.Serializable}
- * @return the {@link StreamingOutput}
- */
- public static StreamingOutput convertSerializableIntoStreamingOutput(final Serializable s) {
-
- final StreamingOutput streamingOutput = new StreamingOutput() {
-
- public void write(OutputStream output) throws IOException,
- WebApplicationException {
-
- SerializationUtils.serialize(s, output);
- }
- };
- return streamingOutput;
- }
-
- /**
- * get a {@link FileChunk} instance from an {@link InputStream}
- *
- * @param is the InputStream
- * @return the FileChunk object
- * @throws ClassNotFoundException
- * @throws IOException
- */
- public static FileChunk getFileChunkFromInputStream(final InputStream is) throws ClassNotFoundException,
- IOException {
- final FileChunk fileChunk = (FileChunk) new ObjectInputStream(is).readObject();
- return fileChunk;
- }
-
- /**
- * get a {@link FileChunk} instance from an {@link Response}
- *
- * @param response the Response object
- * @return the FileChunk object
- * @throws ClassNotFoundException
- * @throws IOException
- */
- public static FileChunk getFileChunkFromResponse(final Response response) throws ClassNotFoundException,
- IOException {
- final InputStream is = response.readEntity(InputStream.class);
- return getFileChunkFromInputStream(is);
- }
-
- /**
- * get a {@link FileTransferInformation} from a {@link Response}
- *
- * @param response the Response object
- * @return the FileTransferInformation object
- * @throws ClassNotFoundException
- * @throws IOException
- */
- public static FileTransferInformation getFileTransferInformationFromResponse(
- final Response response) throws ClassNotFoundException, IOException {
-
- final InputStream is = response.readEntity(InputStream.class);
- final FileTransferInformation fileTransferInformation = (FileTransferInformation) new ObjectInputStream(is)
- .readObject();
- return fileTransferInformation;
-
- }
-
- /**
- * convert a collection of {@link EObject} into a {@link StreamingOutput}
- *
- * @param eObjects
- * @return the StreamingOutput
- */
- public static StreamingOutput convertEObjectsToXmlIntoStreamingOutput(
- final Collection<? extends EObject> eObjects) {
- // convert the list into XML and write it to a StreamingOutput
- final ResourceSetImpl resourceSetImpl = new ResourceSetImpl();
- final XMIResourceImpl resource = (XMIResourceImpl) resourceSetImpl
- .createResource(ModelUtil.VIRTUAL_URI);
-
- resource.setIntrinsicIDToEObjectMap(new HashMap<String, EObject>());
-
- for (final EObject e : eObjects) {
- EObject copy;
- if (e instanceof IdEObjectCollection) {
- copy = ModelUtil.copyIdEObjectCollection((IdEObjectCollection) e, resource);
- } else {
- copy = EcoreUtil.copy(e);
- }
-
- resource.getContents().add(copy);
- }
-
- final Map<String, Object> options = new HashMap<String, Object>();
- options.put(XMLResource.OPTION_FLUSH_THRESHOLD, FLUSH_THRESHOLD);
-
- final StreamingOutput streamingOutput = new StreamingOutput() {
-
- public void write(OutputStream output) throws IOException,
- WebApplicationException {
-
- resource.doSave(output, options);
-
- }
- };
- return streamingOutput;
- }
-
- /**
- * convert a single {@link EObject} into a {@link StreamingOutput}
- *
- * @param eObject
- * @return the StreamingOutput
- */
- public static <T extends EObject> StreamingOutput convertEObjectToXmlIntoStreamingOutput(
- final T eObject) {
-
- final List<T> eObjects = new ArrayList<T>();
- eObjects.add(eObject);
- return convertEObjectsToXmlIntoStreamingOutput(eObjects);
- }
-
- /**
- * converts an {@link InputStream} into a list of {@link EObject}, for example: List<ProjectInfo>, List<BranchInfo>,
- * ...
- *
- * @param is the InputStream
- * @return the list of EObjects
- * @throws ESException
- */
- @SuppressWarnings("unchecked")
- public static <T extends EObject> List<T> getEObjectListFromInputStream(
- final InputStream is) throws ESException {
- // create XMLResource and read the entity
- final ResourceSetImpl resourceSetImpl = new ResourceSetImpl();
- final XMIResourceImpl resource = (XMIResourceImpl) resourceSetImpl.createResource(ModelUtil.VIRTUAL_URI);
-
- resource.setIntrinsicIDToEObjectMap(new HashMap<String, EObject>());
-
- final List<T> eObjectList = new ArrayList<T>();
- try {
- // create the List<ProjectInfo> from the input stream
- final Map<String, Object> options = new HashMap<String, Object>();
- options.put(XMLResource.OPTION_FLUSH_THRESHOLD, FLUSH_THRESHOLD);
- resource.doLoad(is, options);
- for (final Object o : resource.getContents()) {
- // copy not necessary, no side effects here
-
- if (o instanceof IdEObjectCollection) {
- final IdEObjectCollection collection = (IdEObjectCollection) o;
- final Map<EObject, String> eObjectToIdMap = new LinkedHashMap<EObject, String>();
- final Map<String, EObject> idToEObjectMap = new LinkedHashMap<String, EObject>();
-
- for (final EObject modelElement : collection.getAllModelElements()) {
- String modelElementId;
- if (ModelUtil.isIgnoredDatatype(modelElement)) {
- // create random ID for generic types, won't get serialized
- // anyway
- modelElementId = org.eclipse.emf.emfstore.internal.common.model.ModelFactory.eINSTANCE
- .createModelElementId().getId();
- } else {
- modelElementId = resource.getID(modelElement);
- }
-
- if (modelElementId == null) {
- throw new ESException("Failed to retrieve ID for EObject contained in project: " //$NON-NLS-1$
- + modelElement);
- }
-
- eObjectToIdMap.put(modelElement, modelElementId);
- idToEObjectMap.put(modelElementId, modelElement);
- }
-
- collection.initMapping(eObjectToIdMap, idToEObjectMap);
- }
-
- eObjectList.add((T) o);
- }
- resource.getContents().clear();
-
- } catch (final IOException ex) {
- ModelUtil.logException(ex);
- }
- return eObjectList;
- }
-
- /**
- * converts an {@link InputStream} to a single {@link EObject}
- *
- * @param is the InputStream
- * @return the EObject
- * @throws ESException
- */
- public static <T extends EObject> T getEObjectFromInputStream(
- final InputStream is) throws ESException {
-
- final List<T> eObjectListFromInputStream = getEObjectListFromInputStream(is);
-
- return eObjectListFromInputStream.get(0);
- }
-
- /**
- * converts an {@link InputStream} to a list of {@link EObject}, for example: List<ProjectInfo>, List<BranchInfo>,
- * ...
- *
- * @param response the Response
- * @return the list of EObjects
- * @throws ESException
- */
- public static <T extends EObject> List<T> getEObjectListFromResponse(
- final Response response) throws ESException {
-
- final InputStream is = response.readEntity(InputStream.class);
-
- return getEObjectListFromInputStream(is);
- }
-
- /**
- * converts an {@link InputStream} to a single {@link EObject}
- *
- * @param response the Response
- * @return the EObject
- * @throws ESException
- */
- public static <T extends EObject> T getEObjectFromResponse(
- final Response response) throws ESException {
-
- final List<T> eObjectListFromResponse = getEObjectListFromResponse(response);
-
- return eObjectListFromResponse.get(0);
-
- }
-
- /**
- * convert a String representing the id of a {@link ProjectId} into a {@link ProjectId}
- *
- * @param projectIdAsString
- * @return the ProjectId
- */
- public static ProjectId createProjectIdFromString(String projectIdAsString) {
-
- final ProjectId projectId = ModelFactory.eINSTANCE.createProjectId();
- projectId.setId(projectIdAsString);
- return projectId;
- }
-
- /**
- * create a {@link PrimaryVersionSpec} from a String representing it
- *
- * @param sourceVersionSpecAsString
- * @return the PrimaryVersionSpec
- */
- public static PrimaryVersionSpec createPrimaryVersionSpecFromString(String sourceVersionSpecAsString) {
-
- final PrimaryVersionSpec source = VersioningFactory.eINSTANCE.createPrimaryVersionSpec();
- source.setIdentifier(Integer.valueOf(sourceVersionSpecAsString));
- return source;
- }
-
- /**
- * convert a String representing a {@link TagVersionSpec} into the {@link TagVersionSpec}
- *
- * @param tagVersionSpecAsString
- * @return the TagVersionSpec
- */
- public static TagVersionSpec createTagVersionSpecFromString(String tagVersionSpecAsString) {
- final TagVersionSpec tagVersionSpec = VersioningFactory.eINSTANCE.createTagVersionSpec();
- tagVersionSpec.setName(tagVersionSpecAsString);
- return tagVersionSpec;
- }
-
- /**
- * convert a String into its representing {@link FileIdentifier}
- *
- * @param fileIdentifierAsString
- * @return the FileIdentifier
- */
- public static FileIdentifier createFileIdentifierFromString(String fileIdentifierAsString) {
- final FileIdentifier fileIdentifier = ModelFactory.eINSTANCE.createFileIdentifier();
- fileIdentifier.setIdentifier(fileIdentifierAsString);
- return fileIdentifier;
- }
-
- /**
- * create the Response entity message for an {@link ESException} {@link Response}
- *
- * @param exception the ESException
- * @return the Response String
- */
- public static String createResponseMessageForExceptionResponse(ESException exception) {
- String exceptionMessage = exception.getMessage();
- if (exceptionMessage == null || exceptionMessage.isEmpty()) {
- exceptionMessage = " "; //$NON-NLS-1$
- }
- final String message = exception.getClass().getName() + EXCEPTION_MESSAGE_SEPERATOR + exceptionMessage;
- return message;
- }
-
- /**
- * get the class name and message of the exception that the response entity is describing. the entity was created
- * with createResponseMessageForExceptionResponse(ESException exception)
- *
- * @param entity the response entity which was created by TransferUtil.createResponseMessageForExceptionResponse()
- * @return the {@link ESException} that the entity has represented, null if no match possible
- */
- public static ESException getExceptionFromExceptionResponse(String entity) {
-
- if (entity == null || !entity.contains(EXCEPTION_MESSAGE_SEPERATOR)) {
- return null;
- }
-
- final String[] strings = entity.split(EXCEPTION_MESSAGE_SEPERATOR);
-
- if (strings.length != 2) {
- return null;
- }
-
- final String className = strings[0];
- final String message = strings[1];
-
- return getSpecificESException(className, message);
- }
-
- /**
- * create a subclass of {@link ESException} from the given className
- *
- * @param className the type of ESException that should be returned
- * @param message the message of the Exception. can be null
- * @return the subclass instance
- */
- private static ESException getSpecificESException(String className, String message) {
-
- // check the class type of the ESException and return it with its message
- if (className.equals(AccessControlException.class.getName())) {
- return new AccessControlException(message);
- }
- if (className.equals(ClientVersionOutOfDateException.class.getName())) {
- return new ClientVersionOutOfDateException(message);
- }
- if (className.equals(ServerKeyStoreException.class.getName())) {
- return new ServerKeyStoreException(message);
- }
- if (className.equals(SessionTimedOutException.class.getName())) {
- return new SessionTimedOutException(message);
- }
- if (className.equals(ConnectionException.class.getName())) {
- return new ConnectionException(message);
- }
- if (className.equals(ESUpdateRequiredException.class.getName())) {
- return new ESUpdateRequiredException();
- }
- if (className.equals(FileTransferException.class.getName())) {
- return new FileTransferException(message);
- }
- if (className.equals(FileNotOnServerException.class.getName())) {
- return new FileNotOnServerException(message);
- }
- if (className.equals(InvalidInputException.class.getName())) {
- return new InvalidInputException(message);
- }
- if (className.equals(InvalidProjectIdException.class.getName())) {
- return new InvalidProjectIdException(message);
- }
- if (className.equals(InvalidVersionSpecException.class.getName())) {
- return new InvalidVersionSpecException(message);
- }
- if (className.equals(SerializationException.class.getName())) {
- return new SerializationException(message);
- }
- if (className.equals(StorageException.class.getName())) {
- return new StorageException(message);
- }
- if (className.equals(UnknownSessionException.class.getName())) {
- return new UnknownSessionException(message);
- }
-
- // default behavior if previous matches didn't apply
- return new ESException(message);
-
- }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax.server/.classpath b/org.eclipse.emf.emfstore.jax.server/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.emf.emfstore.jax.server/.project b/org.eclipse.emf.emfstore.jax.server/.project
deleted file mode 100644
index 53554cc..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.emfstore.jax.server</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.core.resources.prefs b/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f548abb..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-
-encoding//model/etypes.ecore=UTF-8
-
-
-encoding/<project>=UTF-8
diff --git a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 83b8580..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,418 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-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.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-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.maxProblemPerUnit=100
-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.explicitlyClosedAutoCloseable=ignore
-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.includeNullInfoFromAsserts=disabled
-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.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-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.missingJavadocTagsMethodTypeParameters=disabled
-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=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=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.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=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.unusedTypeParameter=ignore
-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,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-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=0
-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=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_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=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-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=4
-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=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not 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=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not 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=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=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-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=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-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
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb2352..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 791508d..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,115 +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=false
-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=true
-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=true
-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=false
-cleanup.remove_unnecessary_nls_tags=false
-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=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><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) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \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 * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" 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 ${user}\r\n *\r\n * ${tags}\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\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><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">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><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">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" 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}\r\n// ${todo} Auto-generated constructor stub</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=true
-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=true
-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=true
-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=true
-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=false
-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/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 864e30f..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.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/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 4f9ce07..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,97 +0,0 @@
-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
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=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=Warning
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
-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
-MISSING_EE_DESCRIPTIONS=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=Warning
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Warning
-malformed_since_tag=Warning
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.pde.prefs b/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 0bbee3c..0000000
--- a/org.eclipse.emf.emfstore.jax.server/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,32 +0,0 @@
-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.encodings=2
-compilers.p.build.java.compiler=2
-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=1
-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/org.eclipse.emf.emfstore.jax.server/META-INF/MANIFEST.MF b/org.eclipse.emf.emfstore.jax.server/META-INF/MANIFEST.MF
deleted file mode 100644
index 9b355cd..0000000
--- a/org.eclipse.emf.emfstore.jax.server/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EMFStore JAX RS Server Plugin
-Bundle-SymbolicName: org.eclipse.emf.emfstore.jax.server;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/projects-consumer.xml,OSGI-INF/branches-consumer.xml,OSGI-INF/histories-consumer.xml,OSGI-INF/users-consumer.xml,
- OSGI-INF/packages-consumer.xml
-Require-Bundle: org.eclipse.emf.emfstore.jax.server.services;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.2.0,2.0.0)"
-Export-Package: org.eclipse.emf.emfstore.jax.server;version="1.2.0";uses:="org.eclipse.emf.emfstore.internal.server.accesscontrol,org.eclipse.emf.emfstore.internal.server,org.eclipse.emf.emfstore.internal.server.connection"
diff --git a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/branches-consumer.xml b/org.eclipse.emf.emfstore.jax.server/OSGI-INF/branches-consumer.xml
deleted file mode 100644
index 9b48a83..0000000
--- a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/branches-consumer.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="branchesC">
- <implementation class="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- <reference bind="setBranches" cardinality="1..1" interface="org.eclipse.emf.emfstore.jax.server.resources.IBranches" name="branches" policy="static" unbind="unsetBranches"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- </service>
-
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/histories-consumer.xml b/org.eclipse.emf.emfstore.jax.server/OSGI-INF/histories-consumer.xml
deleted file mode 100644
index 96db9eb..0000000
--- a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/histories-consumer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="historiesC">
- <implementation class="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- <reference bind="setHistories" cardinality="1..1" interface="org.eclipse.emf.emfstore.jax.server.resources.IHistories" name="histories" policy="static" unbind="unsetHistories"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- </service>
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/packages-consumer.xml b/org.eclipse.emf.emfstore.jax.server/OSGI-INF/packages-consumer.xml
deleted file mode 100644
index c7860ac..0000000
--- a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/packages-consumer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="packagesC">
- <implementation class="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- <reference bind="setPackages" cardinality="1..1" interface="org.eclipse.emf.emfstore.jax.server.resources.IPackages" name="IPackages" policy="static" unbind="unsetPackages"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- </service>
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/projects-consumer.xml b/org.eclipse.emf.emfstore.jax.server/OSGI-INF/projects-consumer.xml
deleted file mode 100644
index 4cab6e5..0000000
--- a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/projects-consumer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="projectsC">
- <implementation class="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- <reference bind="setProjects" cardinality="1..1" interface="org.eclipse.emf.emfstore.jax.server.resources.IProjects" name="projects" policy="static" unbind="unsetProjects"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- </service>
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/users-consumer.xml b/org.eclipse.emf.emfstore.jax.server/OSGI-INF/users-consumer.xml
deleted file mode 100644
index 584aba7..0000000
--- a/org.eclipse.emf.emfstore.jax.server/OSGI-INF/users-consumer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="usersC">
- <implementation class="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler"/>
- </service>
- <reference bind="setUsers" cardinality="1..1" interface="org.eclipse.emf.emfstore.jax.server.resources.IUsers" name="IUsers" policy="static" unbind="unsetUsers"/>
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax.server/build.properties b/org.eclipse.emf.emfstore.jax.server/build.properties
deleted file mode 100644
index c08fff9..0000000
--- a/org.eclipse.emf.emfstore.jax.server/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- OSGI-INF/users-consumer.xml,\
- OSGI-INF/packages-consumer.xml
-source.. = src/
diff --git a/org.eclipse.emf.emfstore.jax.server/plugin.xml b/org.eclipse.emf.emfstore.jax.server/plugin.xml
deleted file mode 100644
index b7f5c11..0000000
--- a/org.eclipse.emf.emfstore.jax.server/plugin.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.emf.emfstore.server.connectionHandler">
- <connectionHandler
- class="org.eclipse.emf.emfstore.jax.server.JaxrsConnectionHandler">
- </connectionHandler>
- </extension>
-</plugin>
diff --git a/org.eclipse.emf.emfstore.jax.server/src/org/eclipse/emf/emfstore/jax/server/JaxrsConnectionHandler.java b/org.eclipse.emf.emfstore.jax.server/src/org/eclipse/emf/emfstore/jax/server/JaxrsConnectionHandler.java
deleted file mode 100644
index 00ed4f5..0000000
--- a/org.eclipse.emf.emfstore.jax.server/src/org/eclipse/emf/emfstore/jax/server/JaxrsConnectionHandler.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH 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:
- * Pascal - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emf.emfstore.jax.server;
-
-import org.eclipse.emf.emfstore.internal.server.EMFStore;
-import org.eclipse.emf.emfstore.internal.server.accesscontrol.AccessControl;
-import org.eclipse.emf.emfstore.internal.server.connection.ConnectionHandler;
-import org.eclipse.emf.emfstore.internal.server.exceptions.FatalESException;
-import org.eclipse.emf.emfstore.jax.server.resources.Branches;
-import org.eclipse.emf.emfstore.jax.server.resources.Histories;
-import org.eclipse.emf.emfstore.jax.server.resources.IBranches;
-import org.eclipse.emf.emfstore.jax.server.resources.IHistories;
-import org.eclipse.emf.emfstore.jax.server.resources.IPackages;
-import org.eclipse.emf.emfstore.jax.server.resources.IProjects;
-import org.eclipse.emf.emfstore.jax.server.resources.IUsers;
-import org.eclipse.emf.emfstore.jax.server.resources.Packages;
-import org.eclipse.emf.emfstore.jax.server.resources.Projects;
-import org.eclipse.emf.emfstore.jax.server.resources.Users;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- * Connection Handler for JAX-RS EMFStore interface
- *
- * @author Pascal Schliski
- *
- */
-@SuppressWarnings("restriction")
-public class JaxrsConnectionHandler implements ConnectionHandler<EMFStore> {
-
- // TODO: delete iVariables + set Instances null in unset methods!!!
-
- private static final String NAME = "JAX-RS Connection Handler"; //$NON-NLS-1$
-
- /**
- * the service references which are retrieved by the set/unset-methods for the declarative service consumption
- */
- private IProjects iProjects;
- private IBranches iBranches;
- private IHistories iHistories;
- private IUsers iUsers;
- private IPackages iPackages;
-
- /**
- * the service references of the actual running services
- *
- * TODO static because this class is instanstiated multiple times by the framework
- */
- private static Branches BRANCHES_INSTANCE;
- private static Histories HISTORIES_INSTANCE;
- private static Projects PROJECTS_INSTANCE;
- private static Users USERS_INSTANCE;
- private static Packages PACKAGES_INSTANCE;
- private static EMFStore EMFSTORE_INSTANCE;
- private static AccessControl ACCESSCONTROL_INSTANCE;
-
- /**
- * {@inheritDoc}
- *
- * get the ServiceReferences and initialise variables there
- *
- * @see org.eclipse.emf.emfstore.internal.server.connection.ConnectionHandler#init(org.eclipse.emf.emfstore.internal.server.EMFStoreInterface,
- * org.eclipse.emf.emfstore.internal.server.accesscontrol.AccessControl)
- */
- public void init(EMFStore emfStore, AccessControl accessControl) throws FatalESException, ESException {
-
- JaxrsConnectionHandler.EMFSTORE_INSTANCE = emfStore;
- JaxrsConnectionHandler.ACCESSCONTROL_INSTANCE = accessControl;
-
- if (BRANCHES_INSTANCE != null) {
- BRANCHES_INSTANCE.init(emfStore, accessControl);
- }
-
- if (HISTORIES_INSTANCE != null) {
- HISTORIES_INSTANCE.init(emfStore, accessControl);
- }
-
- if (PROJECTS_INSTANCE != null) {
- PROJECTS_INSTANCE.init(emfStore, accessControl);
- }
-
- if (USERS_INSTANCE != null) {
- USERS_INSTANCE.init(emfStore, accessControl);
- }
-
- if (PACKAGES_INSTANCE != null) {
- PACKAGES_INSTANCE.init(emfStore, accessControl);
- }
-
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.connection.ConnectionHandler#stop()
- */
- public void stop() {
-
- // nothing to do
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.internal.server.connection.ConnectionHandler#getName()
- */
- public String getName() {
-
- return NAME;
- }
-
- /**
- * the set method for the Projects service consumption. Inits the running service if already possible
- *
- * @param projects
- */
- public synchronized void setProjects(IProjects projects) {
- iProjects = projects;
- PROJECTS_INSTANCE = Projects.class.cast(iProjects);
- if (EMFSTORE_INSTANCE != null && ACCESSCONTROL_INSTANCE != null) {
- PROJECTS_INSTANCE.init(EMFSTORE_INSTANCE, ACCESSCONTROL_INSTANCE);
- }
- }
-
- /**
- * the unset method of the Projects service consumption
- *
- * @param projects
- */
- public synchronized void unsetProjects(IProjects projects) {
- if (iProjects == projects) {
- iProjects = null;
- }
- }
-
- /**
- * the set method for the Branches service consumption. Inits the running service if already possible
- *
- * @param branches
- */
- public synchronized void setBranches(IBranches branches) {
- iBranches = branches;
- BRANCHES_INSTANCE = Branches.class.cast(iBranches);
- if (EMFSTORE_INSTANCE != null && ACCESSCONTROL_INSTANCE != null) {
- BRANCHES_INSTANCE.init(EMFSTORE_INSTANCE, ACCESSCONTROL_INSTANCE);
- }
- }
-
- /**
- * the unset method of the Branches service consumption
- *
- * @param branches
- */
- public synchronized void unsetBranches(IBranches branches) {
- if (iBranches == branches) {
- iBranches = null;
- }
- }
-
- /**
- * the set method for the Histories service consumption. Inits the running service if already possible
- *
- * @param histories
- */
- public synchronized void setHistories(IHistories histories) {
- iHistories = histories;
- HISTORIES_INSTANCE = Histories.class.cast(iHistories);
- if (EMFSTORE_INSTANCE != null && ACCESSCONTROL_INSTANCE != null) {
- HISTORIES_INSTANCE.init(EMFSTORE_INSTANCE, ACCESSCONTROL_INSTANCE);
- }
- }
-
- /**
- * the unset method of the Histories service consumption
- *
- * @param histories
- */
- public synchronized void unsetHistories(IHistories histories) {
- if (iHistories == histories) {
- iHistories = null;
- }
- }
-
- /**
- * the set method for the Users service consumption. Inits the running service if already possible
- *
- * @param users
- */
- public synchronized void setUsers(IUsers users) {
- iUsers = users;
- USERS_INSTANCE = Users.class.cast(iUsers);
- if (EMFSTORE_INSTANCE != null && ACCESSCONTROL_INSTANCE != null) {
- USERS_INSTANCE.init(EMFSTORE_INSTANCE, ACCESSCONTROL_INSTANCE);
- }
- }
-
- /**
- * the unset method of the Users service consumption
- *
- * @param users
- */
- public synchronized void unsetUsers(IUsers users) {
- if (iUsers == users) {
- iUsers = null;
- }
- }
-
- /**
- * the set method for the Packages service consumption. Inits the running service if already possible
- *
- * @param packages
- */
- public synchronized void setPackages(IPackages packages) {
- iPackages = packages;
- PACKAGES_INSTANCE = Packages.class.cast(iPackages);
- if (EMFSTORE_INSTANCE != null && ACCESSCONTROL_INSTANCE != null) {
- PACKAGES_INSTANCE.init(EMFSTORE_INSTANCE, ACCESSCONTROL_INSTANCE);
- }
- }
-
- /**
- * the unset method of the Packages service consumption
- *
- * @param packages
- */
- public synchronized void unsetPackages(IPackages packages) {
- if (iPackages == packages) {
- iPackages = null;
- }
- }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/.checkstyle b/org.eclipse.emf.emfstore.jax2/.checkstyle
deleted file mode 100644
index c758032..0000000
--- a/org.eclipse.emf.emfstore.jax2/.checkstyle
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
- <local-check-config name="ESM Checkstyle" location="http://download.eclipse.org/emfclient/config/esmCheckstyle.xml" type="remote" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1375458582796_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1375458582796_cache.xml"/>
- </local-check-config>
- <fileset name="all" enabled="true" check-config-name="ESM Checkstyle" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
diff --git a/org.eclipse.emf.emfstore.jax2/.classpath b/org.eclipse.emf.emfstore.jax2/.classpath
deleted file mode 100644
index 16d067f..0000000
--- a/org.eclipse.emf.emfstore.jax2/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.emf.emfstore.jax2/.project b/org.eclipse.emf.emfstore.jax2/.project
deleted file mode 100644
index 8fe1283..0000000
--- a/org.eclipse.emf.emfstore.jax2/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.emfstore.jax.server.services</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ds.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.core.resources.prefs b/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f548abb..0000000
--- a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-
-encoding//model/etypes.ecore=UTF-8
-
-
-encoding/<project>=UTF-8
diff --git a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 83b8580..0000000
--- a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,418 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-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.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-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.maxProblemPerUnit=100
-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.explicitlyClosedAutoCloseable=ignore
-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.includeNullInfoFromAsserts=disabled
-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.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-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.missingJavadocTagsMethodTypeParameters=disabled
-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=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=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.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=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.unusedTypeParameter=ignore
-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,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-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=0
-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=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_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=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-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=4
-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=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not 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=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not 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=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=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-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=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-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
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.jdt.launching.prefs b/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb2352..0000000
--- a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 791508d..0000000
--- a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,115 +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=false
-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=true
-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=true
-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=false
-cleanup.remove_unnecessary_nls_tags=false
-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=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><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) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \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 * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" 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 ${user}\r\n *\r\n * ${tags}\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\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><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">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><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">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" 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}\r\n// ${todo} Auto-generated constructor stub</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=true
-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=true
-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=true
-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=true
-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=false
-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/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 864e30f..0000000
--- a/org.eclipse.emf.emfstore.jax2/.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/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 4f9ce07..0000000
--- a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,97 +0,0 @@
-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
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=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=Warning
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
-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
-MISSING_EE_DESCRIPTIONS=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=Warning
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Warning
-malformed_since_tag=Warning
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.pde.prefs b/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 0bbee3c..0000000
--- a/org.eclipse.emf.emfstore.jax2/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,32 +0,0 @@
-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.encodings=2
-compilers.p.build.java.compiler=2
-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=1
-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/org.eclipse.emf.emfstore.jax2/META-INF/MANIFEST.MF b/org.eclipse.emf.emfstore.jax2/META-INF/MANIFEST.MF
deleted file mode 100644
index b825b0d..0000000
--- a/org.eclipse.emf.emfstore.jax2/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EMFStore JAX RS Server Services Plugin
-Bundle-SymbolicName: org.eclipse.emf.emfstore.jax.server.services;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.emf.emfstore.jax.server.Activator
-Require-Bundle: org.eclipse.emf.emfstore.server;bundle-version="[1.2.0,2.0.0)",
- javax.ws.rs-api;bundle-version="[2.0.0,3.0.0)",
- com.eclipsesource.jaxrs.provider.security;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.emfstore.server.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.emfstore.jax.common;bundle-version="[1.2.0,2.0.0)"
-Export-Package: org.eclipse.emf.emfstore.jax.server;version="1.2.0",
- org.eclipse.emf.emfstore.jax.server.resources;version="1.2.0";x-internal:=true,
- org.eclipse.emf.emfstore.jax.server.security;version="1.2.0";x-internal:=true
-Service-Component: OSGI-INF/projects-component.xml,OSGI-INF/branches-component.xml,OSGI-INF/histories-component.xml,OSGI-INF/users-component.xml,
- OSGI-INF/packages-component.xml
diff --git a/org.eclipse.emf.emfstore.jax2/OSGI-INF/branches-component.xml b/org.eclipse.emf.emfstore.jax2/OSGI-INF/branches-component.xml
deleted file mode 100644
index 7204675..0000000
--- a/org.eclipse.emf.emfstore.jax2/OSGI-INF/branches-component.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="branches">
- <implementation class="org.eclipse.emf.emfstore.jax.server.resources.Branches"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.resources.IBranches"/>
- </service>
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax2/OSGI-INF/histories-component.xml b/org.eclipse.emf.emfstore.jax2/OSGI-INF/histories-component.xml
deleted file mode 100644
index 4987e49..0000000
--- a/org.eclipse.emf.emfstore.jax2/OSGI-INF/histories-component.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="histories">
- <implementation class="org.eclipse.emf.emfstore.jax.server.resources.Histories"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.resources.IHistories"/>
- </service>
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax2/OSGI-INF/packages-component.xml b/org.eclipse.emf.emfstore.jax2/OSGI-INF/packages-component.xml
deleted file mode 100644
index 8f30798..0000000
--- a/org.eclipse.emf.emfstore.jax2/OSGI-INF/packages-component.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="packages">
- <implementation class="org.eclipse.emf.emfstore.jax.server.resources.Packages"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.resources.IPackages"/>
- </service>
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax2/OSGI-INF/projects-component.xml b/org.eclipse.emf.emfstore.jax2/OSGI-INF/projects-component.xml
deleted file mode 100644
index fc23d41..0000000
--- a/org.eclipse.emf.emfstore.jax2/OSGI-INF/projects-component.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="projects">
- <implementation class="org.eclipse.emf.emfstore.jax.server.resources.Projects"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.resources.IProjects"/>
- </service>
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax2/OSGI-INF/users-component.xml b/org.eclipse.emf.emfstore.jax2/OSGI-INF/users-component.xml
deleted file mode 100644
index 431e5fb..0000000
--- a/org.eclipse.emf.emfstore.jax2/OSGI-INF/users-component.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="users">
- <implementation class="org.eclipse.emf.emfstore.jax.server.resources.Users"/>
- <service>
- <provide interface="org.eclipse.emf.emfstore.jax.server.resources.IUsers"/>
- </service>
-</scr:component>
diff --git a/org.eclipse.emf.emfstore.jax2/build.properties b/org.eclipse.emf.emfstore.jax2/build.properties
deleted file mode 100644
index 96d2559..0000000
--- a/org.eclipse.emf.emfstore.jax2/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- OSGI-INF/projects-component.xml,\
- OSGI-INF/branches-component.xml,\
- OSGI-INF/histories-component.xml,\
- OSGI-INF/,\
- OSGI-INF/users-component.xml,\
- OSGI-INF/packages-component.xml
-source.. = src/
diff --git a/org.eclipse.emf.emfstore.jax2/plugin.xml b/org.eclipse.emf.emfstore.jax2/plugin.xml
deleted file mode 100644
index 5535690..0000000
--- a/org.eclipse.emf.emfstore.jax2/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-</plugin>
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/Activator.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/Activator.java
deleted file mode 100644
index 33a0661..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/Activator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server;
-
-import javax.ws.rs.ext.ExceptionMapper;
-
-import org.eclipse.emf.emfstore.jax.server.resources.ESExceptionMapper;
-import org.eclipse.emf.emfstore.jax.server.security.SecurityHandler;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-import com.eclipsesource.jaxrs.provider.security.AuthenticationHandler;
-import com.eclipsesource.jaxrs.provider.security.AuthorizationHandler;
-
-/**
- * activator class
- *
- * @author Pascal Schliski
- *
- */
-public class Activator implements BundleActivator {
-
- private ServiceRegistration<AuthenticationHandler> authenticationRegistration;
- private ServiceRegistration<AuthorizationHandler> authorizationRegistration;
- @SuppressWarnings("rawtypes")
- private ServiceRegistration<ExceptionMapper> esExceptionMapperRegistration;
-
- /**
- * {@inheritDoc}
- *
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
-
- registerSecurityService(context);
-
- registerESExceptionMapper(context);
-
- }
-
- /**
- * register an {@link ExceptionMapper} for mapping any {@link ESException}
- *
- * @param context
- */
- private void registerESExceptionMapper(BundleContext context) {
- final ExceptionMapper<ESException> esExceptionMapper = new ESExceptionMapper();
- esExceptionMapperRegistration = context.registerService(ExceptionMapper.class, esExceptionMapper, null);
- }
-
- /**
- * register a {@link AuthenticationHandler} and {@link AuthorizationHandler} for authentication and authorization
- *
- * @param context
- */
- private void registerSecurityService(BundleContext context) {
- final SecurityHandler securityService = new SecurityHandler();
- authenticationRegistration = context.registerService(AuthenticationHandler.class, securityService, null);
- authorizationRegistration = context.registerService(AuthorizationHandler.class, securityService, null);
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
-
- // unregister the services
- authenticationRegistration.unregister();
- authorizationRegistration.unregister();
- esExceptionMapperRegistration.unregister();
-
- }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Branches.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Branches.java
deleted file mode 100644
index 7e51e09..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Branches.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.BRANCHES_PATH_COMPLETE;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECT_ID_PATH_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.convertEObjectsToXmlIntoStreamingOutput;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.createProjectIdFromString;
-
-import java.util.List;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.StreamingOutput;
-
-import org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation;
-import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.BranchInfo;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- * the Branches JAX-RS resource class
- *
- * @author Pascal Schliski
- *
- */
-@Path(BRANCHES_PATH_COMPLETE)
-@SuppressWarnings("restriction")
-public class Branches extends EmfStoreJaxrsResource implements IBranches {
-
- @GET
- @Produces({ MediaType.APPLICATION_XML })
- public Response getBranches(@PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
-
- final AuthenticationInformation authenticationInformation = logIn();
- final List<BranchInfo> branches = emfStore.getBranches(authenticationInformation.getSessionId(), projectId);
- logOut(authenticationInformation);
-
- final StreamingOutput streamingOutput = convertEObjectsToXmlIntoStreamingOutput(branches);
- return Response.ok(streamingOutput).build();
-
- }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/ESExceptionMapper.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/ESExceptionMapper.java
deleted file mode 100644
index 869221f..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/ESExceptionMapper.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH 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:
- * Pascal - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.createResponseMessageForExceptionResponse;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.FileNotOnServerException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.InvalidProjectIdException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.InvalidVersionSpecException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.ServerKeyStoreException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.StorageException;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- * Class for mapping a thrown {@link ESException} to a proper Response with a body that contains the ecxeption message
- *
- * @author Pascal Schliski
- *
- */
-@Provider
-@SuppressWarnings("restriction")
-public class ESExceptionMapper implements ExceptionMapper<ESException> {
-
- /**
- * {@inheritDoc}
- *
- * @see javax.ws.rs.ext.ExceptionMapper#toResponse(java.lang.Throwable)
- */
- public Response toResponse(ESException exception) {
-
- if (isInternalServerErrorException(exception)) {
- return createResponse(exception, Status.INTERNAL_SERVER_ERROR);
- }
- if (isUnauthorizedException(exception)) {
- return createResponse(exception, Status.UNAUTHORIZED);
- }
- if (isNotFoundException(exception)) {
- return createResponse(exception, Status.NOT_FOUND);
- }
-
- return createResponse(exception, Status.BAD_REQUEST);
-
- }
-
- /**
- * @param exception
- * @return true if the exception is of HTTP status code 404: Not Found, false otherwise
- */
- private boolean isNotFoundException(ESException exception) {
-
- if (exception instanceof FileNotOnServerException || exception instanceof InvalidProjectIdException
- || exception instanceof InvalidVersionSpecException) {
- return true;
- }
-
- return false;
- }
-
- /**
- * @param exception
- * @return true if the exception is of HTTP status code 401: Unauthorized, false otherwise
- */
- private boolean isUnauthorizedException(ESException exception) {
-
- if (exception instanceof AccessControlException) {
- return true;
- }
-
- return false;
- }
-
- /**
- * @param exception
- * @return true if the exception is of HTTP status code 500 Internal Server Error, false otherwise
- */
- private boolean isInternalServerErrorException(ESException exception) {
-
- if (exception instanceof ServerKeyStoreException || exception instanceof StorageException) {
- return true;
- }
-
- return false;
- }
-
- /**
- * create an {@link Response} with the given status code and a message body which contains the exception message as
- * entity (plain text data format)
- *
- * @param exception the thrown exception
- * @param status the HTTP status code ({@link Status})
- * @return the HTTP {@link Response}
- */
- private Response createResponse(ESException exception, Status status) {
- return Response.status(status).
- entity(createResponseMessageForExceptionResponse(exception)).
- type(MediaType.TEXT_PLAIN).
- build();
- }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/EmfStoreJaxrsResource.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/EmfStoreJaxrsResource.java
deleted file mode 100644
index d0f4ba2..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/EmfStoreJaxrsResource.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.SecurityContext;
-
-import org.eclipse.emf.emfstore.internal.server.EMFStore;
-import org.eclipse.emf.emfstore.internal.server.accesscontrol.AccessControl;
-import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
-import org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation;
-import org.eclipse.emf.emfstore.jax.server.security.User;
-
-/**
- * super class for all resource classes containing an EMFStore instance and an AccessControl instance
- *
- * @author Pascal Schliski
- *
- */
-@SuppressWarnings("restriction")
-public abstract class EmfStoreJaxrsResource {
-
- protected EMFStore emfStore;
- protected AccessControl accessControl;
-
- @Context
- SecurityContext securityContext;
-
- /**
- * @param emfStore
- * @param accessControl
- */
- public EmfStoreJaxrsResource(EMFStore emfStore, AccessControl accessControl) {
-
- this.emfStore = emfStore;
- this.accessControl = accessControl;
- }
-
- /**
- * init() needs to be called to get it working!
- */
- public EmfStoreJaxrsResource() {
-
- emfStore = null;
- accessControl = null;
- }
-
- /**
- * this class has to either be contructed by public EmfStoreJaxrsResource(EMFStore emfStore, AccessControl
- * accessControl) or initialized via this method
- *
- * @param emfStore
- * @param accessControl
- */
- public void init(EMFStore emfStore, AccessControl accessControl) {
-
- this.emfStore = emfStore;
- this.accessControl = accessControl;
- }
-
- protected AuthenticationInformation logIn() throws AccessControlException {
-
- final User user = (User) securityContext.getUserPrincipal();
-
- final AuthenticationInformation authenticationInformation = accessControl.logIn(user.getName(),
- user.getPassword(), null);
-
- return authenticationInformation;
-
- }
-
- protected void logOut(AuthenticationInformation authenticationInformation) throws AccessControlException {
- accessControl.logout(authenticationInformation.getSessionId());
- }
-
- // /**
- // * convert a String representing the id of a {@link ProjectId} into a {@link ProjectId}
- // *
- // * @param projectIdAsString
- // * @return
- // */
- // protected ProjectId createProjectIdFromString(String projectIdAsString) {
- //
- // final ProjectId projectId = ModelFactory.eINSTANCE.createProjectId();
- // projectId.setId(projectIdAsString);
- // return projectId;
- // }
- //
- // /**
- // * create a {@link PrimaryVersionSpec} from a String representing it
- // *
- // * @param sourceVersionSpecAsString
- // * @return
- // */
- // protected PrimaryVersionSpec createPrimaryVersionSpecFromString(String sourceVersionSpecAsString) {
- //
- // final PrimaryVersionSpec source = VersioningFactory.eINSTANCE.createPrimaryVersionSpec();
- // source.setIdentifier(Integer.valueOf(sourceVersionSpecAsString));
- // return source;
- // }
- //
- // /**
- // * convert a String representing a {@link TagVersionSpec} into the {@link TagVersionSpec}
- // *
- // * @param tagVersionSpecAsString
- // * @return
- // */
- // protected TagVersionSpec createTagVersionSpecFromString(String tagVersionSpecAsString) {
- // final TagVersionSpec tagVersionSpec = VersioningFactory.eINSTANCE.createTagVersionSpec();
- // tagVersionSpec.setName(tagVersionSpecAsString);
- // return tagVersionSpec;
- // }
- //
- // /**
- // * convert a String into its representing {@link FileIdentifier}
- // *
- // * @param fileIdentifierAsString
- // * @return
- // */
- // protected FileIdentifier createFileIdentifierFromString(String fileIdentifierAsString) {
- // final FileIdentifier fileIdentifier = ModelFactory.eINSTANCE.createFileIdentifier();
- // fileIdentifier.setIdentifier(fileIdentifierAsString);
- // return fileIdentifier;
- // }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Histories.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Histories.java
deleted file mode 100644
index f469c08..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Histories.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.BASE_URI;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.HISTORIES_PATH;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECT_ID_PATH_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.convertEObjectToXmlIntoStreamingOutput;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.createProjectIdFromString;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.getEObjectFromInputStream;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.StreamingOutput;
-
-import org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation;
-import org.eclipse.emf.emfstore.internal.server.model.ProjectHistory;
-import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
-import org.eclipse.emf.emfstore.jax.common.CallParamStrings;
-import org.eclipse.emf.emfstore.jax.common.TransferUtil;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- *
- * @author Pascal Schliski
- *
- */
-@Path(HISTORIES_PATH)
-@SuppressWarnings("restriction")
-public class Histories extends EmfStoreJaxrsResource implements IHistories {
-
- @POST
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response importProjectHistoryToServer(InputStream is) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // extract necessary object from IntputStream
- final ProjectHistory projectHistory = getEObjectFromInputStream(is);
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- final ProjectId projectId = emfStore.importProjectHistoryToServer(authenticationInformation.getSessionId(),
- projectHistory);
- logOut(authenticationInformation);
-
- // create and return response
- final StreamingOutput streamingOutput = convertEObjectToXmlIntoStreamingOutput(projectId);
-
- try {
- final URI uri = new URI(BASE_URI + "/" + HISTORIES_PATH + "/" + projectId.getId()); //$NON-NLS-1$ //$NON-NLS-2$
- return Response.created(uri).entity(streamingOutput).build();
- } catch (final URISyntaxException ex) {
- return Response.serverError().build();
- }
-
- }
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}")
- @Produces({ MediaType.APPLICATION_XML })
- public Response exportProjectHistoryFromServer(
- @PathParam(CallParamStrings.PROJECT_ID_PATH_PARAM) String projectIdAsString) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // create ProjectId
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- final ProjectHistory projectHistory = emfStore.exportProjectHistoryFromServer(
- authenticationInformation.getSessionId(), projectId);
- logOut(authenticationInformation);
-
- // create the output list
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectToXmlIntoStreamingOutput(projectHistory);
-
- // return the Response
- return Response.ok(streamingOutput).build();
-
- }
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IBranches.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IBranches.java
deleted file mode 100644
index 7836ac8..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IBranches.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECT_ID_PATH_PARAM;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- *
- * @author Pascal Schliski
- *
- */
-public interface IBranches {
-
- @GET
- @Produces({ MediaType.APPLICATION_XML })
- public Response getBranches(@PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString) throws ESException;
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IHistories.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IHistories.java
deleted file mode 100644
index cf5a554b..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IHistories.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECT_ID_PATH_PARAM;
-
-import java.io.InputStream;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- *
- * @author Pascal Schliski
- *
- */
-public interface IHistories {
-
- @POST
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response importProjectHistoryToServer(InputStream is) throws ESException;
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}")
- @Produces({ MediaType.APPLICATION_XML })
- public Response exportProjectHistoryFromServer(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString) throws ESException;
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IPackages.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IPackages.java
deleted file mode 100644
index cecf51a..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IPackages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import java.io.InputStream;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- *
- * @author Pascal Schliski
- *
- */
-public interface IPackages {
-
- @POST
- @Consumes({ MediaType.APPLICATION_XML })
- public Response registerEPackage(InputStream is) throws ESException;
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IProjects.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IProjects.java
deleted file mode 100644
index a886d44..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IProjects.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.CHUNK_NUMBER_PATH_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.DELETE_FILES_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.FILE_IDENTIFIER_PATH_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.FILE_SIZE_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PRIMARY_TAG_ID;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_CHANGES;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_FILES;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_PROPERTIES;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_RESOLVE_VERSION_SPEC;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_TAGS;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_VERSIONS;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECT_ID_PATH_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.SECONDARY_TAG_ID;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.SOURCE_VERSION_SPEC_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.TARGET_VERSION_SPEC_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.VERSION_SPEC_QUERY_PARAM;
-
-import java.io.InputStream;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- *
- * @author Pascal Schliski
- *
- */
-@Path(PROJECTS_PATH)
-public interface IProjects {
-
- @GET
- @Produces({ MediaType.APPLICATION_XML })
- public Response getProjectList() throws ESException;
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}")
- @Produces({ MediaType.APPLICATION_XML })
- public Response getProject(@PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @QueryParam(VERSION_SPEC_QUERY_PARAM) String versionSpecAsString) throws ESException;
-
- @POST
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response createProject(InputStream is) throws ESException;
-
- @DELETE
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}")
- public Response deleteProject(@PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @QueryParam(DELETE_FILES_QUERY_PARAM) boolean deleteFiles) throws ESException;
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}" + "/" + PROJECTS_PATH_CHANGES)
- @Produces({ MediaType.APPLICATION_XML })
- public Response getChanges(@PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @QueryParam(SOURCE_VERSION_SPEC_QUERY_PARAM) String sourceVersionSpecAsString,
- @QueryParam(TARGET_VERSION_SPEC_QUERY_PARAM) String targetVersionSpecAsString)
- throws ESException;
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}")
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response createVersion(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException;
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_RESOLVE_VERSION_SPEC)
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response resolveVersionSpec(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException;
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_VERSIONS)
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response getHistoryInfo(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException;
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_TAGS)
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response addTag(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException;
-
- @DELETE
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_TAGS + "/{"
- + PRIMARY_TAG_ID + "}/{"
- + SECONDARY_TAG_ID + "}")
- public Response removeTag(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @PathParam(PRIMARY_TAG_ID) String primaryVersionSpecAsString,
- @PathParam(SECONDARY_TAG_ID) String tagVersionSpecAsString) throws ESException;
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_PROPERTIES)
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response setEMFProperties(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException;
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_PROPERTIES)
- @Produces({ MediaType.APPLICATION_XML })
- public Response getEMFProperties(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString) throws ESException;
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_FILES)
- @Consumes({ MediaType.WILDCARD })
- @Produces({ MediaType.WILDCARD })
- public Response uploadFileChunk(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException;
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_FILES +
- "/{" + FILE_IDENTIFIER_PATH_PARAM + "}" +
- "/{" + CHUNK_NUMBER_PATH_PARAM + "}")
- @Produces({ MediaType.WILDCARD })
- public Response downloadFileChunk(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @PathParam(FILE_IDENTIFIER_PATH_PARAM) String fileIdentifierAsString,
- @PathParam(CHUNK_NUMBER_PATH_PARAM) int chunkNumber,
- @QueryParam(FILE_SIZE_QUERY_PARAM) int fileSize) throws ESException;
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IUsers.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IUsers.java
deleted file mode 100644
index b49916b..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/IUsers.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.USER_NAME_PATH_PARAM;
-
-import java.io.InputStream;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- *
- * @author Pascal Schliski
- *
- */
-@SuppressWarnings("restriction")
-public interface IUsers {
-
- @GET
- @Path("/{" + USER_NAME_PATH_PARAM + "}")
- @Produces({ MediaType.APPLICATION_XML })
- public Response getUserDetails(@PathParam(USER_NAME_PATH_PARAM) String userName)
- throws AccessControlException, ESException;
-
- @PUT
- @Path("/{" + USER_NAME_PATH_PARAM + "}")
- @Consumes({ MediaType.APPLICATION_XML })
- public Response setUserDetails(@PathParam(USER_NAME_PATH_PARAM) String userName, InputStream is)
- throws ESException;
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Packages.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Packages.java
deleted file mode 100644
index b9d8e84..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Packages.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PACKAGES_PATH;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.getEObjectFromInputStream;
-
-import java.io.InputStream;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- *
- * @author Pascal Schliski
- *
- */
-@Path(PACKAGES_PATH)
-@SuppressWarnings("restriction")
-public class Packages extends EmfStoreJaxrsResource implements IPackages {
-
- @POST
- @Consumes({ MediaType.APPLICATION_XML })
- public Response registerEPackage(InputStream is) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // get necessary object
- final EPackage ePackage = getEObjectFromInputStream(is);
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- emfStore.registerEPackage(authenticationInformation.getSessionId(), ePackage);
- logOut(authenticationInformation);
-
- // return response
- return Response.ok().build();
-
- }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Projects.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Projects.java
deleted file mode 100644
index fb12ac3..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Projects.java
+++ /dev/null
@@ -1,571 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH 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:
- * Pascal - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.BASE_URI;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.CHUNK_NUMBER_PATH_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.DELETE_FILES_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.FILE_IDENTIFIER_PATH_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.FILE_SIZE_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PRIMARY_TAG_ID;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_CHANGES;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_FILES;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_PROPERTIES;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_RESOLVE_VERSION_SPEC;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_TAGS;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECTS_PATH_VERSIONS;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.PROJECT_ID_PATH_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.SECONDARY_TAG_ID;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.SOURCE_VERSION_SPEC_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.TARGET_VERSION_SPEC_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.VERSION_SPEC_QUERY_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.convertEObjectToXmlIntoStreamingOutput;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.convertEObjectsToXmlIntoStreamingOutput;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.convertSerializableIntoStreamingOutput;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.createFileIdentifierFromString;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.createPrimaryVersionSpecFromString;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.createProjectIdFromString;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.createTagVersionSpecFromString;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.getEObjectFromInputStream;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.getEObjectListFromInputStream;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.getFileChunkFromInputStream;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Link;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.StreamingOutput;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty;
-import org.eclipse.emf.emfstore.internal.common.model.Project;
-import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
-import org.eclipse.emf.emfstore.internal.server.filetransfer.FileChunk;
-import org.eclipse.emf.emfstore.internal.server.filetransfer.FileTransferInformation;
-import org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation;
-import org.eclipse.emf.emfstore.internal.server.model.FileIdentifier;
-import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
-import org.eclipse.emf.emfstore.internal.server.model.ProjectInfo;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.BranchVersionSpec;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryQuery;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.TagVersionSpec;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.VersionSpec;
-import org.eclipse.emf.emfstore.jax.common.TransferUtil;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- * @author Pascal Schliski
- *
- */
-@Path(PROJECTS_PATH)
-@SuppressWarnings("restriction")
-public class Projects extends EmfStoreJaxrsResource implements IProjects {
-
- @GET
- @Produces({ MediaType.APPLICATION_XML })
- public Response getProjectList() throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // get the projectList
- final AuthenticationInformation authenticationInformation = logIn();
- final java.util.List<ProjectInfo> projects = emfStore
- .getProjectList(authenticationInformation.getSessionId());
- logOut(authenticationInformation);
-
- final StreamingOutput streamingOutput = convertEObjectsToXmlIntoStreamingOutput(projects);
-
- final List<Link> links = new ArrayList<Link>();
- for (final ProjectInfo pi : projects) {
- final String projectId = pi.getProjectId().getId();
- final Link l = Link.fromUri(BASE_URI + "/" + PROJECTS_PATH + "/" + projectId).build(); //$NON-NLS-1$ //$NON-NLS-2$
- links.add(l);
- }
- final Link[] linkArray = new Link[links.size()];
- for (int i = 0; i < linkArray.length; i++) {
- linkArray[i] = links.get(i);
- }
-
- // return the Response
- return Response.ok(streamingOutput).links(linkArray).build();
-
- }
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}")
- @Produces({ MediaType.APPLICATION_XML })
- public Response getProject(@PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @QueryParam(VERSION_SPEC_QUERY_PARAM) String versionSpecAsString) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // create ProjectId and VersionSpec objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
-
- final VersionSpec versionSpec = createPrimaryVersionSpecFromString(versionSpecAsString);
-
- // make call to emfstore
- final AuthenticationInformation authenticationInformation = logIn();
- final Project project = emfStore.getProject(authenticationInformation.getSessionId(), projectId, versionSpec);
- logOut(authenticationInformation);
-
- // create the output list
- final StreamingOutput streamingOutput = convertEObjectToXmlIntoStreamingOutput(project);
-
- // return the Response
- return Response.ok(streamingOutput).build();
-
- }
-
- @POST
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response createProject(InputStream is) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- System.out.println("\n\nProjects.createProject invoked...\n\n"); //$NON-NLS-1$
-
- // extract the received data
- final List<EObject> eObjects = getEObjectListFromInputStream(is);
-
- String name = null;
- String description = null;
- LogMessage logMessage = null;
- Project project = null;
-
- for (final EObject e : eObjects) {
- if (e instanceof ProjectInfo) {
- name = ((ProjectInfo) e).getName();
- description = ((ProjectInfo) e).getDescription();
- } else if (e instanceof LogMessage) {
- logMessage = (LogMessage) e;
- } else if (e instanceof Project) {
- project = (Project) e;
- }
- }
-
- // System.out.println("\n\nProjects.createProject streaming finished. Will wait now for 2 sec...\n\n");
- //
- // try {
- // Thread.sleep(2000);
- // } catch (InterruptedException e1) {
- // e1.printStackTrace();
- // }
-
- // make call to EmfStore
- ProjectInfo projectInfo = null;
- if (project == null) {
- // user wants to create an empty project
- final AuthenticationInformation authenticationInformation = logIn();
- projectInfo = emfStore.createEmptyProject(authenticationInformation.getSessionId(), name, description,
- logMessage);
- logOut(authenticationInformation);
- } else {
- // user wants to create a non-empty project
- final AuthenticationInformation authenticationInformation = logIn();
- projectInfo = emfStore.createProject(authenticationInformation.getSessionId(), name, description,
- logMessage, project);
- logOut(authenticationInformation);
- }
-
- // create a proper response which contains: URI of the created project + its projectInfo
- final String projectId = projectInfo.getProjectId().getId(); // TODO: change!
- java.net.URI createdUri;
- try {
- createdUri = new java.net.URI(BASE_URI + "/" + PROJECTS_PATH + "/" + projectId); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (final URISyntaxException e) {
- e.printStackTrace();
- return Response.serverError().build();
- }
-
- final StreamingOutput streamingOutput = convertEObjectToXmlIntoStreamingOutput(projectInfo);
-
- System.out.println("\n\nProjects.createProject waiting finished. Will stream response now...\n\n"); //$NON-NLS-1$
-
- return Response.created(createdUri).entity(streamingOutput).build();
-
- }
-
- @DELETE
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}")
- public Response deleteProject(@PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @QueryParam(DELETE_FILES_QUERY_PARAM) boolean deleteFiles) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
-
- final AuthenticationInformation authenticationInformation = logIn();
- emfStore.deleteProject(authenticationInformation.getSessionId(), projectId, deleteFiles);
- logOut(authenticationInformation);
-
- return Response.ok().build();
- }
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}" + "/" + PROJECTS_PATH_CHANGES)
- @Produces({ MediaType.APPLICATION_XML })
- public Response getChanges(@PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @QueryParam(SOURCE_VERSION_SPEC_QUERY_PARAM) String sourceVersionSpecAsString,
- @QueryParam(TARGET_VERSION_SPEC_QUERY_PARAM) String targetVersionSpecAsString)
- throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // create ProjectId and VersionSpecs
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
- // TODO: adjust so that it not only supports PrimaryVersionSpec
- final PrimaryVersionSpec source = createPrimaryVersionSpecFromString(sourceVersionSpecAsString);
- final PrimaryVersionSpec target = createPrimaryVersionSpecFromString(targetVersionSpecAsString);
-
- // get changes from emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- final List<ChangePackage> changes = emfStore.getChanges(authenticationInformation.getSessionId(),
- projectId, source, target);
- logOut(authenticationInformation);
-
- // return the list as streaming output
- final StreamingOutput streamingOutput = convertEObjectsToXmlIntoStreamingOutput(changes);
- return Response.ok(streamingOutput).build();
-
- }
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}")
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response createVersion(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // create necessary objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
-
- final List<EObject> eObjects = getEObjectListFromInputStream(is);
-
- PrimaryVersionSpec baseVersionSpec = null;
- ChangePackage changePackage = null;
- PrimaryVersionSpec sourceVersion = null;
- LogMessage logMessage = null;
- BranchVersionSpec targetBranch = null;
-
- for (int i = 0; i < eObjects.size(); i++) {
- if (eObjects.get(i) instanceof PrimaryVersionSpec && i == 0) {
- baseVersionSpec = (PrimaryVersionSpec) eObjects.get(i);
- } else if (eObjects.get(i) instanceof PrimaryVersionSpec) {
- sourceVersion = (PrimaryVersionSpec) eObjects.get(i);
- } else if (eObjects.get(i) instanceof ChangePackage) {
- changePackage = (ChangePackage) eObjects.get(i);
- } else if (eObjects.get(i) instanceof LogMessage) {
- logMessage = (LogMessage) eObjects.get(i);
- } else if (eObjects.get(i) instanceof BranchVersionSpec) {
- targetBranch = (BranchVersionSpec) eObjects.get(i);
- }
- }
-
- // make the server call
- final AuthenticationInformation authenticationInformation = logIn();
- final PrimaryVersionSpec createVersion = emfStore.createVersion(authenticationInformation.getSessionId(),
- projectId, baseVersionSpec, changePackage, targetBranch, sourceVersion, logMessage);
- logOut(authenticationInformation);
-
- // create and return the Response
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectToXmlIntoStreamingOutput(createVersion);
- return Response.ok(streamingOutput).build();
-
- }
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/" + PROJECTS_PATH_RESOLVE_VERSION_SPEC)
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response resolveVersionSpec(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException {
-
- // create necessary objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
- final VersionSpec versionSpec = getEObjectFromInputStream(is);
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- final PrimaryVersionSpec resolvedVersionSpec = emfStore.resolveVersionSpec(
- authenticationInformation.getSessionId(), projectId, versionSpec);
- logOut(authenticationInformation);
-
- // create StreamingOutput and return response
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectToXmlIntoStreamingOutput(resolvedVersionSpec);
- return Response.ok(streamingOutput).build();
-
- }
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/" + PROJECTS_PATH_VERSIONS)
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response getHistoryInfo(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException {
-
- // create necessary objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
- final HistoryQuery<?> historyQuery = getEObjectFromInputStream(is);
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- final List<HistoryInfo> historyInfoList = emfStore.getHistoryInfo(authenticationInformation.getSessionId(),
- projectId, historyQuery);
- logOut(authenticationInformation);
-
- // create StreamingOutput and return response
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(historyInfoList);
- return Response.ok(streamingOutput).build();
-
- }
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/" + PROJECTS_PATH_TAGS)
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response addTag(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException {
-
- // create necessary objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
- final List<VersionSpec> versionSpecList = getEObjectListFromInputStream(is);
- PrimaryVersionSpec primaryVersionSpec = null;
- TagVersionSpec tagVersionSpec = null;
- for (final VersionSpec v : versionSpecList) {
- if (v instanceof PrimaryVersionSpec) {
- primaryVersionSpec = (PrimaryVersionSpec) v;
- } else if (v instanceof TagVersionSpec) {
- tagVersionSpec = (TagVersionSpec) v;
- }
- }
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- emfStore.addTag(authenticationInformation.getSessionId(), projectId, primaryVersionSpec, tagVersionSpec);
- logOut(authenticationInformation);
-
- // return response
- try {
- final URI uri = new URI(
- BASE_URI
- + "/" + PROJECTS_PATH + "/" + projectIdAsString + "/" + PROJECTS_PATH_TAGS + "/" + primaryVersionSpec.getIdentifier() + "/" + tagVersionSpec.getName()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return Response.created(uri).build();
- } catch (final URISyntaxException ex) {
- return Response.serverError().build();
- }
-
- }
-
- @DELETE
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/" + PROJECTS_PATH_TAGS + "/{"
- + PRIMARY_TAG_ID + "}/{" + SECONDARY_TAG_ID + "}")
- public Response removeTag(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @PathParam(PRIMARY_TAG_ID) String primaryVersionSpecAsString,
- @PathParam(SECONDARY_TAG_ID) String tagVersionSpecAsString
- ) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // TODO: check if compatible to all kinds of versionSpecs + URL-safe?!
- // create necessary objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
- final PrimaryVersionSpec primaryVersionSpec = createPrimaryVersionSpecFromString(primaryVersionSpecAsString);
- final TagVersionSpec tagVersionSpec = createTagVersionSpecFromString(tagVersionSpecAsString);
-
- final AuthenticationInformation authenticationInformation = logIn();
- emfStore.removeTag(authenticationInformation.getSessionId(), projectId, primaryVersionSpec, tagVersionSpec);
- logOut(authenticationInformation);
-
- return Response.ok().build();
-
- }
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/" + PROJECTS_PATH_PROPERTIES)
- @Consumes({ MediaType.APPLICATION_XML })
- @Produces({ MediaType.APPLICATION_XML })
- public Response setEMFProperties(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // create necessary objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
- final List<EMFStoreProperty> properties = getEObjectListFromInputStream(is);
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- final List<EMFStoreProperty> setEMFProperties = emfStore.setEMFProperties(
- authenticationInformation.getSessionId(), properties, projectId);
- logOut(authenticationInformation);
-
- // create StreamingOutput and return response
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(setEMFProperties);
- return Response.ok(streamingOutput).build();
-
- }
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/" + PROJECTS_PATH_PROPERTIES)
- @Produces({ MediaType.APPLICATION_XML })
- public Response getEMFProperties(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // create necessary objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- final List<EMFStoreProperty> getEMFProperties = emfStore.getEMFProperties(
- authenticationInformation.getSessionId(), projectId);
- logOut(authenticationInformation);
-
- // create StreamingOutput and return response
- final StreamingOutput streamingOutput = TransferUtil
- .convertEObjectsToXmlIntoStreamingOutput(getEMFProperties);
- return Response.ok(streamingOutput).build();
-
- }
-
- @POST
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_FILES)
- @Consumes({ MediaType.WILDCARD })
- @Produces({ MediaType.WILDCARD })
- public Response uploadFileChunk(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- InputStream is) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- try {
- // create necessary objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
- final FileChunk fileChunk = getFileChunkFromInputStream(is);
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- final FileTransferInformation fileTransferInformation = emfStore.uploadFileChunk(
- authenticationInformation.getSessionId(), projectId, fileChunk);
- logOut(authenticationInformation);
-
- // return response
- final StreamingOutput streamingOutput = TransferUtil
- .convertSerializableIntoStreamingOutput(fileTransferInformation);
-
- final URI uri = new URI(
- BASE_URI
- + "/" + PROJECTS_PATH + "/" + projectIdAsString + "/" + PROJECTS_PATH_FILES + "/" + fileTransferInformation.getFileIdentifier().getIdentifier() + "/" + String.valueOf(fileTransferInformation.getChunkNumber())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return Response.created(uri).entity(streamingOutput).build();
-
- } catch (final ClassNotFoundException e) {
- ModelUtil.logException(e);
- return Response.serverError().build();
- } catch (final IOException e) {
- ModelUtil.logException(e);
- return Response.serverError().build();
- } catch (final URISyntaxException ex) {
- return Response.serverError().build();
- }
- }
-
- @GET
- @Path("/{" + PROJECT_ID_PATH_PARAM + "}/"
- + PROJECTS_PATH_FILES +
- "/{" + FILE_IDENTIFIER_PATH_PARAM + "}" +
- "/{" + CHUNK_NUMBER_PATH_PARAM + "}")
- @Produces({ MediaType.WILDCARD })
- public Response downloadFileChunk(
- @PathParam(PROJECT_ID_PATH_PARAM) String projectIdAsString,
- @PathParam(FILE_IDENTIFIER_PATH_PARAM) String fileIdentifierAsString,
- @PathParam(CHUNK_NUMBER_PATH_PARAM) int chunkNumber,
- @QueryParam(FILE_SIZE_QUERY_PARAM) int fileSize) throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- // create necessary objects
- final ProjectId projectId = createProjectIdFromString(projectIdAsString);
- final FileIdentifier fileIdentifier = createFileIdentifierFromString(fileIdentifierAsString);
- final FileTransferInformation fileTransferInformation = new FileTransferInformation(fileIdentifier, fileSize);
- fileTransferInformation.setChunkNumber(chunkNumber);
-
- // make call to emfStore
- final AuthenticationInformation authenticationInformation = logIn();
- final FileChunk fileChunk = emfStore.downloadFileChunk(authenticationInformation.getSessionId(), projectId,
- fileTransferInformation);
- logOut(authenticationInformation);
-
- // return response
- final StreamingOutput streamingOutput = convertSerializableIntoStreamingOutput(fileChunk);
- return Response.ok(streamingOutput).build();
-
- }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Users.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Users.java
deleted file mode 100644
index e47f95c..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/resources/Users.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.resources;
-
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.USERS_PATH;
-import static org.eclipse.emf.emfstore.jax.common.CallParamStrings.USER_NAME_PATH_PARAM;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.convertEObjectToXmlIntoStreamingOutput;
-import static org.eclipse.emf.emfstore.jax.common.TransferUtil.getEObjectFromInputStream;
-
-import java.io.InputStream;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.StreamingOutput;
-
-import org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation;
-import org.eclipse.emf.emfstore.internal.server.model.ClientVersionInfo;
-import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnitId;
-import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACUser;
-import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.AccesscontrolFactory;
-import org.eclipse.emf.emfstore.jax.server.security.User;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-
-/**
- *
- * @author Pascal Schliski
- *
- */
-@Path(USERS_PATH)
-@SuppressWarnings("restriction")
-public class Users extends EmfStoreJaxrsResource implements IUsers {
-
- @GET
- @Path("/{" + USER_NAME_PATH_PARAM + "}")
- @Produces({ MediaType.APPLICATION_XML })
- public Response getUserDetails(@PathParam(USER_NAME_PATH_PARAM) String userName)
- throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- final User user = (User) securityContext.getUserPrincipal();
-
- if (userName.equals(user.getName())) {
- // user wants to resolve himself
-
- // retrieve ACUser data
- final AuthenticationInformation authenticationInformation = accessControl.logIn(user.getName(),
- user.getPassword(), null);
- accessControl.logout(authenticationInformation.getSessionId());
- final ACUser resolvedUser = authenticationInformation.getResolvedACUser();
-
- // create Response
- final StreamingOutput streamingOutput = convertEObjectToXmlIntoStreamingOutput(resolvedUser);
- return Response.ok(streamingOutput).build();
- }
-
- // user wants to resolve another user, create its ACOrgUnitId
- final ACOrgUnitId acOrgUnitId = AccesscontrolFactory.eINSTANCE.createACOrgUnitId();
- acOrgUnitId.setId(userName);
-
- final AuthenticationInformation authenticationInformation = logIn();
- final ACUser resolvedUser = emfStore.resolveUser(authenticationInformation.getSessionId(), acOrgUnitId);
- logOut(authenticationInformation);
-
- // create Response
- final StreamingOutput streamingOutput = convertEObjectToXmlIntoStreamingOutput(resolvedUser);
- return Response.ok(streamingOutput).build();
-
- }
-
- @PUT
- @Path("/{" + USER_NAME_PATH_PARAM + "}")
- @Consumes({ MediaType.APPLICATION_XML })
- public Response setUserDetails(@PathParam(USER_NAME_PATH_PARAM) String userName, InputStream is)
- throws ESException {
-
- if (emfStore == null || accessControl == null) {
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
- }
-
- final User user = (User) securityContext.getUserPrincipal();
-
- // check if access allowed
- if (!userName.equals(user.getName())) {
- return Response.status(Status.UNAUTHORIZED).build();
- }
-
- // get object from InputStream
- final ClientVersionInfo clientVersionInfo = getEObjectFromInputStream(is);
-
- // retrieve ACUser data
- final AuthenticationInformation authenticationInformation = accessControl.logIn(user.getName(),
- user.getPassword(), clientVersionInfo);
- accessControl.logout(authenticationInformation.getSessionId());
- final ACUser resolvedUser = authenticationInformation.getResolvedACUser();
-
- // create Response
- final StreamingOutput streamingOutput = convertEObjectToXmlIntoStreamingOutput(resolvedUser);
- return Response.ok(streamingOutput).build();
-
- }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/security/SecurityHandler.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/security/SecurityHandler.java
deleted file mode 100644
index fc8f40c..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/security/SecurityHandler.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.security;
-
-import java.security.Principal;
-
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.SecurityContext;
-
-import com.eclipsesource.jaxrs.provider.security.AuthenticationHandler;
-import com.eclipsesource.jaxrs.provider.security.AuthorizationHandler;
-import com.sun.xml.internal.messaging.saaj.util.Base64;
-
-/**
- * class which is responsible for authentication and authorization
- *
- * @author Pascal Schliski
- *
- */
-public class SecurityHandler implements AuthenticationHandler, AuthorizationHandler {
-
- /**
- *
- * {@inheritDoc}
- *
- * @see com.eclipsesource.jaxrs.provider.security.AuthorizationHandler#isUserInRole(java.security.Principal,
- * java.lang.String)
- */
- public boolean isUserInRole(Principal user, String role) {
-
- return true; // authorization not needed, because this is done internally on server
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see com.eclipsesource.jaxrs.provider.security.AuthenticationHandler#authenticate(javax.ws.rs.container.ContainerRequestContext)
- */
- public Principal authenticate(ContainerRequestContext requestContext) {
-
- // get the base64 encoded user:pw combination
- final String userCredentials = requestContext.getHeaderString(HttpHeaders.AUTHORIZATION);
-
- final User user = decodeBase64EncodedCredentials(userCredentials);
-
- return user;
-
- }
-
- /**
- * decode a base64-encoded HTTP auth String into a User object
- *
- * @param userCredentials a base64 decoded user:pw String
- * @return the User, null if username and password are both empty
- */
- private User decodeBase64EncodedCredentials(
- String userCredentials) {
-
- // a userCredentials String starts with "Basic ". This needs to be cut off
- final int spaceAfterBasic = userCredentials.indexOf(" "); //$NON-NLS-1$
- if (spaceAfterBasic + 1 == userCredentials.length()) {
- return null;
- }
- final String decoded = Base64.base64Decode(userCredentials.substring(spaceAfterBasic + 1));
-
- final int colon = decoded.indexOf(":"); //$NON-NLS-1$
- if (colon == decoded.length() - 1) {
- // empty password not allowed
- return null;
- }
- final String name = decoded.substring(0, colon);
- final String password = decoded.substring(colon + 1);
-
- return new User(name, password);
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see com.eclipsesource.jaxrs.provider.security.AuthenticationHandler#getAuthenticationScheme()
- */
- public String getAuthenticationScheme() {
-
- return SecurityContext.BASIC_AUTH;
- }
-
-}
diff --git a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/security/User.java b/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/security/User.java
deleted file mode 100644
index c5ab920..0000000
--- a/org.eclipse.emf.emfstore.jax2/src/org/eclipse/emf/emfstore/jax/server/security/User.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.emf.emfstore.jax.server.security;
-
-import java.security.Principal;
-
-/**
- * class implementing {@link Principal} representing a client user
- *
- * @author Pascal Schliski
- *
- */
-public class User implements Principal {
-
- private final String name;
- private final String password;
-
- public User(String name, String password) {
- this.name = name;
- this.password = password;
- }
-
- public String getName() {
- return name;
- }
-
- public String getPassword() {
- return password;
- }
-
-}
diff --git "a/tests/org.eclipse.emf.emfstore.server.test/AllServerTest \050decl\051 \0505 - Auth+SSL\051.launch" "b/tests/org.eclipse.emf.emfstore.server.test/AllServerTest \050decl\051 \0505 - Auth+SSL\051.launch"
deleted file mode 100644
index 985d0a0..0000000
--- "a/tests/org.eclipse.emf.emfstore.server.test/AllServerTest \050decl\051 \0505 - Auth+SSL\051.launch"
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AllServerTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.emfstore.server.test.AllServerTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.emfstore.server.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.service.http.port=9090 -Dequinox.ds.print=true -Xmx1024m -Dorg.eclipse.equinox.http.jetty.https.enabled=true -Dorg.eclipse.equinox.http.jetty.http.enabled=false -Dorg.eclipse.equinox.http.jetty.https.port=8443 -Dorg.eclipse.equinox.http.jetty.ssl.keystore="emfstoreServer.keystore" -Dorg.eclipse.equinox.http.jetty.ssl.password="123456""/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
-<stringAttribute key="selected_target_plugins" value="com.eclipsesource.jaxrs.provider.security@default:default,com.eclipsesource.jaxrs.publisher@default:default,com.google.guava*14.0.1@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.servlet-api@default:default,javax.servlet@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet*1.1.300.v20120912-130548@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi*3.8.2.v20130124-134944@-1:true,org.eclipse.osgi.services@default:default,org.eclipse.team.core@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.aopalliance-repackaged@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.containers.jersey-container-servlet-core@default:default,org.glassfish.jersey.containers.jersey-container-servlet@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default,org.glassfish.jersey.media.jersey-media-multipart@default:default,org.glassfish.jersey.media.jersey-media-sse@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.jvnet.mimepull@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.emfstore.client.api.test@default:false,org.eclipse.emf.emfstore.client.changetracking.test@default:false,org.eclipse.emf.emfstore.client.conflictdetection.test@default:false,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client.recording.test@default:false,org.eclipse.emf.emfstore.client.test@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.jax.client@default:default,org.eclipse.emf.emfstore.jax.common@default:default,org.eclipse.emf.emfstore.jax.server.services@default:false,org.eclipse.emf.emfstore.jax.server@default:false,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.modelmutator@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server.test@default:false,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.emfstore.test.common@default:default,org.eclipse.emf.emfstore.test.model.edit@default:default,org.eclipse.emf.emfstore.test.model@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.emf.emfstore.server.test/AllServerTest JAX RS.launch b/tests/org.eclipse.emf.emfstore.server.test/AllServerTest JAX RS.launch
new file mode 100644
index 0000000..cf697ef
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.server.test/AllServerTest JAX RS.launch
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="default_auto_start" value="true"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AllServerTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.emfstore.server.test.AllServerTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.emfstore.server.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.service.http.port=9090 -Dequinox.ds.print=true -Xmx1024m -Dorg.eclipse.equinox.http.jetty.https.enabled=true -Dorg.eclipse.equinox.http.jetty.http.enabled=false -Dorg.eclipse.equinox.http.jetty.https.port=8443 -Dorg.eclipse.equinox.http.jetty.ssl.keystore="emfstoreServer.keystore" -Dorg.eclipse.equinox.http.jetty.ssl.password="123456""/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
+<booleanAttribute key="run_in_ui_thread" value="false"/>
+<stringAttribute key="selected_target_plugins" value="com.eclipsesource.jaxrs.consumer@default:default,com.eclipsesource.jaxrs.provider.security@default:default,com.eclipsesource.jaxrs.publisher@default:default,com.google.guava*14.0.1@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.servlet-api@default:default,javax.servlet@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet*1.1.300.v20120912-130548@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi*3.8.2.v20130124-134944@-1:true,org.eclipse.osgi.services@default:default,org.eclipse.team.core@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.aopalliance-repackaged@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.containers.jersey-container-servlet-core@default:default,org.glassfish.jersey.containers.jersey-container-servlet@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default,org.glassfish.jersey.media.jersey-media-multipart@default:default,org.glassfish.jersey.media.jersey-media-sse@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.jvnet.mimepull@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.emfstore.client.api.test@default:false,org.eclipse.emf.emfstore.client.changetracking.test@default:false,org.eclipse.emf.emfstore.client.conflictdetection.test@default:false,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client.recording.test@default:false,org.eclipse.emf.emfstore.client.test@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.jax.client@default:default,org.eclipse.emf.emfstore.jax.common@default:default,org.eclipse.emf.emfstore.jax.server.services@default:default,org.eclipse.emf.emfstore.jax.server@default:false,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.modelmutator@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server.test@default:false,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.emfstore.test.common@default:default,org.eclipse.emf.emfstore.test.model.edit@default:default,org.eclipse.emf.emfstore.test.model@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
