133 files changed, 384 insertions, 11398 deletions
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.classpath b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.classpath
deleted file mode 100644
index 7380c1307a2..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.project b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.project
deleted file mode 100644
index 6d4ce28387b..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.dsml.validation.generator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<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>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_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_lambda_body=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=false
-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=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=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_after_type_annotation=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_lambda_arrow=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_lambda_arrow=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=260
-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=5
-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=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +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_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-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_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\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">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\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">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><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">/**\n * ${tags}\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">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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}\n${package_declaration}\n\n${typecomment}\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">\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">\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">\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">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</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\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}\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>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
deleted file mode 100644
index 3d1ef83333d..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.uml2.uml,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.ocl,
- org.eclipse.ocl.ecore,
- org.eclipse.emf.validation;bundle-version="1.4.0",
- org.eclipse.papyrus.dsml.validation.model;bundle-version="[1.2.0,2.0.0)",
- com.google.guava;bundle-version="21.0.0",
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
- org.eclipse.jdt.core;bundle-version="3.11.0",
- org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.dsml.validation.generator,
- org.eclipse.papyrus.dsml.validation.generator.xtend
-Bundle-Vendor: %pluginProvider
-Eclipse-LazyStart: true
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.dsml.validation.generator.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.generator;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/about.html b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/build.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/build.properties
deleted file mode 100644
index e36ec7ffdd1..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/,\
-           xtend-gen/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties
-customBuildCallbacks = build.acceleo
-src.includes = about.html
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/plugin.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/plugin.properties
deleted file mode 100644
index 197a26fafdf..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 CEA LIST.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     CEA LIST - initial API and implementation
-###############################################################################
-pluginName=Papyrus DSML Validation generator (Incubation)
-pluginProvider=Eclipse Modeling Project
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml
deleted file mode 100644
index 7ae3f494909..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.generator</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>xtend-gen</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-							<excludes>
-								<exclude>.gitignore</exclude>
-							</excludes>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.xtend</groupId>
-				<artifactId>xtend-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<outputDirectory>xtend-gen</outputDirectory>
-					<testOutputDirectory>${project.build.directory}/xtend-gen/test</testOutputDirectory>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/Activator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/Activator.java
deleted file mode 100644
index 107ee738569..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/Activator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.generator;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- */
-public class Activator extends Plugin {
-
-	/**
-	 * The plug-in ID.
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.dsml.validation.generator"; //$NON-NLS-1$
-
-	/**
-	 * The shared instance.
-	 */
-	private static Activator plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.xtend b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.xtend
deleted file mode 100644
index 76ddb7b8357..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.xtend
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST 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:
- *   CEA LIST - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.dsml.validation.generator.xtend
-
-import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils
-import org.eclipse.uml2.uml.Stereotype
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
-
-/**
- * Generator for producing client selector files: Java files that filter the stereotype
- * for validation
- */
-public class ClientSelectorGen {
-
-	static def generateValidationContext(Stereotype stereotype) '''
-		/**
-		 * Created by the Papyrus DSML plugin generator
-		 */
-
-		package «Utils.getTopPkg()».selectors;
-
-		import org.eclipse.emf.validation.model.IClientSelector;
-		import org.eclipse.papyrus.uml.service.validation.StereotypeUtil;
-
-		/**
-		 * This class filters (selects) passed stereotype applications. It returns true, if the
-		 * associated stereotype (or one of its super-stereotypes) has the name '[stereotype.name/]'.
-		 *
-		 * @generated
-		 */
-		public class «stereotype.name»ClientSelector implements IClientSelector {
-
-			public boolean selects(Object stereoApplicationObj) {
-				return StereotypeUtil.checkStereoApplication(stereoApplicationObj, "«stereotype.name»"); //$NON-NLS-1$
-			}
-		}
-	'''
-	
-	/**
-	 * @see org.eclipse.xtext.generator.IGenerator#doGenerate(org.eclipse.emf.ecore.resource.Resource, org.eclipse.xtext.generator.IFileSystemAccess)
-	 *
-	 * @param input
-	 * @param fsa
-	 */
-	static def generate(Resource input, IPFileSystemAccess fsa) {
-		val contentIterator = input.allContents.filter(typeof(Stereotype))
-		while (contentIterator.hasNext) {
-			val stereotype = contentIterator.next
-			val fileName = Utils.getTopPkg().replaceAll('\\.', '/') + '/selectors/' + stereotype.name +'ClientSelector.java'
-			fsa.generateFile(fileName, stereotype.generateValidationContext.toString)
-		}
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.xtend b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.xtend
deleted file mode 100644
index d4aa5cf1705..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.xtend
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.eclipse.papyrus.dsml.validation.generator.xtend;
-
-import org.eclipse.uml2.uml.Constraint
-import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils
-import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
-
-/**
- * A generator for Java based constraints
- */
-class ConstraintGen {
-
-	static def generateConstraint(Constraint constraint) '''
-		/**
-		 * Created by the Papyrus DSML plugin generator
-		 */
-		
-		package «Utils.getTopPkg()».constraints;
-		
-		import org.eclipse.core.runtime.IStatus;
-		import org.eclipse.emf.validation.AbstractModelConstraint;
-		import org.eclipse.emf.validation.IValidationContext;
-		import org.eclipse.emf.ecore.EObject;
-		«IF !Utils.staticProfile»
-			import org.eclipse.uml2.uml.Element;
-			import org.eclipse.uml2.uml.Stereotype;
-			import org.eclipse.uml2.uml.util.UMLUtil;
-		«ENDIF»
-		
-		public class «constraint.name»Constraint extends AbstractModelConstraint {
-		
-			public IStatus validate(IValidationContext ctx) {
-				EObject target = ctx.getTarget();
-		
-				«IF Utils.isConstraintForStereotype(constraint)»
-					«val qStereotypeName = Utils.getConstraintForStereotype(constraint)»
-					«IF Utils.staticProfile»
-						«val qStereotypeNameJava = qStereotypeName.replace("::", ".")»
-						if (target instanceof «qStereotypeNameJava») {
-							if (evaluateConstraint((«qStereotypeNameJava») target)) {
-					«ELSE»
-						Stereotype stereotype = UMLUtil.getStereotype(target);
-						if (stereotype.getQualifiedName().equals("«qStereotypeName»")) { //$NON-NLS-1$
-							Element element = UMLUtil.getBaseElement(target);
-							if (evaluateConstraint(element, stereotype)) {
-					«ENDIF»
-							return ctx.createSuccessStatus();
-						}
-						else {
-							return ctx.createFailureStatus(""); //$NON-NLS-1$ failure message is in plugin.xml
-						}
-					}
-					return ctx.createSuccessStatus();
-				«ELSE»
-					if (evaluateConstraint(target)) {
-						return ctx.createSuccessStatus();
-					}
-					else {
-						return ctx.createFailureStatus(""); //$NON-NLS-1$ failure message is in plugin.xml
-					}
-				«ENDIF»
-			}
-		
-			«IF Utils.isConstraintForStereotype(constraint)»
-				«IF Utils.staticProfile»
-					«val qStereotypeName = Utils.getConstraintForStereotype(constraint)»
-					«val qStereotypeNameJava = qStereotypeName.replace("::", ".")»
-					private boolean evaluateConstraint(«qStereotypeNameJava» self) {
-				«ELSE»
-					private boolean evaluateConstraint(Element self, Stereotype appliedStereotype) {
-				«ENDIF»
-					«IF Utils.getJavaConstraintBody(constraint.specification) != null»
-						«Utils.getJavaConstraintBody(constraint.specification)»
-					«ELSE»
-						return true;
-					«ENDIF»
-				}
-			«ENDIF»	
-		
-			«IF !Utils.isConstraintForStereotype(constraint)»
-				private boolean evaluateConstraint(EObject self) {
-					«IF Utils.getJavaConstraintBody(constraint.specification) != null»
-						«Utils.getJavaConstraintBody(constraint.specification)»
-					«ELSE»
-						return true;
-					«ENDIF»
-				}
-			«ENDIF»
-		}
-	'''
-
-	/**
-	 * @see org.eclipse.xtext.generator.IGenerator#doGenerate(org.eclipse.emf.ecore.resource.Resource, org.eclipse.xtext.generator.IFileSystemAccess)
-	 *
-	 * @param input
-	 * @param fsa
-	 */
-	static def generate(Resource input, IPFileSystemAccess fsa) {
-		val contentIterator = input.allContents.filter(typeof(Constraint))
-		while (contentIterator.hasNext) {
-			val constraint = contentIterator.next
-			if (Utils.hasSpecificationForJava(constraint)) {
-				if (constraint.name == null) {
-					throw new RuntimeException("Constraint has no name, context: " + constraint.context.qualifiedName);
-				}
-				val fileName = Utils.getTopPkg().replaceAll('\\.', '/') + '/constraints/' + constraint.getName() +
-					'Constraint.java';
-				fsa.generateFile(fileName, constraint.generateConstraint.toString)
-			}
-		}
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/Generate.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/Generate.java
deleted file mode 100644
index 787f8ee3deb..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/src/org/eclipse/papyrus/dsml/validation/generator/xtend/Generate.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.papyrus.dsml.validation.generator.xtend;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.papyrus.infra.tools.file.ProjectBasedFileAccess;
-
-/**
- * Entry point of the 'Generate' generation module.
- */
-public class Generate {
-
-	/**
-	 * The source folder for the generated file. 
-	 */
-	public static final String SRC = "src-gen"; //$NON-NLS-1$
-
-	/**
-	 * This method is used to launch the generation from a standalone application.
-	 * The standalone invocation has not been tested (and is currently disabled).
-	 *
-	 * @param args
-	 *            Arguments of the generation.
-	 */
-	public static void main(String[] args) {
-		if (args.length < 2) {
-			System.out.println("Arguments not valid : {model, folder}."); //$NON-NLS-1$
-		}
-		else {
-			URI modelURI = URI.createFileURI(args[0]);
-			// the following variables are unused, since the code below is in comments as the class JavaIoFileSystemAccess
-			// is based on Java 1.7 code and has therefore only available in Papyrus 1.1 or higher.
-			
-			@SuppressWarnings("unused")
-			File folder = new File(args[1]);
-
-			ResourceSet resourceSet = new ResourceSetImpl();
-			@SuppressWarnings("unused")
-			Resource resource = resourceSet.createResource(modelURI);
-
-			/*
-			JavaIoFileSystemAccess fsa =
-					new JavaIoFileSystemAccess();
-			fsa.setOutputPath(folder);
-			ClientSelectorGen.generate(resource, fsa);
-			ConstraintGen.generate(resource, fsa);
-			*/
-		}
-	}
-
-	/**
-	 * Create a folder in a given project and register it as Java source folder  
-	 * @param targetProject an existing project
-	 * @param sourceFolder the name of a folder which should become a source folder
-	 */
-	protected static void createSourceFolder(IProject targetProject, String sourceFolder) {
-		// first, create folder
-		IFolder folder = targetProject.getFolder(sourceFolder);
-		if (!folder.exists()) {
-			try {
-				folder.create(false, true, new NullProgressMonitor());
-			} catch (CoreException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		IJavaProject javaProject = JavaCore.create(targetProject);
-		IClasspathEntry[] entries;
-		try {
-			entries = javaProject.getRawClasspath();
-		
-			IPath srcPath= javaProject.getPath().append(sourceFolder);
-
-			for (IClasspathEntry entry : entries) {
-				if (entry.getPath().equals(srcPath)) {
-					// nothing to do
-					return;
-				}
-			}
-			IClasspathEntry[] newEntries = new IClasspathEntry[entries.length + 1];
-			System.arraycopy(entries, 0, newEntries, 0, entries.length);
-
-			IClasspathEntry srcEntry= JavaCore.newSourceEntry(srcPath, null);
-			newEntries[entries.length] = JavaCore.newSourceEntry(srcEntry.getPath());
-			javaProject.setRawClasspath(newEntries, null);
-		} catch (JavaModelException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	
-	
-	/**
-	 * Launches the generation described by this instance.
-	 *
-	 * @param monitor
-	 *            This will be used to display progress information to the user.
-	 * @throws IOException
-	 *             This will be thrown if any of the output files cannot be saved to disk.
-	 */
-	public static void generateClientSelector(Resource input, IProject targetProject, IProgressMonitor monitor) throws IOException {
-		createSourceFolder(targetProject, SRC);
-		ProjectBasedFileAccess fsa = new ProjectBasedFileAccess(targetProject, SRC);
-		ClientSelectorGen.generate(input, fsa);
-	}
-
-	/**
-	 * Launches the generation described by this instance.
-	 *
-	 * @param monitor
-	 *            This will be used to display progress information to the user.
-	 * @throws IOException
-	 *             This will be thrown if any of the output files cannot be saved to disk.
-	 */
-	public static void generateConstraints(Resource input, IProject targetProject, IProgressMonitor monitor) throws IOException {
-		createSourceFolder(targetProject, SRC);
-		ProjectBasedFileAccess fsa = new ProjectBasedFileAccess(targetProject, SRC);
-		ConstraintGen.generate(input, fsa);
-	}
-}
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generate.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generate.xml
deleted file mode 100644
index 09d97e0831a..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generate.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="generate" name="org.eclipse.papyrus.dsml.validation.generator">
-    <property name="ECLIPSE_HOME" value="../../../../../../../../software/eclipse/luna"/>
-    <property name="ECLIPSE_WORKSPACE" value="../../../../../../workspaces/luna/main"/>
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.eclipse.papyrus.dsml.validation.generator.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.eclipse.papyrus.dsml.validation.generator/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.10.0.v20140318-2214.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.annotation_1.2.0.v201401042248.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.1.v20140709-1414.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime.compatibility.registry_3.5.300.v20140128-0851/runtime_registry_compatibility.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.5.400.v20140428-1507.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.4.200.v20140207-1251.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.200.v20130910-1609.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.0.1.v20140910-1354.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.10.1.v20140901-1043.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.10.1.v20140901-1043.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.10.1.v20140901-1043.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.0.1.v20140910-1354.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20140910-1354.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.8.0.v20141013-0308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.4.2.v20140725-2242.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.2.0.v20140610-0641.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.3.100.v20140610-0641.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.5.1.201409021433.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.5.1.201409021433.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.5.1.201409021433.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.5.1.201409021433.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.10.2.v20141013-0308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.10.0.v20141013-0308.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.validation_1.8.0.201405281429.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.9.1.v20140825-1431.jar"/>
-    </path>
-
-    <path id="org.eclipse.papyrus.dsml.validation.generator.classpath">
-        <path refid="org.eclipse.papyrus.dsml.validation.generator.libraryclasspath"/>
-    </path>
-
-    <!-- The classpath with only the jars available in the plugin folder of Eclipse -->
-    <path id="org.eclipse.papyrus.dsml.validation.generator.libraryclasspath.alljars">
-        <pathelement location="../org.eclipse.papyrus.dsml.validation.generator/bin"/>
-        <fileset dir="${ECLIPSE_HOME}/plugins/" includes="*.jar"/>
-    </path>
-
-    <path id="org.eclipse.papyrus.dsml.validation.generator.classpath.alljars">
-        <path refid="org.eclipse.papyrus.dsml.validation.generator.libraryclasspath.alljars"/>
-    </path>
-
-    <!-- The default task with the jars used by this project -->
-    <target name="generate">
-        <java classname="org.eclipse.papyrus.dsml.validation.generator.main.Generate" classpathref="org.eclipse.papyrus.dsml.validation.generator.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-
-    <!--
-        In case of problem you can also try with all the jar available in your Eclipse
-        Keep in mind that having two versions of the same jar can create problems
-    -->
-    <target name="generate.alljars">
-        <java classname="org.eclipse.papyrus.dsml.validation.generator.main.Generate" classpathref="org.eclipse.papyrus.dsml.validation.generator.classpath">
-            <arg value="${model}"/>
-            <arg value="${target}"/>
-        </java>
-    </target>
-</project>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generateTarget.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generateTarget.xml
deleted file mode 100644
index a010e7a8764..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/tasks/generateTarget.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Place this file in the target project and call it with "External Tools > Run As > Ant Build" -->
-<!-- You have to change the MODEL and the TARGET values -->
-
-<project basedir="." default="generateSample" name="org.eclipse.papyrus.dsml.validation.generatorSample">
-	<import file="../../org.eclipse.papyrus.dsml.validation.generator/tasks/generate.xml"/>
-
-    <!-- Change the values of MODEL and TARGET to point to your model and output folder -->
-	<property name="MODEL" value="${basedir}/model/file.xmi"/>
-	<property name="TARGET" value="${basedir}/src-gen"/>
-
-	<target name="generateSample" description="Generate files in 'TARGET'">
-		<antcall target="generate" >
-			<param name="model" value="${MODEL}"/>
-			<param name="target" value="${TARGET}"/>
-		</antcall>
-	</target>
-</project>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/.gitignore b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/.gitignore
deleted file mode 100644
index c96a04f008e..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.java
new file mode 100755
index 00000000000..2a670c423aa
--- /dev/null
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/org/eclipse/papyrus/dsml/validation/generator/xtend/ClientSelectorGen.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2014 CEA LIST 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:
+ *   CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.dsml.validation.generator.xtend;
+
+import com.google.common.collect.Iterators;
+import java.util.Iterator;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;
+import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * Generator for producing client selector files: Java files that filter the stereotype
+ * for validation
+ */
+@SuppressWarnings("all")
+public class ClientSelectorGen {
+  public static CharSequence generateValidationContext(final Stereotype stereotype) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("/**");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* Created by the Papyrus DSML plugin generator");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("*/");
+    _builder.newLine();
+    _builder.newLine();
+    _builder.append("package ");
+    String _topPkg = Utils.getTopPkg();
+    _builder.append(_topPkg);
+    _builder.append(".selectors;");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("import org.eclipse.emf.validation.model.IClientSelector;");
+    _builder.newLine();
+    _builder.append("import org.eclipse.papyrus.uml.service.validation.StereotypeUtil;");
+    _builder.newLine();
+    _builder.newLine();
+    _builder.append("/**");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* This class filters (selects) passed stereotype applications. It returns true, if the");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* associated stereotype (or one of its super-stereotypes) has the name \'[stereotype.name/]\'.");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("*");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* @generated");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("*/");
+    _builder.newLine();
+    _builder.append("public class ");
+    String _name = stereotype.getName();
+    _builder.append(_name);
+    _builder.append("ClientSelector implements IClientSelector {");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("public boolean selects(Object stereoApplicationObj) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("return StereotypeUtil.checkStereoApplication(stereoApplicationObj, \"");
+    String _name_1 = stereotype.getName();
+    _builder.append(_name_1, "\t\t");
+    _builder.append("\"); //$NON-NLS-1$");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.append("}");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  /**
+   * @see org.eclipse.xtext.generator.IGenerator#doGenerate(org.eclipse.emf.ecore.resource.Resource, org.eclipse.xtext.generator.IFileSystemAccess)
+   * 
+   * @param input
+   * @param fsa
+   */
+  public static void generate(final Resource input, final IPFileSystemAccess fsa) {
+    final Iterator<Stereotype> contentIterator = Iterators.<Stereotype>filter(input.getAllContents(), Stereotype.class);
+    while (contentIterator.hasNext()) {
+      {
+        final Stereotype stereotype = contentIterator.next();
+        String _replaceAll = Utils.getTopPkg().replaceAll("\\.", "/");
+        String _plus = (_replaceAll + "/selectors/");
+        String _name = stereotype.getName();
+        String _plus_1 = (_plus + _name);
+        final String fileName = (_plus_1 + "ClientSelector.java");
+        fsa.generateFile(fileName, ClientSelectorGen.generateValidationContext(stereotype).toString());
+      }
+    }
+  }
+}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.java
new file mode 100755
index 00000000000..13af0ce6c6f
--- /dev/null
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/xtend-gen/org/eclipse/papyrus/dsml/validation/generator/xtend/ConstraintGen.java
@@ -0,0 +1,272 @@
+package org.eclipse.papyrus.dsml.validation.generator.xtend;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterators;
+import java.util.Iterator;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;
+import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess;
+import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.xtend2.lib.StringConcatenation;
+
+/**
+ * A generator for Java based constraints
+ */
+@SuppressWarnings("all")
+public class ConstraintGen {
+  public static CharSequence generateConstraint(final Constraint constraint) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("/**");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("* Created by the Papyrus DSML plugin generator");
+    _builder.newLine();
+    _builder.append(" ");
+    _builder.append("*/");
+    _builder.newLine();
+    _builder.newLine();
+    _builder.append("package ");
+    String _topPkg = Utils.getTopPkg();
+    _builder.append(_topPkg);
+    _builder.append(".constraints;");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("import org.eclipse.core.runtime.IStatus;");
+    _builder.newLine();
+    _builder.append("import org.eclipse.emf.validation.AbstractModelConstraint;");
+    _builder.newLine();
+    _builder.append("import org.eclipse.emf.validation.IValidationContext;");
+    _builder.newLine();
+    _builder.append("import org.eclipse.emf.ecore.EObject;");
+    _builder.newLine();
+    {
+      boolean _isStaticProfile = Utils.isStaticProfile();
+      boolean _not = (!_isStaticProfile);
+      if (_not) {
+        _builder.append("import org.eclipse.uml2.uml.Element;");
+        _builder.newLine();
+        _builder.append("import org.eclipse.uml2.uml.Stereotype;");
+        _builder.newLine();
+        _builder.append("import org.eclipse.uml2.uml.util.UMLUtil;");
+        _builder.newLine();
+      }
+    }
+    _builder.newLine();
+    _builder.append("public class ");
+    String _name = constraint.getName();
+    _builder.append(_name);
+    _builder.append("Constraint extends AbstractModelConstraint {");
+    _builder.newLineIfNotEmpty();
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("public IStatus validate(IValidationContext ctx) {");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("EObject target = ctx.getTarget();");
+    _builder.newLine();
+    _builder.newLine();
+    {
+      Boolean _isConstraintForStereotype = Utils.isConstraintForStereotype(constraint);
+      if ((_isConstraintForStereotype).booleanValue()) {
+        _builder.append("\t\t");
+        final String qStereotypeName = Utils.getConstraintForStereotype(constraint);
+        _builder.newLineIfNotEmpty();
+        {
+          boolean _isStaticProfile_1 = Utils.isStaticProfile();
+          if (_isStaticProfile_1) {
+            _builder.append("\t\t");
+            final String qStereotypeNameJava = qStereotypeName.replace("::", ".");
+            _builder.newLineIfNotEmpty();
+            _builder.append("\t\t");
+            _builder.append("if (target instanceof ");
+            _builder.append(qStereotypeNameJava, "\t\t");
+            _builder.append(") {");
+            _builder.newLineIfNotEmpty();
+            _builder.append("\t\t");
+            _builder.append("\t");
+            _builder.append("if (evaluateConstraint((");
+            _builder.append(qStereotypeNameJava, "\t\t\t");
+            _builder.append(") target)) {");
+            _builder.newLineIfNotEmpty();
+          } else {
+            _builder.append("\t\t");
+            _builder.append("Stereotype stereotype = UMLUtil.getStereotype(target);");
+            _builder.newLine();
+            _builder.append("\t\t");
+            _builder.append("if (stereotype.getQualifiedName().equals(\"");
+            _builder.append(qStereotypeName, "\t\t");
+            _builder.append("\")) { //$NON-NLS-1$");
+            _builder.newLineIfNotEmpty();
+            _builder.append("\t\t");
+            _builder.append("\t");
+            _builder.append("Element element = UMLUtil.getBaseElement(target);");
+            _builder.newLine();
+            _builder.append("\t\t");
+            _builder.append("\t");
+            _builder.append("if (evaluateConstraint(element, stereotype)) {");
+            _builder.newLine();
+          }
+        }
+        _builder.append("\t\t");
+        _builder.append("\t\t");
+        _builder.append("return ctx.createSuccessStatus();");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("\t");
+        _builder.append("}");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("\t");
+        _builder.append("else {");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("\t\t");
+        _builder.append("return ctx.createFailureStatus(\"\"); //$NON-NLS-1$ failure message is in plugin.xml");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("\t");
+        _builder.append("}");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("}");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("return ctx.createSuccessStatus();");
+        _builder.newLine();
+      } else {
+        _builder.append("\t\t");
+        _builder.append("if (evaluateConstraint(target)) {");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("\t");
+        _builder.append("return ctx.createSuccessStatus();");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("}");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("else {");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("\t");
+        _builder.append("return ctx.createFailureStatus(\"\"); //$NON-NLS-1$ failure message is in plugin.xml");
+        _builder.newLine();
+        _builder.append("\t\t");
+        _builder.append("}");
+        _builder.newLine();
+      }
+    }
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.newLine();
+    {
+      Boolean _isConstraintForStereotype_1 = Utils.isConstraintForStereotype(constraint);
+      if ((_isConstraintForStereotype_1).booleanValue()) {
+        {
+          boolean _isStaticProfile_2 = Utils.isStaticProfile();
+          if (_isStaticProfile_2) {
+            _builder.append("\t");
+            final String qStereotypeName_1 = Utils.getConstraintForStereotype(constraint);
+            _builder.newLineIfNotEmpty();
+            _builder.append("\t");
+            final String qStereotypeNameJava_1 = qStereotypeName_1.replace("::", ".");
+            _builder.newLineIfNotEmpty();
+            _builder.append("\t");
+            _builder.append("private boolean evaluateConstraint(");
+            _builder.append(qStereotypeNameJava_1, "\t");
+            _builder.append(" self) {");
+            _builder.newLineIfNotEmpty();
+          } else {
+            _builder.append("\t");
+            _builder.append("private boolean evaluateConstraint(Element self, Stereotype appliedStereotype) {");
+            _builder.newLine();
+          }
+        }
+        {
+          String _javaConstraintBody = Utils.getJavaConstraintBody(constraint.getSpecification());
+          boolean _notEquals = (!Objects.equal(_javaConstraintBody, null));
+          if (_notEquals) {
+            _builder.append("\t");
+            _builder.append("\t");
+            String _javaConstraintBody_1 = Utils.getJavaConstraintBody(constraint.getSpecification());
+            _builder.append(_javaConstraintBody_1, "\t\t");
+            _builder.newLineIfNotEmpty();
+          } else {
+            _builder.append("\t");
+            _builder.append("\t");
+            _builder.append("return true;");
+            _builder.newLine();
+          }
+        }
+        _builder.append("\t");
+        _builder.append("}");
+        _builder.newLine();
+      }
+    }
+    _builder.newLine();
+    {
+      Boolean _isConstraintForStereotype_2 = Utils.isConstraintForStereotype(constraint);
+      boolean _not_1 = (!(_isConstraintForStereotype_2).booleanValue());
+      if (_not_1) {
+        _builder.append("\t");
+        _builder.append("private boolean evaluateConstraint(EObject self) {");
+        _builder.newLine();
+        {
+          String _javaConstraintBody_2 = Utils.getJavaConstraintBody(constraint.getSpecification());
+          boolean _notEquals_1 = (!Objects.equal(_javaConstraintBody_2, null));
+          if (_notEquals_1) {
+            _builder.append("\t");
+            _builder.append("\t");
+            String _javaConstraintBody_3 = Utils.getJavaConstraintBody(constraint.getSpecification());
+            _builder.append(_javaConstraintBody_3, "\t\t");
+            _builder.newLineIfNotEmpty();
+          } else {
+            _builder.append("\t");
+            _builder.append("\t");
+            _builder.append("return true;");
+            _builder.newLine();
+          }
+        }
+        _builder.append("\t");
+        _builder.append("}");
+        _builder.newLine();
+      }
+    }
+    _builder.append("}");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  /**
+   * @see org.eclipse.xtext.generator.IGenerator#doGenerate(org.eclipse.emf.ecore.resource.Resource, org.eclipse.xtext.generator.IFileSystemAccess)
+   * 
+   * @param input
+   * @param fsa
+   */
+  public static void generate(final Resource input, final IPFileSystemAccess fsa) {
+    final Iterator<Constraint> contentIterator = Iterators.<Constraint>filter(input.getAllContents(), Constraint.class);
+    while (contentIterator.hasNext()) {
+      {
+        final Constraint constraint = contentIterator.next();
+        Boolean _hasSpecificationForJava = Utils.hasSpecificationForJava(constraint);
+        if ((_hasSpecificationForJava).booleanValue()) {
+          String _name = constraint.getName();
+          boolean _equals = Objects.equal(_name, null);
+          if (_equals) {
+            String _qualifiedName = constraint.getContext().getQualifiedName();
+            String _plus = ("Constraint has no name, context: " + _qualifiedName);
+            throw new RuntimeException(_plus);
+          }
+          String _replaceAll = Utils.getTopPkg().replaceAll("\\.", "/");
+          String _plus_1 = (_replaceAll + "/constraints/");
+          String _name_1 = constraint.getName();
+          String _plus_2 = (_plus_1 + _name_1);
+          final String fileName = (_plus_2 + 
+            "Constraint.java");
+          fsa.generateFile(fileName, ConstraintGen.generateConstraint(constraint).toString());
+        }
+      }
+    }
+  }
+}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.classpath b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.project b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.project
deleted file mode 100644
index d3e87f8411c..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.dsml.validation.model.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_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_lambda_body=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=false
-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=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=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_after_type_annotation=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_lambda_arrow=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_lambda_arrow=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=260
-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=5
-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=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +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_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-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_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\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">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\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">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><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">/**\n * ${tags}\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">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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}\n${package_declaration}\n\n${typecomment}\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">\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">\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">\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">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</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\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}\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>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7d828bcf813..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.dsml.validation.generation.ui
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.dsml.validation.wizard;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.dsml.validation.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="3.9.0",
- org.eclipse.papyrus.dsml.validation.generator;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.ui.ide;bundle-version="3.10.1"
-Bundle-Vendor: %pluginProvider
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.dsml.validation.generation.ui.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.model.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/about.html b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/build.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/build.properties
deleted file mode 100644
index 30e2cedf44d..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-src.includes = about.html
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.properties
deleted file mode 100644
index ffd5c14f934..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 CEA LIST.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     CEA LIST - initial API and implementation
-###############################################################################
-pluginName=Papyrus DSML Validation generation ui(Incubation)
-pluginProvider=Eclipse Modeling Project
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.xml
deleted file mode 100644
index d94911b5ffc..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/plugin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
-         <command
-               commandId="org.eclipse.papyrus.dsml.validation.model.ui.CreateJavaValidationPluginHandler"
-               label="Create validation plugin for this DSML"
-               style="push"
-               tooltip="Create validation plugin for this DSML">
-            <visibleWhen
-                  checkEnabled="true">
-            </visibleWhen>
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
-         <command
-               commandId="org.eclipse.papyrus.dsml.validation.model.ui.CreateJavaValidationPluginHandler"
-               label="Create validation plugin for this DSML"
-               style="push"
-               tooltip="Create validation plugin for this DSML">
-            <visibleWhen
-                  checkEnabled="true">
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.papyrus.dsml.validation.generation.ui.CreateJavaValidationPluginHandler"
-            id="org.eclipse.papyrus.dsml.validation.model.ui.CreateJavaValidationPluginHandler"
-            name="Create validation plugin for this DSML">
-      </command>
-   </extension>
-
-</plugin>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml
deleted file mode 100644
index 15a03e65a26..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.model.ui</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Activator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Activator.java
deleted file mode 100644
index f7d75fb25e1..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Activator.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.generation.ui;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- */
-public class Activator extends AbstractUIPlugin {
-
-	/** The Constant PLUGIN_ID. */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.dsml.validation.model.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	/** The plugin. */
-	private static Activator plugin;
-
-	public static LogHelper log;
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	/**
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 *
-	 * @param context
-	 * @throws Exception
-	 */
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-
-		// register the login helper
-		log = new LogHelper(plugin);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	/**
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 *
-	 * @param context
-	 * @throws Exception
-	 */
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
deleted file mode 100644
index 9133d5ae1ba..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/CreateJavaValidationPluginHandler.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.generation.ui;
-
-import java.io.IOException;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.dsml.validation.model.elements.impl.ConstraintManagerImpl;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager;
-import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;
-import org.eclipse.papyrus.dsml.validation.wizard.CreateEMFValidationProject;
-import org.eclipse.papyrus.dsml.validation.wizard.JavaContentGenerator;
-import org.eclipse.papyrus.dsml.validation.wizard.ValidationPluginGenerator;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ResourceListSelectionDialog;
-import org.eclipse.uml2.uml.Profile;
-
-
-/**
- * this handler launch the creation of the plugin to validate contraints of the profile
- *
- */
-public class CreateJavaValidationPluginHandler extends AbstractHandler {
-
-	private IConstraintsManager constraintsManager;
-
-
-	/**
-	 * <pre>
-	 * Get the selected element, the first selected element if several are selected or null
-	 * if no selection or the selection is not an {@link EObject}.
-	 * 
-	 * @return selected {@link EObject} or null
-	 * </pre>
-	 *
-	 */
-	protected EObject getSelectedElement() {
-		EObject eObject = null;
-		Object selection = null;
-
-		// Get current selection
-		selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
-
-		// Get first element if the selection is an IStructuredSelection
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			selection = structuredSelection.getFirstElement();
-		}
-
-		// Treat non-null selected object (try to adapt and return EObject)
-		if (selection != null) {
-
-			eObject = EMFHelper.getEObject(selection);
-		}
-		return eObject;
-	}
-
-
-	/**
-	 *
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 *
-	 * @param event
-	 * @return null
-	 * @throws ExecutionException
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		EObject selection = getSelectedElement();
-
-		if (selection instanceof Profile) {
-			Profile profileSelection = (Profile) selection;
-
-			constraintsManager = new ConstraintManagerImpl(profileSelection);
-			EPackage definition = null;
-
-			IProject hostingProject = null;		// project that is hosting the profile
-			URI uri = profileSelection.eResource().getURI();
-
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			if (uri.segmentCount() >= 2) {
-				hostingProject = root.getProject(uri.segment(1));
-			}
-			IProject targetProject = null;
-			Shell shell = Display.getDefault().getActiveShell();
-
-			boolean isPlugin = false;
-			try {
-				isPlugin = hostingProject.getNature("org.eclipse.pde.PluginNature") != null; //$NON-NLS-1$
-				if (!isPlugin) {
-					// hosting project is not a plugin
-					MessageDialog.openWarning(shell, Messages.CreateJavaValidationPluginHandler_ProfileIsNotAPlugin, String.format(Messages.CreateJavaValidationPluginHandler_ProfileIsNotAPluginExplication, hostingProject.getName()));
-				}
-			}
-			catch (CoreException e) {
-				Activator.log.error(e);
-			}
-		
-			int question = 0;
-			if ((hostingProject != null) && hostingProject.exists() && isPlugin) {
-				MessageDialog dialog = new MessageDialog(shell,
-						Messages.CreateJavaValidationPluginHandler_ChoosePluginGeneration, null,
-						Messages.CreateJavaValidationPluginHandler_HowtoGeneratePlugin, MessageDialog.QUESTION,
-						new String[] { Messages.CreateJavaValidationPluginHandler_CreateNewPlugin, Messages.CreateJavaValidationPluginHandler_SelectExisting, Messages.CreateJavaValidationPluginHandler_HostCurrent }, 2);
-				question = dialog.open();
-			}
-			else if (root.getProjects().length > 0) {
-				MessageDialog dialog = new MessageDialog(shell,
-						Messages.CreateJavaValidationPluginHandler_ChoosePluginGeneration, null,
-						Messages.CreateJavaValidationPluginHandler_HowtoGeneratePlugin, MessageDialog.QUESTION,
-						new String[] { Messages.CreateJavaValidationPluginHandler_CreateNewPlugin, Messages.CreateJavaValidationPluginHandler_SelectExisting }, 1);
-				question = dialog.open();
-			}
-
-			boolean verboseDependency = true;
-
-			if ((question == 1) || (question == 2)) {
-				if (question == 1) {
-					// get object which represents the workspace
-
-					ResourceListSelectionDialog dialog =
-						    new ResourceListSelectionDialog(shell, root, IResource.PROJECT);
-					dialog.setTitle(Messages.CreateJavaValidationPluginHandler_SelectExisting);
-				
-					if (dialog.open() == Window.OK) {
-						targetProject = (IProject) dialog.getResult()[0];
-					}
-				}
-				else {
-					targetProject = hostingProject;
-				}
-			}
-			else if (question == 0) {
-
-				CreateEMFValidationProject wizard = new CreateEMFValidationProject(profileSelection, constraintsManager, definition);
-				if (wizard.openDialog() == Window.OK) {
-					targetProject = wizard.getProject();
-				}
-				// don't create a dialog for added dependency (since the project is new, this information is not useful)
-				verboseDependency = false;
-			}
-			if (targetProject != null) {
-				// generate java code
-				JavaContentGenerator generateAllJava = new JavaContentGenerator(targetProject, profileSelection);
-				try {
-					generateAllJava.run();
-					// generate plugin + extension point
-					ValidationPluginGenerator.instance.generate(targetProject, constraintsManager, definition);
-					addDependencyToProject(shell, hostingProject, ValidationPluginGenerator.UML_DSML_VALIDATION_PROFILE_PLUGIN, true);
-					if (Utils.isStaticProfile()) {
-						// add dependency to existing project (project hosting the static profile)
-						addDependencyToProject(shell, targetProject, hostingProject.getName(), verboseDependency);
-					}
-				} catch (Exception e) {
-					Activator.log.error(e);
-					MessageDialog.openInformation(shell, Messages.CreateJavaValidationPluginHandler_ExceptionDuringPluginGeneration, Messages.CreateJavaValidationPluginHandler_CheckErrorLog);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param shell An active shell
-	 * @param dependingProject the project that will host the validation constraints
-	 * @param dependsOnPlugin the name of the plugin on which it depends
-	 * @param verbose if true, create a shell message
-	 * @throws CoreException
-	 * @throws IOException
-	 */
-	public void addDependencyToProject(Shell shell, IProject dependingProject, String dependsOnPlugin, boolean verbose) throws CoreException, IOException {
-		if (ValidationPluginGenerator.instance.addDependency(dependingProject, dependsOnPlugin)) {
-			if (verbose) {
-				String message = Messages.CreateJavaValidationPluginHandler_DependencyAddedMsg;
-				if (dependsOnPlugin.equals(ValidationPluginGenerator.UML_DSML_VALIDATION_PROFILE_PLUGIN)) {
-					message += " " + Messages.CreateJavaValidationPluginHandler_DSMLDependencyAddedMsg; //$NON-NLS-1$
-				}
-				MessageDialog.openInformation(shell, Messages.CreateJavaValidationPluginHandler_DependencyAdded,
-						String.format(message, dependsOnPlugin, dependingProject.getName()));
-			}
-		}
-	}
-	
-	@Override
-	public boolean isEnabled() {
-		EObject eObject = getSelectedElement();
-		if (eObject instanceof Profile) {
-			return true;
-		}
-		return false;
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
deleted file mode 100644
index 71673548155..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/Messages.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST 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:
- *   CEA LIST - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.dsml.validation.generation.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author ansgar
- *
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.dsml.validation.generation.ui.messages"; //$NON-NLS-1$
-	public static String CreateJavaValidationPluginHandler_CheckErrorLog;
-	public static String CreateJavaValidationPluginHandler_ChoosePluginGeneration;
-	public static String CreateJavaValidationPluginHandler_CreateNewPlugin;
-	public static String CreateJavaValidationPluginHandler_DependencyAdded;
-	public static String CreateJavaValidationPluginHandler_DependencyAddedMsg;
-	public static String CreateJavaValidationPluginHandler_DSMLDependencyAddedMsg;
-	public static String CreateJavaValidationPluginHandler_ExceptionDuringPluginGeneration;
-	public static String CreateJavaValidationPluginHandler_GenerateIntoExisting;
-	public static String CreateJavaValidationPluginHandler_SelectExisting;
-	public static String CreateJavaValidationPluginHandler_HostCurrent;
-	public static String CreateJavaValidationPluginHandler_HowtoGeneratePlugin;
-	public static String CreateJavaValidationPluginHandler_ProfileIsNotAPlugin;
-	public static String CreateJavaValidationPluginHandler_ProfileIsNotAPluginExplication;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
deleted file mode 100644
index 2eba8a7b069..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/src/org/eclipse/papyrus/dsml/validation/generation/ui/messages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-CreateJavaValidationPluginHandler_CheckErrorLog=An exception occured during plugin generation. Please check the error log.
-CreateJavaValidationPluginHandler_ChoosePluginGeneration=Choose plugin generation
-CreateJavaValidationPluginHandler_CreateNewPlugin=Create a new plugin
-CreateJavaValidationPluginHandler_DependencyAdded=Dependency has been added
-CreateJavaValidationPluginHandler_DependencyAddedMsg=A dependency to the "%s" plugin has been added to project "%s".
-CreateJavaValidationPluginHandler_DSMLDependencyAddedMsg=It assures that the DSML validation profile will be automatically installed during deployment. This is required if your profile applies the DSML profile, unless you externalize the profile application (remove the dependency manually in this case).
-CreateJavaValidationPluginHandler_ExceptionDuringPluginGeneration=Exception occured during plugin generation
-CreateJavaValidationPluginHandler_GenerateIntoExisting=Generate DSML code into existing plugin\nCAVEAT: this operation will modify the plugin.xml
-CreateJavaValidationPluginHandler_HostCurrent=Host in current plugin
-CreateJavaValidationPluginHandler_SelectExisting=Select an existing plugin
-CreateJavaValidationPluginHandler_HowtoGeneratePlugin=How should the plugin be generated?\n\n(Please note that customized messages and severities can be supplied via the DSML validation profile)  
-CreateJavaValidationPluginHandler_ProfileIsNotAPlugin=Profile is not a plugin
-CreateJavaValidationPluginHandler_ProfileIsNotAPluginExplication=The project (%s) that hosts the profile is not a plugin. Verify that the project itself is imported into the workspace. If you continue, the option to generate into the hosting plugin is not available. Papyrus will also not be able to create a dependency to the DSML plugin for you.
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.classpath b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.project b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.project
deleted file mode 100644
index 6c5407a32ac..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.dsml.validation.model</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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_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_lambda_body=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=false
-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=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=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_after_type_annotation=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_lambda_arrow=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_lambda_arrow=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=260
-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=5
-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=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +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_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-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_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\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">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\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">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><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">/**\n * ${tags}\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">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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}\n${package_declaration}\n\n${typecomment}\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">\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">\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">\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">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</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\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}\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>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF
deleted file mode 100644
index e293ef5472e..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.dsml.validation.model,
- org.eclipse.papyrus.dsml.validation.model.elements.impl,
- org.eclipse.papyrus.dsml.validation.model.elements.interfaces,
- org.eclipse.papyrus.dsml.validation.model.profilenames
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="3.2.100",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.dsml.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)"
-Bundle-Vendor: %pluginProvider
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.dsml.validation.model.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.model;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/about.html b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/build.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/build.properties
deleted file mode 100644
index 1b08f841b5e..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/plugin.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/plugin.properties
deleted file mode 100644
index cf8a9575e7f..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 CEA LIST.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     CEA LIST - initial API and implementation
-###############################################################################
-pluginName=Papyrus DSML Validation model (Incubation)
-pluginProvider=Eclipse Modeling Project
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml
deleted file mode 100644
index 1f6cfc352e4..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.model</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/Activator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/Activator.java
deleted file mode 100644
index c66ddb9e9dd..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/Activator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	/**
-	 * PluginID
-	 * */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.dsml.validation.model"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
-	 * )
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
-	 * )
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/CategoryImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/CategoryImpl.java
deleted file mode 100644
index 9d40c238d94..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/CategoryImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) patrick.Tessuier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category;
-
-/**
- * Implementation of a category interface.
- *
- *
- */
-public class CategoryImpl implements Category {
-
-
-	private List<Category> subCategories = new ArrayList<Category>();
-
-	private Category parentCategory;
-	private String id;
-
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param name
-	 *            the name of the category
-	 * @param parentCategory
-	 */
-	public CategoryImpl(String name, Category parentCategory) {
-		this.id = name;
-		this.name = name;
-		this.isMandatory = false;
-		this.parentCategory = parentCategory;
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category#getID()
-	 *
-	 */
-	public String getID() {
-		return this.id;
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category#getName()
-	 *
-	 */
-	public String getName() {
-		return this.name;
-	}
-
-	private String name;
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category#isMandatory()
-	 *
-	 */
-	public boolean isMandatory() {
-		return this.isMandatory;
-	}
-
-	private boolean isMandatory;
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category#getSubcategories()
-	 *
-	 */
-	public List<Category> getSubcategories() {
-		return subCategories;
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category#addSubcategories(java.util.List)
-	 *
-	 */
-	public void addSubcategories(List<Category> subCategories) {
-		this.subCategories.addAll(subCategories);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category#getParentCategory()
-	 *
-	 */
-	public Category getParentCategory() {
-		return this.parentCategory;
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintCategoryImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintCategoryImpl.java
deleted file mode 100644
index 65adcbcf313..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintCategoryImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier( CEA LIST) patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IValidationRule;
-
-/**
- * Implementation of a constraint category interface.
- *
- *
- */
-public class ConstraintCategoryImpl extends CategoryImpl implements IConstraintsCategory {
-
-	private List<IValidationRule> constraints = new ArrayList<IValidationRule>();
-
-	private String categoriesList;
-
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param category
-	 */
-	public ConstraintCategoryImpl(String name, Category parentCategory) {
-		super(name, parentCategory);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory#getCategoriesList()
-	 *
-	 */
-	public String getCategoriesList() {
-		return this.categoriesList;
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory#getConstraints()
-	 *
-	 */
-	public List<IValidationRule> getConstraints() {
-		return constraints;
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory#addConstraints(java.util.List)
-	 *
-	 * @param constraints
-	 */
-	public void addConstraints(List<IValidationRule> constraints) {
-		this.constraints.addAll(constraints);
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintManagerImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintManagerImpl.java
deleted file mode 100644
index 768232e0df4..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintManagerImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintProvider;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager;
-import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;
-import org.eclipse.papyrus.uml.tools.utils.StaticProfileUtil;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.Stereotype;
-
-/**
- * Management of validationRules assigned to the stereotypes specified in the
- * defined profile.
- * ContraintProvider=Category=profile or subprofile
- *
- *
- */
-public class ConstraintManagerImpl implements IConstraintsManager {
-
-	private List<IConstraintProvider> constraintsProviders = new ArrayList<IConstraintProvider>();
-
-	private Map<Stereotype, List<Constraint>> constraintsOfStereotype = new HashMap<Stereotype, List<Constraint>>();
-	private Map<Constraint, ValidationRuleImpl> validationRuleMap = new HashMap<Constraint, ValidationRuleImpl>();
-
-
-
-	public Map<Constraint, ValidationRuleImpl> getValidationRuleMap() {
-		return validationRuleMap;
-	}
-
-	public Map<Stereotype, List<Constraint>> getConstraintsOfStereotype() {
-		return constraintsOfStereotype;
-	}
-
-
-	private Category primeCategory;
-
-	private IConstraintProvider constraintProvider;
-
-
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param profile
-	 */
-	public ConstraintManagerImpl(Profile profile) {
-
-		extractElements(profile);
-
-	}
-
-	/**
-	 * Method to get all the elements from the model, necessary to build a
-	 * plugin for validationRules validation.
-	 *
-	 * @param root
-	 *            root profile for which the validation plugin will be generated
-	 */
-	private void extractElements(Profile root) {
-
-		// get the list of validationRules for each stereotype
-		createStereotypeToConstraintsMapping(root);
-
-		// the top profile becomes the prime category
-		primeCategory = new CategoryImpl(root.getName().toLowerCase(), null);
-
-		// construct all sub categories
-		relateCategoriesWithConstraints(root, primeCategory);
-	}
-
-	/**
-	 * Recursive function to relate categories with the validationRules
-	 * a profile becomes a category= a constraint Provider
-	 * a stereotype becomes a category
-	 *
-	 * @param element
-	 *            element for which function will find validationRules and its
-	 *            related categories
-	 * @param category
-	 *            category for a group of validationRules
-	 */
-	private void relateCategoriesWithConstraints(Element element, Category category) {
-
-		if (element instanceof Profile) {
-			Profile profile = (Profile) element;
-
-			// creation of a category
-			ConstraintCategoryImpl subCategory = new ConstraintCategoryImpl(((Profile) element).getName(), category);
-			// add the category to the list of category
-			category.getSubcategories().add(subCategory);
-			// creation of a provider
-			// construct one constraint provider
-			constraintProvider = new ConstraintProviderImpl();
-			// associate validation to category to provider
-			constraintProvider.getConstraintsCategories().add(subCategory);
-			constraintsProviders.add(constraintProvider);
-			StaticProfileUtil staticProfile = new StaticProfileUtil(profile);
-			Utils.setStaticProfile(staticProfile);
-			if (staticProfile.getDefinition() != null) {
-				constraintProvider.setEPackage(staticProfile.getDefinition());
-			}
-			else if (profile.getDefinition() != null) {
-				constraintProvider.setEPackage(profile.getDefinition());
-			}
-
-			// iterate on all direct element of the profile
-			for (NamedElement subElement : ((Profile) element).getOwnedMembers()) {
-
-				// this a profile
-				if (subElement instanceof Profile) {
-					this.relateCategoriesWithConstraints(subElement, subCategory);
-				} else if (subElement instanceof Stereotype) {
-
-					// create validation rules
-					if (this.constraintsOfStereotype.get(subElement) != null) {
-						for (Constraint constraint : this.constraintsOfStereotype.get(subElement)) {
-							try {
-								ValidationRuleImpl rule = new ValidationRuleImpl(constraint, subCategory);
-								validationRuleMap.put(constraint, rule);
-								subCategory.getConstraints().add(rule);
-							} catch (WrongStereotypeException e) {
-								e.printStackTrace();
-							}
-						}
-					}
-
-				}
-			}
-
-		}
-	}
-
-	/**
-	 * create a category from the owner category and the sub-element that will becomes a category
-	 *
-	 * @param category
-	 *            the category owner
-	 * @param subElement
-	 *            the element that will become a category
-	 * @return the category
-	 */
-	protected Category createCategory(Category category, NamedElement subElement) {
-		Category subCategory;
-		subCategory = new CategoryImpl(category.getName() + "." + subElement.getName().toLowerCase(), category);
-		return subCategory;
-	}
-
-	/**
-	 * Recursive method that finds validationRules of each stereotype defined in the
-	 * model.
-	 * it add validationRules only if there are stereotype validationRules
-	 *
-	 * @param profile
-	 *            root profile with stereotypes for which validationRules defined in
-	 *            the model will be found
-	 */
-	private void createStereotypeToConstraintsMapping(Profile profile) {
-
-		for (Element element : profile.allOwnedElements()) {
-
-			if (element instanceof Constraint) {
-				// don't restrict to elements that apply validation rule stereotype, see bug
-				// 464249 - [..] The validation plugin generator silently ignores constraints without ValidationRule stereotype
-				// if (element.getAppliedStereotype(IDSMLValidation.VALIDATIONRULE_STEREOTYPE) != null) {
-
-				Element contextElement = ((Constraint) element).getContext();
-
-				// get the stereotype to add the constraint
-				if (contextElement instanceof Stereotype) {
-					if (this.constraintsOfStereotype.keySet().contains(contextElement)) {
-						this.constraintsOfStereotype.get(contextElement).add((Constraint) element);
-					} else {
-						List<Constraint> constraintsList = new ArrayList<Constraint>();
-						constraintsList.add((Constraint) element);
-						this.constraintsOfStereotype.put((Stereotype) contextElement, constraintsList);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager#getConstraintsProviders()
-	 *
-	 */
-
-	public List<IConstraintProvider> getConstraintsProviders() {
-		return this.constraintsProviders;
-	}
-
-
-	/**
-	 *
-	 * @see org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager#getPrimeCategory()
-	 *
-	 */
-	public Category getPrimeCategory() {
-		return this.primeCategory;
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintProviderImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintProviderImpl.java
deleted file mode 100644
index e022bc0a3bd..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ConstraintProviderImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintProvider;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Mode;
-
-/**
- * this is constraint constraint provider see extension point
- *
- */
-public class ConstraintProviderImpl implements IConstraintProvider {
-
-	private List<IConstraintsCategory> constraintsCategories = new ArrayList<IConstraintsCategory>();
-	private Mode mode;
-	private boolean cache;
-	private EPackage ePackage = null;
-
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 */
-	public ConstraintProviderImpl() {
-
-		this.mode = Mode.Batch;
-
-		this.cache = false;
-
-	}
-
-	public Mode getMode() {
-		// TODO Auto-generated method stub
-		return this.mode;
-	}
-
-	public boolean getCache() {
-		// TODO Auto-generated method stub
-		return this.cache;
-	}
-
-
-	public List<IConstraintsCategory> getConstraintsCategories() {
-		// TODO Auto-generated method stub
-		return constraintsCategories;
-	}
-
-
-	public void addConstraintCategories(
-			List<IConstraintsCategory> constraintCategories) {
-		// TODO Auto-generated method stub
-		this.constraintsCategories.addAll(constraintCategories);
-	}
-
-	public EPackage getEPackage() {
-		return ePackage;
-	}
-
-	public void setEPackage(EPackage ePackage) {
-		this.ePackage = ePackage;
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java
deleted file mode 100644
index 0fb87c1252a..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/ValidationRuleImpl.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modifications
- *  Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - clean-up, bug 464249 (constraints without ValidationRule stereotype)
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.papyrus.dsml.validation.IDSMLValidation;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IValidationRule;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Mode;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Severity;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Stereotype;
-
-/**
- * Implementation of an interface relating to the ValidationRule interface.
- *
- */
-public class ValidationRuleImpl implements IValidationRule {
-
-	/**
-	 * 
-	 */
-	private static final String CONSTRAINT_POSTFIX = "Constraint";
-
-	/**
-	 * 
-	 */
-	private static final String DPT = ".";
-
-	/**
-	 * 
-	 */
-	private static final String CONSTRAINT_PKG = "constraints";
-
-	/**
-	 * Attributes of stereotype ValidationRule
-	 */
-	private static final String SA_TARGET = "target"; //$NON-NLS-1$
-
-	private static final String SA_ID = "id"; //$NON-NLS-1$
-
-	private static final String SA_STATUS_CODE = "statusCode"; //$NON-NLS-1$
-
-	private static final String SA_SEVERITY = "severity"; //$NON-NLS-1$
-
-	private static final String SA_MODE = "mode"; //$NON-NLS-1$
-
-	private static final String SA_IS_ENABLED_BY_DEFAULT = "isEnabledByDefault"; //$NON-NLS-1$
-
-	private static final String SA_DESCRIPTION = "description"; //$NON-NLS-1$
-
-	private static final String SA_MESSAGE = "message"; //$NON-NLS-1$
-
-	private String id;
-
-	private Constraint constraint;
-
-	private Stereotype stereotype;
-
-	private List<String> targets;
-
-	private String implementingClass;
-
-	/**
-	 * Constructor which takes as an parameter constraint from the model.
-	 *
-	 * @param constraint
-	 *            constraint from the model
-	 * @throws WrongStereotypeException
-	 *             exception in case when constraint passed to the constructor
-	 *             is not stereotyped with IValidationRule stereotype
-	 */
-	public ValidationRuleImpl(Constraint constraint) throws WrongStereotypeException {
-		this.constraint = constraint;
-		stereotype = constraint.getAppliedStereotype(IDSMLValidation.VALIDATIONRULE_STEREOTYPE);
-		if (stereotype == null) {
-			// throw new WrongStereotypeException(ERROR);
-		}
-	}
-
-	/**
-	 * Constructor which takes as an parameter constraint from the model and
-	 * category to which this constraint will belong.
-	 *
-	 * @param constraint
-	 *            constraint from the model
-	 * @param parentCategory
-	 *            parent category
-	 * @throws WrongStereotypeException
-	 *             exception in case when constraint passed to the constructor
-	 *             is not stereotyped with IValidationRule stereotype
-	 */
-	@SuppressWarnings("rawtypes")
-	public ValidationRuleImpl(Constraint constraint, Category parentCategory) throws WrongStereotypeException {
-
-		this(constraint);
-
-		/*
-		 * If the value of id has not been declared by the user, generated id
-		 * value will be assigned and saved in the model.
-		 */
-		if ((getStereoAttribValue(SA_ID) instanceof String) && ((String) getStereoAttribValue(SA_ID)).length() > 0) {
-			id = (String) getStereoAttribValue(SA_ID);
-		}
-		else {
-			String qname = constraint.getQualifiedName().replace("::", DPT);
-			id = qname;
-		}
-
-		implementingClass = CONSTRAINT_PKG + DPT + this.getName() + CONSTRAINT_POSTFIX;
-
-		// unused
-		// this.contextID = parentCategory.getID();
-
-		targets = new ArrayList<String>();
-
-		/*
-		 * If there is no target specified, plugin will automatically assign as
-		 * a target for a constraint, those elements which are extended by the
-		 * stereotype to which the constraint applies.
-		 */
-		Object targetsObj = getStereoAttribValue(SA_TARGET);
-		if ((targetsObj instanceof EDataTypeUniqueEList) && ((EDataTypeUniqueEList) targetsObj).size() > 0) {
-			for (Object target : (EDataTypeUniqueEList) targetsObj) {
-				if (target instanceof String) {
-					targets.add((String) target);
-				}
-			}
-		}
-	}
-
-	public String getName() {
-		return constraint.getName();
-	}
-
-	public String getID() {
-		return id == null ? (String) getStereoAttribValue(SA_ID) : id;
-	}
-
-	public Integer getStatusCode() {
-		Integer statusCode = (Integer) getStereoAttribValue(SA_STATUS_CODE);
-		return statusCode == null ? new Integer(1) : statusCode;
-	}
-
-	public Severity getSeverity() {
-		Object severityObj = getStereoAttribValue(SA_SEVERITY);
-		if (severityObj instanceof Enumerator) {
-			Enumerator severity = (Enumerator) severityObj;
-
-			String severityType = severity.getName();
-
-			if (severityType.compareTo(Severity.INFO.name()) == 0) {
-				return Severity.INFO;
-			} else if (severityType.compareTo(Severity.WARNING.name()) == 0) {
-				return Severity.WARNING;
-			} else if (severityType.compareTo(Severity.CANCEL.name()) == 0) {
-				return Severity.CANCEL;
-			}
-		}
-		return Severity.ERROR;
-	}
-
-	public String getImplementingClass() {
-		return implementingClass;
-	}
-
-	public Mode getMode() {
-		Object modeObj = (stereotype != null) ? constraint.getValue(stereotype, SA_MODE) : null;
-		if (modeObj instanceof Enumerator) {
-			Enumerator mode = (Enumerator) modeObj;
-
-			String modeType = mode.getName();
-
-			if (modeType.compareTo(Mode.Batch.name()) == 0) {
-				return Mode.Batch;
-			} else if (modeType.compareTo(Mode.Live.name()) == 0) {
-				return Mode.Live;
-			}
-		}
-		return Mode.Batch;
-	}
-
-	public boolean isEnabledByDefault() {
-		Object enabledByDefault = getStereoAttribValue(SA_IS_ENABLED_BY_DEFAULT);
-		return enabledByDefault instanceof Boolean ? ((Boolean) enabledByDefault).booleanValue() : true;
-	}
-
-	public String getMessage() {
-		return (String) getStereoAttribValue(SA_MESSAGE);
-	}
-
-	public String getDescription() {
-		return (String) getStereoAttribValue(SA_DESCRIPTION);
-	}
-
-	public List<String> getTargets() {
-		return targets;
-	}
-
-	public Constraint getConstraint() {
-		return this.constraint;
-	}
-	
-	/**
-	 * Helper function that returns the value of the ValidationRule stereotype,
-	 * if applied to the underlying constraint
-	 * @param attributeName the name of the stereotype attribute
-	 * @return null or value of stereotype attribute
-	 */
-	public Object getStereoAttribValue(String attributeName) {
-		if (stereotype != null) {
-			return constraint.getValue(stereotype, attributeName);
-		}
-		return null;
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/WrongStereotypeException.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/WrongStereotypeException.java
deleted file mode 100644
index 14121c58c8d..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/impl/WrongStereotypeException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modifications
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.impl;
-
-/**
- * Exception which is thrown in case specific model element is not stereotype
- * with and expected stereotype.
- *
- *
- */
-public class WrongStereotypeException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-
-	public WrongStereotypeException() {
-		super("Element is not stereotyped with applicable stereotype");
-	}
-
-	public WrongStereotypeException(String msg) {
-		super(msg);
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Category.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Category.java
deleted file mode 100644
index 648fff008cc..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Category.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier( CEA LIST) patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.interfaces;
-
-import java.util.List;
-
-/**
- * Interface representing category from the EMF Validation Framework.
- *
- *
- */
-public interface Category {
-
-	/**
-	 *
-	 *
-	 * @return ID of a category
-	 */
-	public String getID();
-
-	/**
-	 *
-	 *
-	 * @return Name of a category
-	 */
-	public String getName();
-
-	/**
-	 *
-	 * @return Information whether category is mandatory
-	 */
-	public boolean isMandatory();
-
-	/**
-	 *
-	 * @return Sub-categories of a given category
-	 */
-	public List<Category> getSubcategories();
-
-
-	/**
-	 * Adding list of sub-categories
-	 *
-	 * @param subCategories
-	 *            list of sub-categories to add
-	 */
-	public void addSubcategories(List<Category> subCategories);
-
-	/**
-	 * @return Access to parent category
-	 */
-	public Category getParentCategory();
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintProvider.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintProvider.java
deleted file mode 100644
index d5d28120bde..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.interfaces;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * Interface representing constraint provider from the EMF Validation Framework
- */
-public interface IConstraintProvider {
-	/**
-	 *
-	 * @return the mode of this provider
-	 */
-	public Mode getMode();
-
-	/**
-	 *
-	 * @return the cache of the provider
-	 */
-	public boolean getCache();
-
-
-	public EPackage getEPackage();
-
-	public void setEPackage(EPackage ePackage);
-
-	/**
-	 *
-	 * @return the list of categories
-	 */
-	public List<IConstraintsCategory> getConstraintsCategories();
-
-	/**
-	 * add categories
-	 *
-	 * @param constraintCategories
-	 *            a list of categories
-	 */
-	public void addConstraintCategories(
-			List<IConstraintsCategory> constraintCategories);
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsCategory.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsCategory.java
deleted file mode 100644
index 94af58b573d..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsCategory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.interfaces;
-
-import java.util.List;
-
-/**
- * Interface representing constraint category from EMF Validation Framework
- *
- *
- */
-public interface IConstraintsCategory extends Category {
-	/**
-	 *
-	 * @return constraints
-	 */
-
-	public List<IValidationRule> getConstraints();
-
-	/**
-	 *
-	 * @return the list of categories as a string
-	 */
-	public String getCategoriesList();
-
-
-	/**
-	 * add a list of constraint
-	 *
-	 * @param constraints
-	 */
-	public void addConstraints(List<IValidationRule> constraints);
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsManager.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsManager.java
deleted file mode 100644
index dd5a037abde..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IConstraintsManager.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *   Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.interfaces;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.papyrus.dsml.validation.model.elements.impl.ValidationRuleImpl;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Stereotype;
-
-/**
- * Interface which specifies methods for the manager taking charge of a
- * constraints defined in a profile.
- *
- */
-public interface IConstraintsManager {
-
-
-	/**
-	 * Access to the list of constraint providers which are necessary for the
-	 * specification of a validation plugin.
-	 *
-	 * @return list of constraint providers
-	 */
-	public List<IConstraintProvider> getConstraintsProviders();
-
-	public Map<Constraint, ValidationRuleImpl> getValidationRuleMap();
-
-
-	/**
-	 * Access to the prime category.
-	 *
-	 * @return prime category
-	 */
-	public Category getPrimeCategory();
-
-
-	/**
-	 *
-	 * @return the hashmap of constraint per stereotype
-	 */
-	public Map<Stereotype, List<Constraint>> getConstraintsOfStereotype();
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IValidationRule.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IValidationRule.java
deleted file mode 100644
index c96f67e8bef..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/IValidationRule.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.interfaces;
-
-import java.util.List;
-
-import org.eclipse.uml2.uml.Constraint;
-
-/**
- * Interface representing constraints specified in a profile model
- *
- *
- */
-public interface IValidationRule {
-
-	/**
-	 * Getting the name of a constraint
-	 *
-	 * @return name of a constraint
-	 */
-	public String getName();
-
-	/**
-	 * Getting the id of a constraint
-	 *
-	 * @return id of a constraint
-	 */
-	public String getID();
-
-	/**
-	 * Getting the status code of a constraint
-	 *
-	 * @return status code of a constraint
-	 */
-	public Integer getStatusCode();
-
-	/**
-	 * Getting the severity of a constraint (ERROR, INFO, WARNING or CANCEL)
-	 *
-	 * @return severity of a constraint
-	 */
-	public Severity getSeverity();
-
-	/**
-	 * Getting the name of a Java class that implements the method validating
-	 * the constraint
-	 *
-	 * @return name of a Java class
-	 */
-	public String getImplementingClass();
-
-	/**
-	 * Getting the mode of a constraint (Batch or Live)
-	 *
-	 * @return mode of a constraint
-	 */
-	public Mode getMode();
-
-	/**
-	 * Getting the value that tells whether the constraint validation will be
-	 * triggered
-	 *
-	 * @return value specifying triggering of a constraint
-	 */
-	public boolean isEnabledByDefault();
-
-	/**
-	 * Getting the message that is displayed in the Properties view if the
-	 * constraint was violated
-	 *
-	 * @return message displayed in case when constraint was violated
-	 */
-	public String getMessage();
-
-	/**
-	 * Getting the natural language description of a constraint
-	 *
-	 * @return natural language description of a constraint
-	 */
-	public String getDescription();
-
-	/**
-	 * Getting the targets, namely the names of model elements against which the
-	 * constraint will be validated
-	 *
-	 * @return names of model elements for which the constraint applies
-	 */
-	public List<String> getTargets();
-
-
-	/**
-	 * Constraint from the model represented by this interface
-	 *
-	 * @return model constraint
-	 */
-	public Constraint getConstraint();
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Mode.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Mode.java
deleted file mode 100644
index da15b7b08d2..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Mode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.interfaces;
-
-/**
- * Enumeration that specifies modes for the constraints validation: Batch -
- * constraints validation is triggered on user demand Live - constraints
- * validation is triggered every time when change in the model occures
- *
- *
- */
-public enum Mode {
-
-	Batch, Live;
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Severity.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Severity.java
deleted file mode 100644
index 22234391b89..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/elements/interfaces/Severity.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.elements.interfaces;
-
-/**
- * Enumeration that specifies different types of a constraint violation.
- *
- *
- */
-public enum Severity {
-
-	INFO, WARNING, ERROR, CANCEL
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/profilenames/Utils.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/profilenames/Utils.java
deleted file mode 100644
index d1018c3fd5d..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model/src/org/eclipse/papyrus/dsml/validation/model/profilenames/Utils.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modifications
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.model.profilenames;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.papyrus.uml.tools.utils.StaticProfileUtil;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.OpaqueExpression;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Provision of functionality for management of constraints.
- *
- *
- */
-public class Utils {
-
-	private static final String DOT = "."; //$NON-NLS-1$
-	private static final String JAVA_LANGUAGE = "JAVA"; //$NON-NLS-1$
-	private static final String OCL_LANGUAGE = "OCL"; //$NON-NLS-1$
-
-	/*
-	 * Map holding relations between String representing the qualified name of a
-	 * constraint and name of a package to which it belongs. Package name in
-	 * this case is built from the predefined prefix and names of the profiles
-	 * in which considered constraint is included. Name of this package is used
-	 * for the specification of a package in which java class implementing the
-	 * constraint is located.
-	 */
-	private static Map<String, String> constraintToItsPackage = new HashMap<String, String>();
-
-	/**
-	 * Retrieval of a java constraint body.
-	 *
-	 * @param valueSpecification
-	 *            ValueSpecification which contains specification of a java code
-	 *            validating the constraint.
-	 * @return string representing the java code validating constraint
-	 */
-	public static String getJavaConstraintBody(ValueSpecification valueSpecification) {
-
-		if (valueSpecification == null
-				|| !(valueSpecification instanceof OpaqueExpression)) {
-			return null;
-		}
-
-		int index = 0;
-		for (String language : ((OpaqueExpression) valueSpecification)
-				.getLanguages()) {
-			if (language.compareTo(JAVA_LANGUAGE) == 0) {
-				return ((OpaqueExpression) valueSpecification).getBodies().get(index);
-			}
-			index++;
-		}
-
-		return null;
-	}
-
-	/**
-	 * This method performs check whether for specific constraint exists
-	 * specification of a java code.
-	 *
-	 * @param constraint
-	 *            constraint for which check for existing java code is performed
-	 * @return true if there is an existing specification of a java code
-	 *         validating constraint
-	 */
-	public static Boolean hasSpecificationForJava(Constraint constraint) {
-
-		ValueSpecification valueSpec = constraint.getSpecification();
-
-		if (valueSpec == null || !(valueSpec instanceof OpaqueExpression)) {
-			return false;
-		}
-
-		for (String language : ((OpaqueExpression) valueSpec).getLanguages()) {
-			if (language.compareTo(JAVA_LANGUAGE) == 0) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * return the qualified name of the stereotype that is the context of the constraint.
-	 *
-	 * @param constraint
-	 *            the constraint
-	 * @return the qualified name of the constraint or ""
-	 */
-	public static String getConstraintForStereotype(Constraint constraint) {
-
-		Namespace nameSpace = constraint.getContext();
-		if (nameSpace instanceof Stereotype) {
-			if (staticProfile != null) {
-				String basePackage = staticProfile.getBasePackage();
-				if (basePackage != null) {
-					String packageName = staticProfile.getPackageName();
-					if (packageName != null) {
-						return basePackage + DOT + packageName + DOT + nameSpace.getName();
-					} else {
-						return basePackage + DOT + nameSpace.getQualifiedName();
-					}
-				}
-			}
-			return nameSpace.getQualifiedName();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Return true if the constraint is to validate something about a stereotype
-	 *
-	 * @param constraint
-	 *            the constraint
-	 * @return true if the context of the constraint is a stereotype
-	 */
-	public static Boolean isConstraintForStereotype(Constraint constraint) {
-
-		Namespace nameSpace = constraint.getContext();
-		if (nameSpace instanceof Stereotype) {
-			return true;
-		}
-		return false;
-
-	}
-
-	/**
-	 * Retrieval of an OCL constraint body.
-	 *
-	 * @param constraint
-	 *            constraint for which OCL body is retrieved
-	 * @return OCL constraint body
-	 */
-	public static String getOCLConstraintBody(Constraint constraint) {
-
-		int index = 0;
-		ValueSpecification valueSpec = constraint.getSpecification();
-
-		if (valueSpec != null && valueSpec instanceof OpaqueExpression) {
-
-			for (String language : ((OpaqueExpression) valueSpec)
-					.getLanguages()) {
-
-				if (language.compareTo(OCL_LANGUAGE) == 0) {
-					return ((OpaqueExpression) valueSpec).getBodies()
-							.get(index);
-				}
-				index++;
-			}
-		}
-
-		return null;
-
-	}
-
-	/**
-	 * Check whether there is specification of an OCL specification
-	 *
-	 * @param constraint
-	 *            constraint for which check is performed
-	 * @return true if there is an existing specification of an OCL expression
-	 *         validating the constraint
-	 */
-	public static Boolean hasSpecificationForOCL(Constraint constraint) {
-
-		ValueSpecification valueSpec = constraint.getSpecification();
-
-		if (valueSpec == null || !(valueSpec instanceof OpaqueExpression)) {
-			return false;
-		}
-
-		for (String language : ((OpaqueExpression) valueSpec).getLanguages()) {
-			if (language.compareTo(OCL_LANGUAGE) == 0) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Method to insert the correspondence between the constraint and the
-	 * package in which the java class validating the constraint will be placed.
-	 *
-	 * @param constraint
-	 *            constraint for which the package is being assigned
-	 * @param pkg
-	 *            package in which java code validating the constraint will be
-	 *            placed
-	 */
-	public static void putMappnig(Constraint constraint, String pkg) {
-
-		Utils.getConstraintToItsPackage().put(constraint.getQualifiedName(),
-				pkg);
-	}
-
-	/**
-	 * Getter for constraintToItsPackage map.
-	 *
-	 * @return
-	 */
-	public static Map<String, String> getConstraintToItsPackage() {
-		return constraintToItsPackage;
-	}
-
-	/**
-	 * Setter for constraintToItsPackage map.
-	 *
-	 * @param constraintToItsPackage
-	 */
-	public static void setConstraintToItsPackage(
-			Map<String, String> constraintToItsPackage) {
-		Utils.constraintToItsPackage = constraintToItsPackage;
-	}
-
-	/**
-	 * @return the top level package. It corresponds to the pluginID in lower case. Used by Acceleo template that generates the contents of selectors
-	 */
-	public static String getTopPkg() {
-		return pluginID.toLowerCase();
-	}
-
-	public static void setPluginID(String ID) {
-		pluginID = ID;
-	}
-
-	public static boolean isStaticProfile() {
-		return staticProfile.getDefinition() != null;
-	}
-
-	public static void setStaticProfile(StaticProfileUtil staticProfile) {
-		Utils.staticProfile = staticProfile;
-	}
-
-	private static String pluginID;
-
-	private static StaticProfileUtil staticProfile;
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.classpath b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.project b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.project
deleted file mode 100644
index 62b0b7e9257..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.dsml.validation.properties</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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_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_lambda_body=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=false
-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=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=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_after_type_annotation=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_lambda_arrow=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_lambda_arrow=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=260
-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=5
-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=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +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_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-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_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\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">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\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">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><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">/**\n * ${tags}\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">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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}\n${package_declaration}\n\n${typecomment}\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">\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">\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">\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">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</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\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}\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>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF
deleted file mode 100644
index a2301ea850d..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.dsml.validation.properties.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.properties;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/about.html b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/build.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/build.properties
deleted file mode 100644
index 4c2cc8c1d58..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#Thu Jul 05 14:08:54 CEST 2012
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               propertyView/
-output..=bin/
-source..=src/
-src.includes = about.html
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/customizationConfiguration.xmi b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/customizationConfiguration.xmi
deleted file mode 100644
index cf1513f934d..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/customizationConfiguration.xmi
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<custom:CustomizationConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:custom="http://www.eclipse.org/papyrus/customization" plugin="org.eclipse.papyrus.dsml.validation.properties">
-  <elements xsi:type="custom:PropertyView" file="/org.eclipse.papyrus.dsml.validation/resource/properties/dsmlvalidationproperties.ctx"/>
-</custom:CustomizationConfiguration>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.properties
deleted file mode 100644
index add4103ae2b..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################################################
-# Copyright (c) 2010 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     CEA LIST - initial API and implementation
-##################################################################################
-pluginName=DSML validation properties view (Incubation)
-providerName=Eclipse Modeling Project
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.xml
deleted file mode 100644
index fafa97753ac..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?eclipse version="3.4"?>
-<plugin>
-<extension point="org.eclipse.papyrus.infra.properties.contexts">
-	<context
-		contextModel="/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx"
-		isCustomizable="true"/></extension>
-</plugin>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml
deleted file mode 100644
index be1351d4d23..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.properties</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx
deleted file mode 100644
index 7f2f65d4451..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/dsmlvalidationproperties.ctx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" name="PapyrusDSMLValidationRule">
-  <dependencies href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#/"/>
-  <tabs label="Validation Rules Definition" id="papyrusdsmlvalidationrule" priority="100">
-    <sections name="Single ValidationRule" sectionFile="ui/SingleValidationRule.xwt">
-      <widget href="ui/SingleValidationRule.xwt#/"/>
-    </sections>
-    <sections name="Multiple ValidationRule" sectionFile="ui/MultipleValidationRule.xwt">
-      <widget href="ui/MultipleValidationRule.xwt#/"/>
-    </sections>
-  </tabs>
-  <views name="Single ValidationRule" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleValidationRule">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="PapyrusDSMLValidationRule::ValidationRule"/>
-    </constraints>
-  </views>
-  <views elementMultiplicity="-1" name="Multiple ValidationRule" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleValidationRule">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="PapyrusDSMLValidationRule::ValidationRule"/>
-    </constraints>
-  </views>
-  <dataContexts name="PapyrusDSMLValidationRule">
-    <elements name="ValidationRule">
-      <properties name="severity" type="Enumeration"/>
-      <properties name="class"/>
-      <properties name="id"/>
-      <properties name="isEnabledByDefault" label="Enabled by default" type="Boolean"/>
-      <properties name="mode" type="Enumeration"/>
-      <properties name="target"/>
-      <properties name="message"/>
-      <properties name="description"/>
-      <properties name="statusCode" type="Integer"/>
-      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.11"/>
-    </elements>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.2"/>
-  </dataContexts>
-</contexts:Context>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/MultipleValidationRule.xwt b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/MultipleValidationRule.xwt
deleted file mode 100644
index 33d488b341e..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/MultipleValidationRule.xwt
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="PapyrusDSMLValidationRule:ValidationRule:isEnabledByDefault"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}"
-			property="PapyrusDSMLValidationRule:ValidationRule:severity"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}"
-			property="PapyrusDSMLValidationRule:ValidationRule:mode"></ppe:EnumCombo>
-	</Composite>
-</Composite>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/SingleValidationRule.xwt b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/SingleValidationRule.xwt
deleted file mode 100644
index d70d844caef..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/propertyView/dsmlvalidationproperties/ui/SingleValidationRule.xwt
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="PapyrusDSMLValidationRule:ValidationRule:message"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="PapyrusDSMLValidationRule:ValidationRule:description"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="PapyrusDSMLValidationRule:ValidationRule:isEnabledByDefault"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}"
-			property="PapyrusDSMLValidationRule:ValidationRule:severity"></ppe:EnumCombo>
-		<ppe:EnumCombo input="{Binding}"
-			property="PapyrusDSMLValidationRule:ValidationRule:mode"></ppe:EnumCombo>
-	</Composite>
-</Composite>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/src/org/eclipse/papyrus/dsml/validation/properties/Activator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/src/org/eclipse/papyrus/dsml/validation/properties/Activator.java
deleted file mode 100644
index 2453be4c257..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties/src/org/eclipse/papyrus/dsml/validation/properties/Activator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.papyrus.dsml.validation.properties;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.dsml.validation.properties"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.classpath b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.project b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.project
deleted file mode 100644
index 262fcf65d6a..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.dsml.validation.wizard</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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_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_lambda_body=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=false
-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=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=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_after_type_annotation=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_lambda_arrow=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_lambda_arrow=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=260
-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=5
-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=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +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_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-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_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\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">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\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">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><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">/**\n * ${tags}\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">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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}\n${package_declaration}\n\n${typecomment}\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">\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">\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">\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">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</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\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}\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>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb2..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF
deleted file mode 100644
index 506d23a32fa..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.dsml.validation.wizard
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.pde;bundle-version="3.6.100",
- org.eclipse.pde.core;bundle-version="3.7.0",
- org.eclipse.pde.ui;bundle-version="3.6.100",
- org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.dsml.validation.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.uml2.uml;bundle-version="3.2.100",
- org.eclipse.papyrus.dsml.validation.generator;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.acceleo.engine;bundle-version="3.1.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.dsml.validation;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: %pluginProvider
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.dsml.validation.wizard.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.wizard;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/about.html b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/build.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/build.properties
deleted file mode 100644
index a8e3182967e..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
-src.includes = about.html
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/plugin.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/plugin.properties
deleted file mode 100644
index a8973277c37..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 CEA LIST.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     CEA LIST - initial API and implementation
-###############################################################################
-pluginName=Papyrus DSML Validation wizard (Incubation)
-pluginProvider=Eclipse Modeling Project
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml
deleted file mode 100644
index dc5ea9a8e3d..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation.wizard</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/Activator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/Activator.java
deleted file mode 100644
index 19c0dcce542..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/Activator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.wizard;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.dsml.validation.wizard"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
-	 * )
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
-	 * )
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ClassesGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ClassesGenerator.java
deleted file mode 100644
index 02134abc300..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ClassesGenerator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.wizard;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.dsml.validation.generator.xtend.Generate;
-
-/**
- * Main entry point of the 'UML To Java' generation module.
- *
- */
-public class ClassesGenerator {
-
-	/**
-	 * The profile for which to generate code.
-	 */
-	private Resource resource;
-
-	/**
-	 * The output folder.
-	 */
-	private IProject project;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param modelURI
-	 *            is the URI of the model.
-	 * @param targetFolder
-	 *            is the output folder
-	 * @param arguments
-	 *            are the other arguments
-	 * @throws IOException
-	 *             Thrown when the output cannot be saved.
-	 * @generated
-	 */
-	public ClassesGenerator(Resource resource, IProject project) {
-		this.resource = resource;
-		this.project = project;
-	}
-
-	/**
-	 * execute the generation
-	 *
-	 * @param monitor
-	 * @throws IOException
-	 */
-	public void doGenerate(IProgressMonitor monitor) throws IOException {
-		if (!project.getLocation().toFile().exists()) {
-			project.getLocation().toFile().mkdirs();
-		}
-
-		monitor.worked(1);
-
-		Generate.generateClientSelector(resource, project, monitor);
-		Generate.generateConstraints(resource, project, monitor);
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/CreateEMFValidationProject.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/CreateEMFValidationProject.java
deleted file mode 100644
index 09d3f0e6d59..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/CreateEMFValidationProject.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager;
-import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.uml2.uml.Profile;
-
-/**
- * This class represents the plugin project wizard and triggers creation of an
- * EMF Validation plugin when user clicks finish button on a plugin creation
- * wizard.
- *
- *
- */
-@SuppressWarnings("restriction")
-public class CreateEMFValidationProject extends NewPluginProjectWizard {
-
-	private static final String GENERATION_MESSAGE = "Generation of EMF Validation Plugin";
-
-	private IConstraintsManager constraintsManager;
-
-	private JavaContentGenerator generateAllJava;
-
-
-	protected Profile selectedProfile;
-
-	protected EPackage definition = null;
-
-	protected IProject createdProject;
-	
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param selectedProfile
-	 * @param constraintsExtractor
-	 */
-	public CreateEMFValidationProject(Profile selectedProfile, IConstraintsManager constraintsExtractor, EPackage definition) {
-		super();
-		setWindowTitle(GENERATION_MESSAGE);
-		this.constraintsManager = constraintsExtractor;
-		this.selectedProfile = selectedProfile;
-		this.definition = definition;
-		createdProject = null;
-	}
-
-	@Override
-	public IWizardPage getNextPage(IWizardPage page) {
-		if (page == fContentPage) { // Remove the template page
-			return null;
-		}
-		return super.getNextPage(page);
-	}
-
-	@Override
-	public void addPages() {
-		super.addPages();
-	}
-
-	/**
-	 * @return The project created by this wizard
-	 */
-	public IProject getProject() {
-		return createdProject;
-	}
-	
-	/**
-	 * run the dialog
-	 */
-	public int openDialog() {
-		WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), this);
-		return dialog.open();
-	}
-
-	@Override
-	public boolean performFinish() {
-		boolean result = super.performFinish();
-		if (result) {
-			createdProject = this.fMainPage.getProjectHandle();
-		}
-		return result;
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java
deleted file mode 100644
index 3af86eb7933..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/JavaContentGenerator.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modification
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.wizard;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Profile;
-
-/**
- * this class generate java classes in the project
- *
- */
-public class JavaContentGenerator {
-
-	/**
-	 * Selected model files.
-	 */
-	protected List<IFile> files;
-
-	protected Profile umlProfile;
-
-	private IProject project;
-	
-	/**
-	 *
-	 * Constructor.
-	 *
-	 * @param project
-	 *            the content has to be filled in the given project
-	 * @param umlProfile
-	 *            the uml profile
-	 */
-	public JavaContentGenerator(IProject project, Profile umlProfile) {
-		this.project = project;
-		this.umlProfile = umlProfile;
-	}
-
-	class RunClassGenerator implements IRunnableWithProgress {
-		
-		private RuntimeException storedException = null;
-
-		public RuntimeException getException() {
-			return storedException;
-		}
-		
-		public void run(IProgressMonitor monitor) {
-			try {
-				Utils.setPluginID(project.getName());
-				ClassesGenerator generator = new ClassesGenerator(umlProfile.eResource(), project);
-				generator.doGenerate(monitor);
-			} catch (IOException e) {
-				IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
-				Activator.getDefault().getLog().log(status);
-			} catch (RuntimeException e) {
-				storedException = e;
-			}
-		}
-	}
-	
-	/**
-	 * launch the generation of the content
-	 */
-	public void run() {
-		RunClassGenerator operation = new RunClassGenerator();
-		try {
-			// don't fork (avoid dirty state of MANIFEST which is automatically opened by NewWizard)
-			PlatformUI.getWorkbench().getProgressService().run(false, true, operation);
-			if (operation.getException() != null) {
-				throw operation.getException();
-			}
-		} catch (InvocationTargetException e) {
-			IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
-			Activator.getDefault().getLog().log(status);
-		} catch (InterruptedException e) {
-			IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
-			Activator.getDefault().getLog().log(status);
-		}
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationClassesGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationClassesGenerator.java
deleted file mode 100644
index 2a6d12ecb1e..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationClassesGenerator.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.wizard;
-
-public class ValidationClassesGenerator {
-
-
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
deleted file mode 100644
index 8ea7ab8553d..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, 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:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - modification
- *  Christian W. Damus - bug 485220
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.wizard;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode;
-import org.eclipse.papyrus.dsml.validation.generator.xtend.Generate;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.Category;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintProvider;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsCategory;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IValidationRule;
-import org.eclipse.papyrus.dsml.validation.model.profilenames.Utils;
-import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.ProjectEditors;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-/**
- * This is the main class that generates the EMF Validation plugin. It creates
- * extension points and adds required dependencies.
- *
- *
- */
-public class ValidationPluginGenerator {
-
-	/**
-	 * 
-	 */
-	private static final String CONSTRAINT_S_IS_VIOLATED = "Constraint '%s' is violated"; //$NON-NLS-1$
-
-	private static final String XML_CONSTRAINT_TARGET = "target"; //$NON-NLS-1$
-
-	private static final String XML_CONSTRAINT_MESSAGE = "message"; //$NON-NLS-1$
-
-	private static final String XML_CONSTRAINT_CLASS = "class"; //$NON-NLS-1$
-
-	private static final String XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT = "isEnabledByDefault"; //$NON-NLS-1$
-
-	private static final String JAVA_LANGUAGE = "Java"; //$NON-NLS-1$
-
-	/**
-	 * Do not use the standard tag OCL but OCLpivot to enforce validation with the pivot variant of OCL.
-	 * OCLpivot constraint validation is provided by the org.eclipse.papyrus.dsml.validation plugin
-	 */
-	private static final String OCL_LANGUAGE = "OCLpivot"; //$NON-NLS-1$
-
-	private static final String XML_CONSTRAINT_MODE = "mode"; //$NON-NLS-1$
-
-	private static final String XML_CONSTRAINT_SEVERITY = "severity"; //$NON-NLS-1$
-
-	private static final String XML_CONSTRAINT_STATUS_CODE = "statusCode"; //$NON-NLS-1$
-
-	private static final String XML_CONSTRAINT_LANG = "lang"; //$NON-NLS-1$
-
-	private static final String XML_CONSTRAINT_NAME = "name"; //$NON-NLS-1$
-
-	private static final String SEPARATOR = "."; //$NON-NLS-1$
-
-	private static final String EMF_VALIDATION_CONSTRAINT_CHILD = "constraint"; //$NON-NLS-1$
-
-	private static final String ATTRIB_ID = "id"; //$NON-NLS-1$
-
-	private static final String ATTRIB_NAME = "name"; //$NON-NLS-1$
-
-	private static final String EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintProviders"; //$NON-NLS-1$
-
-	private static final String EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintBindings"; //$NON-NLS-1$
-
-	private static final String UML_PLUGIN = "org.eclipse.uml2.uml"; //$NON-NLS-1$
-
-	private static final String EMF_VALIDATION_PLUGIN = "org.eclipse.emf.validation"; //$NON-NLS-1$
-
-	private static final String UML_VALIDATION_PLUGIN = "org.eclipse.papyrus.uml.service.validation"; //$NON-NLS-1$
-
-	// A generated plugin will depend on the validation profile, since it typically contains the profile as well.
-	// [well, that's not always the case]
-	public static final String UML_DSML_VALIDATION_PROFILE_PLUGIN = "org.eclipse.papyrus.dsml.validation"; //$NON-NLS-1$
-
-	/**
-	 * singleton
-	 */
-	public static ValidationPluginGenerator instance = new ValidationPluginGenerator();
-
-	private final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
-
-	private IConstraintsManager constraintsManager;
-
-	/**
-	 * Add a dependency to the plugin hosting the DSML profile.
-	 * 
-	 * @param project
-	 *            The Eclipse project
-	 * @return true, if dependency has been added
-	 * @throws CoreException
-	 * @throws IOException
-	 */
-	public boolean addDependency(IProject project, String pluginName) throws CoreException, IOException {
-
-		if ((project != null) && project.exists() && !pluginName.equals(project.getName())) {
-			ManifestEditor manifest = new ManifestEditor(project);
-			manifest.init();
-			if (manifest.initOk() && !manifest.hasDependency(pluginName)) {
-				manifest.addDependency(pluginName);
-				manifest.save();
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Generate the java code form constraints contained in the profile
-	 *
-	 * @param project
-	 *            the Eclipse project
-	 * @param constraintsManager
-	 *            the class in charge to collect all information from the model
-	 * @param definition
-	 *            The definition of the profile for which a plugin is generated
-	 * @throws CoreException
-	 * @throws IOException
-	 * @throws SAXException
-	 * @throws ParserConfigurationException
-	 */
-	public void generate(IProject project, IConstraintsManager constraintsManager, EPackage definition) throws CoreException, IOException, SAXException, ParserConfigurationException {
-		IPluginEditor editor;
-
-		this.constraintsManager = constraintsManager;
-
-		// prepare the plugin
-		editor = ProjectEditors.getPluginEditor(project);
-		if (!editor.exists()) {
-			editor.create();
-		}
-		editor.init();
-
-		editor.registerSourceFolder(Generate.SRC);
-		// it's possible that editor.getManifestEditor() logs an exception due to resource out of sync.
-		String pluginID = editor.getSymbolicBundleName();
-		if (editor.getBundleName() == null) {
-			// initialize bundle name with symbolic name, if not name is given
-			editor.setBundleName(pluginID);
-		}
-		editor.setSingleton(true);
-		editor.addToBuild(IPluginProjectEditor.PLUGIN_XML_FILE);
-		Set<String> natures = new HashSet<String>();
-		natures.add(PLUGIN_NATURE_ID);
-		editor.addNatures(natures);
-
-		editor.addDependency(EMF_VALIDATION_PLUGIN);
-		editor.addDependency(UML_VALIDATION_PLUGIN);
-		editor.addDependency(UML_PLUGIN);
-
-		String filterName = "dsml.validation.generated" + SEPARATOR + this.constraintsManager.getPrimeCategory().getID(); //$NON-NLS-1$
-		Element constraintProviderExtension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT, filterName);
-
-		// creation of categories extension point
-		// that corresponds to profile and sub-profiles
-		this.createExtensionForCategory(pluginID, this.constraintsManager.getPrimeCategory(), constraintProviderExtension, editor);
-
-		// add the constraint provider extension point, normally it exist only per profile so per category
-		for (IConstraintProvider constraintProvider : constraintsManager.getConstraintsProviders()) {
-			// create the extension point for the provider
-			Element extElForConstraintsProvider = createExtensionForConstraintsProvider(constraintProvider, constraintProviderExtension, editor, definition);
-			// go though category (profile)
-			for (IConstraintsCategory constraintCategory : constraintProvider.getConstraintsCategories()) {
-
-				// create the extension point validationRule for category
-				Element extElForConstraintsCategory = createExtensionForConstraintsCategory(pluginID, constraintCategory, extElForConstraintsProvider, editor, constraintsManager);
-
-				for (IValidationRule constraint : constraintCategory.getConstraints()) {
-
-					// is this a Java constraint?
-					if (Utils.hasSpecificationForJava(constraint.getConstraint())) {
-						createJavaExtensionForConstraint(pluginID, constraint, extElForConstraintsCategory, editor);
-					}
-
-					// is this an OCL constraint?
-					if (Utils.hasSpecificationForOCL(constraint.getConstraint())) {
-						createOCLExtensionForConstraint(constraint, extElForConstraintsCategory, editor);
-					}
-					// ((ValidationRuleImpl) constraint).setParentID();
-				}
-
-			}
-		}
-
-		generateBindings(pluginID, editor, this.constraintsManager, filterName);
-
-		try {
-			editor.save();
-			editor.getProject().refreshLocal(0, null);
-		} catch (Throwable ex) {
-			return;
-		}
-	}
-
-	private Element createExtensionForConstraint(IValidationRule validationRule,
-			Element parentElement, IPluginEditor editor) {
-
-		Element extElForConstraint = editor.addChild(parentElement, EMF_VALIDATION_CONSTRAINT_CHILD);
-
-		extElForConstraint.setAttribute(ATTRIB_ID, validationRule.getID());
-		extElForConstraint.setAttribute(XML_CONSTRAINT_NAME, validationRule.getName());
-		extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString());
-		extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name());
-
-		extElForConstraint.setAttribute(XML_CONSTRAINT_MODE, validationRule.getMode().name());
-		extElForConstraint.setAttribute(XML_CONSTRAINT_IS_ENABLED_BY_DEFAULT,
-				String.valueOf(validationRule.isEnabledByDefault()));
-
-		if (validationRule.getTargets() != null) {
-			for (String target : validationRule.getTargets()) {
-				Element targetExtension = editor.addChild(extElForConstraint, XML_CONSTRAINT_TARGET);
-				targetExtension.setAttribute(XML_CONSTRAINT_CLASS, target);
-			}
-		}
-
-		String validationMsg = validationRule.getMessage();
-		Element message = editor.addChild(extElForConstraint, XML_CONSTRAINT_MESSAGE);
-		if ((validationMsg != null) && (validationMsg.length() > 0)) {
-			message.setTextContent(validationMsg);
-		} else {
-			Package constraintPkg = validationRule.getConstraint().getNearestPackage();
-			boolean set = false;
-			if (constraintPkg != null) {
-				MessageHandling messageHandling = UMLUtil.getStereotypeApplication(constraintPkg, MessageHandling.class);
-				if (messageHandling != null) {
-					if (messageHandling.getMessageMode() == NameBasedMsgMode.NAME_IS_MESSAGE) {
-						message.setTextContent(validationRule.getName());
-						set = true;
-					} else if (messageHandling.getMessageMode() == NameBasedMsgMode.CUSTOM_TEMPLATE) {
-						String template = messageHandling.getCustomTemplate();
-						if (template != null && template.length() > 0) {
-							message.setTextContent(String.format(template, validationRule.getName()));
-							set = true;
-						}
-					}
-				}
-			}
-			if (!set) {
-				message.setTextContent(String.format(CONSTRAINT_S_IS_VIOLATED, validationRule.getName()));
-			}
-		}
-
-		if (validationRule.getDescription() != null) {
-			Element description = editor.addChild(extElForConstraint, "description"); //$NON-NLS-1$
-			description.setTextContent(validationRule.getDescription());
-		}
-
-		return extElForConstraint;
-	}
-
-	private Element createJavaExtensionForConstraint(String pluginID, IValidationRule validationRule,
-			Element parentElement, IPluginEditor editor) {
-
-		Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor);
-
-		extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, JAVA_LANGUAGE);
-		extElForConstraint.setAttribute(XML_CONSTRAINT_CLASS, pluginID + SEPARATOR + validationRule.getImplementingClass());
-
-		return extElForConstraint;
-
-	}
-
-	/**
-	 * create the extension point for constraint of emf validation
-	 *
-	 * @param validationRule
-	 *            the validation rule
-	 * @param parentElement
-	 * @param editor
-	 * @return the extension point
-	 */
-	private Element createOCLExtensionForConstraint(IValidationRule validationRule,
-			Element parentElement, IPluginEditor editor) {
-
-		Element extElForConstraint = createExtensionForConstraint(validationRule, parentElement, editor);
-
-		extElForConstraint.setAttribute(XML_CONSTRAINT_LANG, OCL_LANGUAGE);
-		extElForConstraint.setAttribute(XML_CONSTRAINT_STATUS_CODE, validationRule.getStatusCode().toString());
-		extElForConstraint.setAttribute(XML_CONSTRAINT_SEVERITY, validationRule.getSeverity().name());
-
-		if (Utils.getOCLConstraintBody(validationRule.getConstraint()) != null) {
-			Document doc = editor.getDocument();
-
-			CDATASection cdata = doc.createCDATASection(Utils
-					.getOCLConstraintBody(validationRule.getConstraint()));
-			extElForConstraint.appendChild(cdata);
-		}
-
-		return extElForConstraint;
-
-	}
-
-	public static Document parseXmlFile(String filename, boolean validating) {
-		try {
-			// Create a builder factory
-			DocumentBuilderFactory factory = DocumentBuilderFactory
-					.newInstance();
-			factory.setValidating(validating);
-
-			// Create the builder and parse the file
-			Document doc = factory.newDocumentBuilder().parse(
-					new File(filename));
-			return doc;
-		} catch (SAXException e) {
-			// A parsing error occurred; the xml input is not valid
-		} catch (ParserConfigurationException e) {
-		} catch (IOException e) {
-		}
-		return null;
-	}
-
-	/**
-	 * create the extension point categories
-	 *
-	 * @param projectName
-	 *            the name of the project
-	 * @param category
-	 *            a category
-	 * @param parentElement
-	 *            a ConstraintProviders extension
-	 * @param editor
-	 */
-	private Element createExtensionForCategory(String pluginID, Category category,
-			Element parentElement, IPluginEditor editor) {
-
-		Element extElForCategory = editor.addChild(parentElement, "category"); //$NON-NLS-1$
-
-		extElForCategory.setAttribute(ATTRIB_ID, pluginID + SEPARATOR + category.getID());
-
-		extElForCategory.setAttribute(XML_CONSTRAINT_NAME, pluginID + SEPARATOR + category.getName());
-
-		extElForCategory.setAttribute("mandatory", String.valueOf(category.isMandatory())); //$NON-NLS-1$
-
-		return extElForCategory;
-
-	}
-
-	/**
-	 * create the constraint provider extension point
-	 *
-	 * @param constraintProvider
-	 * @param parentElement
-	 * @param editor
-	 * @param definition
-	 * @return the extension point
-	 */
-	@SuppressWarnings("nls")
-	private Element createExtensionForConstraintsProvider(
-			IConstraintProvider constraintProvider, Element parentElement,
-			IPluginEditor editor, EPackage definition) {
-
-		Element extElForConstraintsProvider = editor.addChild(parentElement, "constraintProvider");
-
-		extElForConstraintsProvider.setAttribute(XML_CONSTRAINT_MODE, constraintProvider.getMode().name());
-
-		extElForConstraintsProvider.setAttribute("cache", String.valueOf(constraintProvider.getCache()));
-
-		Element pcg = editor.addChild(extElForConstraintsProvider, "package");
-
-		if (constraintProvider.getEPackage() == null) {
-			pcg.setAttribute("namespaceUri", UMLPackage.eNS_URI);
-		} else {
-			pcg.setAttribute("namespaceUri", constraintProvider.getEPackage().getNsURI());
-
-		}
-
-		return extElForConstraintsProvider;
-	}
-
-	@SuppressWarnings("nls")
-	private Element createExtensionForConstraintsCategory(String pluginID, IConstraintsCategory constraintsCategory, Element parentElement, IPluginEditor editor, IConstraintsManager constraintManager) {
-		Element extElForConstraintsCategory = editor.addChild(parentElement, "constraints"); //$NON-NLS-1$
-		extElForConstraintsCategory.setAttribute("categories", pluginID + SEPARATOR + constraintManager.getPrimeCategory().getName());
-		return extElForConstraintsCategory;
-
-	}
-
-
-	@SuppressWarnings("nls")
-	private void generateBindings(String pluginID, IPluginEditor editor, IConstraintsManager constraintsManager, String filterName) {
-		Element extension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT, filterName);
-
-		// create a client context per stereotype
-		Set<Stereotype> constrainedStereotype = constraintsManager.getConstraintsOfStereotype().keySet();
-		for (Iterator<Stereotype> iterator = constrainedStereotype.iterator(); iterator.hasNext();) {
-			Stereotype stereotype = iterator.next();
-			// ("+--> create clientContext for the stereotype "+stereotype.getName());
-			Element clientContextElement = editor.addChild(extension, "clientContext");
-			clientContextElement.setAttribute(ATTRIB_ID, stereotype.getName() + "ClientContext");
-			Element selectorElement = editor.addChild(clientContextElement, "selector");
-			selectorElement.setAttribute(XML_CONSTRAINT_CLASS, pluginID + ".selectors." + stereotype.getName() + "ClientSelector");
-
-			// create binding
-			List<Constraint> constraints = constraintsManager.getConstraintsOfStereotype().get(stereotype);
-			Element bindingelement = editor.addChild(extension, "binding");
-			bindingelement.setAttribute("context", stereotype.getName() + "ClientContext");
-
-			for (Iterator<Constraint> iteratorConstraint = constraints.iterator(); iteratorConstraint.hasNext();) {
-				Constraint constraint = iteratorConstraint.next();
-				constraintsManager.getValidationRuleMap().get(constraint).getID();
-				Element constraintElement = editor.addChild(bindingelement, "constraint");
-				// The pluginID must be part of the fully qualified constraint reference
-				constraintElement.setAttribute("ref", pluginID + SEPARATOR + constraintsManager.getValidationRuleMap().get(constraint).getID());
-				// ("+----> create binding for the constraint "+constraintsManager.getValidationRuleMap().get(constraint).getID());
-			}
-		}
-	}
-
-	/**
-	 * Create a new extension with a given name or reuse an existing extension if an extension with the given
-	 * name already exists. In case of the latter, the existing extensions will be cleaned first, i.e. all of its
-	 * children are removed. This function enables multiple generation phases without duplicating elements.
-	 *
-	 * CAVEAT: This function has been changed: filtering is now based on its name instead of the ID. Using an
-	 * ID on the extension point level, unifies the associated contexts, see bug 467692 - [UML-RT] Multiple
-	 * issues when validating a UML-RT model
-	 *
-	 * @param editor
-	 *            the plugin editor
-	 * @param extensionName
-	 *            the name of the extension
-	 * @return
-	 */
-	protected Element createOrCleanExtension(IPluginEditor editor, String extensionName, String filterName) {
-		List<Node> existingExtensions = editor.getExtensions(extensionName);
-		for (Node extension : existingExtensions) {
-			if (extension instanceof Element) {
-				Element extensionElement = (Element) extension;
-				// use optional name field to identify an item that has been generated by this plugin.
-				// Context: bug 464363 - The DSML plugin generator removes all existing constraints from the plugin.xml
-				String name = extensionElement.getAttribute(ATTRIB_NAME);
-				// TODO: temporary accept entries without ID (ID == "") to avoid migration issues (bug 464363)
-				if (name.equals("")) { //$NON-NLS-1$
-					extensionElement.setAttribute(ATTRIB_NAME, filterName);
-					name = filterName;
-				}
-				if (name.equals(filterName)) {
-					// use existing extension and remove all children
-					for (;;) {
-						Node child = extension.getFirstChild();
-						if (child == null) {
-							break;
-						}
-						extension.removeChild(child);
-					}
-					return extensionElement;
-				}
-			}
-		}
-		// create new extension
-		Element newExtension = editor.addExtension(extensionName);
-		newExtension.setAttribute(ATTRIB_NAME, filterName);
-		return newExtension;
-	}
-
-	public static String getContextprefix() {
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java
deleted file mode 100644
index bd4794f6e40..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/interfaces/IValidationPluginGenerator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Ernest Wozniak (CEA LIST) ernest.wozniak@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation.wizard.interfaces;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.papyrus.dsml.validation.model.elements.interfaces.IConstraintsManager;
-import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
-
-public interface IValidationPluginGenerator {
-
-	final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
-
-	@SuppressWarnings("restriction")
-	public void generate(IProject project, NewPluginProjectWizard wizard, IConstraintsManager constraintsManager);
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.classpath b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.classpath
deleted file mode 100644
index 2734480ce07..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.project b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.project
deleted file mode 100644
index 4a54f6ae972..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.dsml.validation</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/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_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_lambda_body=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=false
-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=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=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_after_type_annotation=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_lambda_arrow=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_lambda_arrow=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=260
-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=5
-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=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +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_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-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_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\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">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\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">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\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">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><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">/**\n * ${tags}\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">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\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}\n${package_declaration}\n\n${typecomment}\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">\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">\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">\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">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</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\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}\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>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
deleted file mode 100644
index b8100599510..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.dsml.validation,
- org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule,
- org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl,
- org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: %pluginProvider
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.dsml.validation.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/about.html b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>November 14, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/build.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/build.properties
deleted file mode 100644
index ee2f2451059..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/,\
-           src-gen/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               resource/,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.properties b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.properties
deleted file mode 100644
index 15e199c3b24..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 CEA LIST.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     CEA LIST - initial API and implementation
-###############################################################################
-pluginName=Papyrus DSML Validation (Incubation)
-pluginProvider=Eclipse Modeling Project
-providerName = www.example.org
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml
deleted file mode 100644
index 4e36d434130..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-<extension
-         point="org.eclipse.emf.ecore.uri_mapping">
- 
-      <mapping
-            source="pathmap://DSMLValidation_PROFILES/"
-            target="platform:/plugin/org.eclipse.papyrus.dsml.validation/resource/">
-      </mapping>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated PapyrusValidationRuleDSML -->
-      <package
-            uri="http://www.eclipse.org/papyrus/dsmlvalidation"
-            class="org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage"
-            genModel="resource/PapyrusValidationRuleDSML.genmodel"/>
-   </extension>
-   <extension
-         point="org.eclipse.uml2.uml.generated_package">
-      <profile
-            location="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml#__sUW0OhNEeCjcc2EgK3Uwg"
-            uri="http://www.eclipse.org/papyrus/dsmlvalidation">
-      </profile>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">
-      <profile
-            description="Profile to execute DSML validation"
-            name="DSML Validation"
-            path="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml"
-            provider="Eclipse Modeling Project">
-      </profile>
-   </extension>
-</plugin>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml
deleted file mode 100644
index 2c271b86c59..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dsml.validation</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
-\ No newline at end of file
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusDSMLValidationRule.ecore b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusDSMLValidationRule.ecore
deleted file mode 100644
index 343829d8a65..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusDSMLValidationRule.ecore
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="PapyrusDSMLValidationRule" nsURI="http://www.eclipse.org/papyrus/dsmlvalidation"
-    nsPrefix="PapyrusDSMLValidationRule">
-  <eClassifiers xsi:type="ecore:EClass" name="ValidationRule">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" ordered="false"
-        lowerBound="1" eType="#//Severity" defaultValueLiteral="ERROR"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mode" ordered="false" lowerBound="1"
-        eType="#//Mode" defaultValueLiteral="Batch"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isEnabledByDefault" ordered="false"
-        lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Constraint" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Constraint"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="statusCode" ordered="false"
-        lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
-        defaultValueLiteral="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" ordered="false"
-        eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"
-        eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="target" ordered="false"
-        upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="class" ordered="false"
-        eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Severity">
-    <eLiterals name="ERROR"/>
-    <eLiterals name="WARNING" value="1"/>
-    <eLiterals name="INFO" value="2"/>
-    <eLiterals name="CANCEL" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Mode">
-    <eLiterals name="Batch"/>
-    <eLiterals name="Live" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageHandling">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="messageMode" ordered="false"
-        lowerBound="1" eType="#//NameBasedMsgMode"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Package" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Package"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customTemplate" ordered="false"
-        eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="NameBasedMsgMode">
-    <eLiterals name="Default"/>
-    <eLiterals name="NameIsMessage" value="1"/>
-    <eLiterals name="CustomTemplate" value="2"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.di b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.di
deleted file mode 100644
index f2a3bfb9d48..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.di
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
-  <pageList>
-    <availablePage>
-      <emfPageIdentifier href="PapyrusValidationRuleDSML.notation#_S1N6UOhOEeCjcc2EgK3Uwg"/>
-    </availablePage>
-  </pageList>
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder">
-        <children>
-          <emfPageIdentifier href="PapyrusValidationRuleDSML.notation#_S1N6UOhOEeCjcc2EgK3Uwg"/>
-        </children>
-      </children>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.genmodel b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.genmodel
deleted file mode 100644
index f0243e97d15..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.genmodel
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
-    modelDirectory="/org.eclipse.papyrus.dsml.validation/src-gen" editDirectory="/org.eclipse.papyrus.dsml.validation.edit/src-gen"
-    editorDirectory="/org.eclipse.papyrus.dsml.validation.editor/src-gen" modelPluginID="org.eclipse.papyrus.dsml.validation"
-    modelName="PapyrusValidationRuleDSML" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="/org.eclipse.papyrus.dsml.validation.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
-    operationReflection="true" importOrganizing="true">
-  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
-    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
-    <details key="UNION_PROPERTIES" value="REPORT"/>
-    <details key="UNTYPED_PROPERTIES" value="REPORT"/>
-    <details key="DUPLICATE_FEATURES" value="DISCARD"/>
-    <details key="SUBSETTING_PROPERTIES" value="REPORT"/>
-    <details key="VALIDATION_DELEGATES" value="IGNORE"/>
-    <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
-    <details key="COMMENTS" value="PROCESS"/>
-    <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
-    <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
-    <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>
-    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
-    <details key="REDEFINING_PROPERTIES" value="REPORT"/>
-    <details key="ANNOTATION_DETAILS" value="PROCESS"/>
-    <details key="NON_API_INVARIANTS" value="IGNORE"/>
-    <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
-    <details key="REDEFINING_OPERATIONS" value="REPORT"/>
-    <details key="INVOCATION_DELEGATES" value="IGNORE"/>
-    <details key="DERIVED_FEATURES" value="PROCESS"/>
-    <details key="OPERATION_BODIES" value="IGNORE"/>
-    <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
-    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
-  </genAnnotations>
-  <foreignModel>PapyrusDSMLValidationRule.ecore</foreignModel>
-  <genPackages xsi:type="genmodel:GenPackage" prefix="PapyrusDSMLValidationRule" basePackage="org.eclipse.papyrus.dsml.validation"
-      resource="XML" disposableProviderFactory="true" ecorePackage="PapyrusDSMLValidationRule.ecore#/">
-    <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="PapyrusDSMLValidationRule.ecore#//Severity">
-      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PapyrusDSMLValidationRule.ecore#//Severity/ERROR"/>
-      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PapyrusDSMLValidationRule.ecore#//Severity/WARNING"/>
-      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PapyrusDSMLValidationRule.ecore#//Severity/INFO"/>
-      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PapyrusDSMLValidationRule.ecore#//Severity/CANCEL"/>
-    </genEnums>
-    <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="PapyrusDSMLValidationRule.ecore#//Mode">
-      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PapyrusDSMLValidationRule.ecore#//Mode/Batch"/>
-      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PapyrusDSMLValidationRule.ecore#//Mode/Live"/>
-    </genEnums>
-    <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="PapyrusDSMLValidationRule.ecore#//NameBasedMsgMode">
-      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PapyrusDSMLValidationRule.ecore#//NameBasedMsgMode/Default"/>
-      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PapyrusDSMLValidationRule.ecore#//NameBasedMsgMode/NameIsMessage"/>
-      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="PapyrusDSMLValidationRule.ecore#//NameBasedMsgMode/CustomTemplate"/>
-    </genEnums>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="PapyrusDSMLValidationRule.ecore#//ValidationRule">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//ValidationRule/severity"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//ValidationRule/mode"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//ValidationRule/isEnabledByDefault"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusDSMLValidationRule.ecore#//ValidationRule/base_Constraint"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//ValidationRule/statusCode"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//ValidationRule/message"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//ValidationRule/description"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//ValidationRule/target"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//ValidationRule/class"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//ValidationRule/id"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="PapyrusDSMLValidationRule.ecore#//MessageHandling">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//MessageHandling/messageMode"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusDSMLValidationRule.ecore#//MessageHandling/base_Package"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute PapyrusDSMLValidationRule.ecore#//MessageHandling/customTemplate"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.notation b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.notation
deleted file mode 100644
index c7a401197eb..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.notation
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_S1N6UOhOEeCjcc2EgK3Uwg" type="PapyrusUMLProfileDiagram" name="PapyrusValidationRuleDSML" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_wrGk8OhOEeCjcc2EgK3Uwg" type="1031" fontName="Segoe UI" lineColor="0">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wrHMAOhOEeCjcc2EgK3Uwg" source="ShadowFigure">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wrHMAehOEeCjcc2EgK3Uwg" key="ShadowFigure_Value" value="false"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wrHMAuhOEeCjcc2EgK3Uwg" source="displayNameLabelIcon">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wrHMA-hOEeCjcc2EgK3Uwg" key="displayNameLabelIcon_value" value="false"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wrHMBOhOEeCjcc2EgK3Uwg" source="QualifiedName">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wrHMBehOEeCjcc2EgK3Uwg" key="QualifiedNameDepth" value="1000"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_wrHMBuhOEeCjcc2EgK3Uwg" type="1084"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QvxesNgTEeKgsd1mLVpBNQ" visible="false" type="AppliedStereotypeCompartement">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QvxesdgTEeKgsd1mLVpBNQ" showTitle="true"/>
-      <element xmi:type="standard:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Si8pwKtKEeGF4uwJob34Mw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvxestgTEeKgsd1mLVpBNQ"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QvyFwNgTEeKgsd1mLVpBNQ" visible="false" type="compartment_shape_display">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QvyFw9gTEeKgsd1mLVpBNQ" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QvyFxNgTEeKgsd1mLVpBNQ" key="mutable" value="true"/>
-      </eAnnotations>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QvyFwdgTEeKgsd1mLVpBNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QvyFwtgTEeKgsd1mLVpBNQ"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_l5BE8I1REeWYosrjsYCWsA" visible="false" type="StereotypeLabel">
-      <styles xmi:type="notation:StringValueStyle" xmi:id="_l5BE8Y1REeWYosrjsYCWsA" name="stereotype" stringValue="StandardProfile::Metaclass"/>
-      <element xmi:type="uml:Stereotype" href="pathmap://UML_PROFILES/Standard.profile.uml#Metaclass"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l5BsAI1REeWYosrjsYCWsA"/>
-    </children>
-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Constraint"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wrHMB-hOEeCjcc2EgK3Uwg" x="40" y="20" width="241" height="61"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_xvDVQOhOEeCjcc2EgK3Uwg" type="1026" fontName="Segoe UI" lineColor="0">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xvD8UOhOEeCjcc2EgK3Uwg" source="ShadowFigure">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xvEjYOhOEeCjcc2EgK3Uwg" key="ShadowFigure_Value" value="false"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xvEjYehOEeCjcc2EgK3Uwg" source="displayNameLabelIcon">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xvEjYuhOEeCjcc2EgK3Uwg" key="displayNameLabelIcon_value" value="false"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xvEjY-hOEeCjcc2EgK3Uwg" source="QualifiedName">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xvEjZOhOEeCjcc2EgK3Uwg" key="QualifiedNameDepth" value="1000"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xvEjZehOEeCjcc2EgK3Uwg" type="1034"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_xvFKcOhOEeCjcc2EgK3Uwg" type="1071">
-      <children xmi:type="notation:Shape" xmi:id="_5xZwMOhQEeCjcc2EgK3Uwg" type="3002" fontName="Segoe UI" lineColor="0">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_RC_b0I1SEeWYosrjsYCWsA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_5xSbcOhQEeCjcc2EgK3Uwg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5xZwMehQEeCjcc2EgK3Uwg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_8gWpwOhQEeCjcc2EgK3Uwg" type="3002" fontName="Segoe UI" lineColor="0">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_RgM8QI1SEeWYosrjsYCWsA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_8gPVAOhQEeCjcc2EgK3Uwg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gWpwehQEeCjcc2EgK3Uwg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_Gkg2UOhREeCjcc2EgK3Uwg" type="3002" fontName="Segoe UI" lineColor="0">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_TgYEQI1SEeWYosrjsYCWsA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_GkavsOhREeCjcc2EgK3Uwg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Gkg2UehREeCjcc2EgK3Uwg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_vXtagOqrEeCnkfBG0tzRQg" type="3002" fontName="Segoe UI" lineColor="0">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_T-nfcI1SEeWYosrjsYCWsA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_vXrlUOqrEeCnkfBG0tzRQg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_vXtageqrEeCnkfBG0tzRQg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_ClYJQOqsEeCnkfBG0tzRQg" type="3002" fontName="Segoe UI" lineColor="0">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_Uij6AI1SEeWYosrjsYCWsA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_ClVF8OqsEeCnkfBG0tzRQg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ClYJQeqsEeCnkfBG0tzRQg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_JFOhkOqsEeCnkfBG0tzRQg" type="3002" fontName="Segoe UI" lineColor="0">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_VAZFgI1SEeWYosrjsYCWsA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_JFLeQOqsEeCnkfBG0tzRQg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_JFOhkeqsEeCnkfBG0tzRQg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_gvp5EOq4EeCnkfBG0tzRQg" type="3002" fontName="Segoe UI" lineColor="0">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_VdDzYI1SEeWYosrjsYCWsA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_gvm1wOq4EeCnkfBG0tzRQg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gvp5Eeq4EeCnkfBG0tzRQg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_gG0bkOt1EeCnkfBG0tzRQg" type="3002" fontName="Segoe UI" lineColor="0">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_WAIrQI1SEeWYosrjsYCWsA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_gGxYQOt1EeCnkfBG0tzRQg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gG0bket1EeCnkfBG0tzRQg"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xvFKcehOEeCjcc2EgK3Uwg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xvFKcuhOEeCjcc2EgK3Uwg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xvFKc-hOEeCjcc2EgK3Uwg"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_xvFKdOhOEeCjcc2EgK3Uwg" visible="false" type="1019">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xvFKdehOEeCjcc2EgK3Uwg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xvFKduhOEeCjcc2EgK3Uwg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xvFKd-hOEeCjcc2EgK3Uwg"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Qv0iANgTEeKgsd1mLVpBNQ" visible="false" type="compartment_shape_display">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qv0iA9gTEeKgsd1mLVpBNQ" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qv0iBNgTEeKgsd1mLVpBNQ" key="mutable" value="true"/>
-      </eAnnotations>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Qv0iAdgTEeKgsd1mLVpBNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv0iAtgTEeKgsd1mLVpBNQ"/>
-    </children>
-    <element xmi:type="uml:Stereotype" href="PapyrusValidationRuleDSML.uml#_xu6yYOhOEeCjcc2EgK3Uwg"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xvDVQehOEeCjcc2EgK3Uwg" x="40" y="160" width="241" height="201"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_1DQQ8OhOEeCjcc2EgK3Uwg" type="2006" fontName="Segoe UI" lineColor="0">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1DQQ8uhOEeCjcc2EgK3Uwg" source="ShadowFigure">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1DQQ8-hOEeCjcc2EgK3Uwg" key="ShadowFigure_Value" value="false"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1DQQ9OhOEeCjcc2EgK3Uwg" source="displayNameLabelIcon">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1DQQ9ehOEeCjcc2EgK3Uwg" key="displayNameLabelIcon_value" value="false"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1DQQ9uhOEeCjcc2EgK3Uwg" source="QualifiedName">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1DQ4AOhOEeCjcc2EgK3Uwg" key="QualifiedNameDepth" value="1000"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1DQ4AehOEeCjcc2EgK3Uwg" type="5023"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_1DQ4AuhOEeCjcc2EgK3Uwg" type="1063">
-      <children xmi:type="notation:Shape" xmi:id="_3K9kUOhOEeCjcc2EgK3Uwg" type="1037" fontName="Segoe UI" lineColor="0">
-        <element xmi:type="uml:EnumerationLiteral" href="PapyrusValidationRuleDSML.uml#_3K1ogOhOEeCjcc2EgK3Uwg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3K9kUehOEeCjcc2EgK3Uwg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_3tmXUOhOEeCjcc2EgK3Uwg" type="1037" fontName="Segoe UI" lineColor="0">
-        <element xmi:type="uml:EnumerationLiteral" href="PapyrusValidationRuleDSML.uml#_3td0cOhOEeCjcc2EgK3Uwg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3tmXUehOEeCjcc2EgK3Uwg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_4SE9YOhOEeCjcc2EgK3Uwg" type="1037" fontName="Segoe UI" lineColor="0">
-        <element xmi:type="uml:EnumerationLiteral" href="PapyrusValidationRuleDSML.uml#_4SAr8OhOEeCjcc2EgK3Uwg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4SE9YehOEeCjcc2EgK3Uwg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_44FNcOhOEeCjcc2EgK3Uwg" type="1037" fontName="Segoe UI" lineColor="0">
-        <element xmi:type="uml:EnumerationLiteral" href="PapyrusValidationRuleDSML.uml#_44A8AOhOEeCjcc2EgK3Uwg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_44FNcehOEeCjcc2EgK3Uwg"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_1DQ4A-hOEeCjcc2EgK3Uwg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1DQ4BOhOEeCjcc2EgK3Uwg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1DQ4BehOEeCjcc2EgK3Uwg"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Qv6BkNgTEeKgsd1mLVpBNQ" visible="false" type="compartment_shape_display">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qv6Bk9gTEeKgsd1mLVpBNQ" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qv6BlNgTEeKgsd1mLVpBNQ" key="mutable" value="true"/>
-      </eAnnotations>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Qv6BkdgTEeKgsd1mLVpBNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv6BktgTEeKgsd1mLVpBNQ"/>
-    </children>
-    <element xmi:type="uml:Enumeration" href="PapyrusValidationRuleDSML.uml#_1CpM8OhOEeCjcc2EgK3Uwg"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1DQQ8ehOEeCjcc2EgK3Uwg" x="320" y="260" width="181" height="101"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_97TPsOhOEeCjcc2EgK3Uwg" type="2006" fontName="Segoe UI" lineColor="0">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_97Ud0OhOEeCjcc2EgK3Uwg" source="ShadowFigure">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_97Ud0ehOEeCjcc2EgK3Uwg" key="ShadowFigure_Value" value="false"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_97Ud0uhOEeCjcc2EgK3Uwg" source="displayNameLabelIcon">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_97Ud0-hOEeCjcc2EgK3Uwg" key="displayNameLabelIcon_value" value="false"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_97VE4OhOEeCjcc2EgK3Uwg" source="QualifiedName">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_97VE4ehOEeCjcc2EgK3Uwg" key="QualifiedNameDepth" value="1000"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_97VE4uhOEeCjcc2EgK3Uwg" type="5023"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_97VE4-hOEeCjcc2EgK3Uwg" type="1063">
-      <children xmi:type="notation:Shape" xmi:id="_-4MVwOhOEeCjcc2EgK3Uwg" type="1037" fontName="Segoe UI" lineColor="0">
-        <element xmi:type="uml:EnumerationLiteral" href="PapyrusValidationRuleDSML.uml#_-4BWoOhOEeCjcc2EgK3Uwg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-4MVwehOEeCjcc2EgK3Uwg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_43cCUOhQEeCjcc2EgK3Uwg" type="1037" fontName="Segoe UI" lineColor="0">
-        <element xmi:type="uml:EnumerationLiteral" href="PapyrusValidationRuleDSML.uml#_43Xw4OhQEeCjcc2EgK3Uwg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_43cCUehQEeCjcc2EgK3Uwg"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_97VE5OhOEeCjcc2EgK3Uwg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_97VE5ehOEeCjcc2EgK3Uwg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_97VE5uhOEeCjcc2EgK3Uwg"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Qv8d0NgTEeKgsd1mLVpBNQ" visible="false" type="compartment_shape_display">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qv8d09gTEeKgsd1mLVpBNQ" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qv8d1NgTEeKgsd1mLVpBNQ" key="mutable" value="true"/>
-      </eAnnotations>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Qv8d0dgTEeKgsd1mLVpBNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qv8d0tgTEeKgsd1mLVpBNQ"/>
-    </children>
-    <element xmi:type="uml:Enumeration" href="PapyrusValidationRuleDSML.uml#_97I3oOhOEeCjcc2EgK3Uwg"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_97T2wOhOEeCjcc2EgK3Uwg" x="540" y="260" width="181" height="101"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_l5SKsI1REeWYosrjsYCWsA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_l5SKsY1REeWYosrjsYCWsA" showTitle="true"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l5SxwI1REeWYosrjsYCWsA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Constraint"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l5SKso1REeWYosrjsYCWsA" x="250" y="15"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_9X8NgI1REeWYosrjsYCWsA" type="1031">
-    <children xmi:type="notation:DecorationNode" xmi:id="_9X-CsI1REeWYosrjsYCWsA" type="1084"/>
-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9X-CsY1REeWYosrjsYCWsA" x="320" y="20" width="281" height="61"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_9YXEQI1REeWYosrjsYCWsA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_9YXEQY1REeWYosrjsYCWsA" showTitle="true"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9YXEQ41REeWYosrjsYCWsA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9YXEQo1REeWYosrjsYCWsA" x="540" y="20"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_B_luEI1SEeWYosrjsYCWsA" type="1026">
-    <children xmi:type="notation:DecorationNode" xmi:id="_B_luEo1SEeWYosrjsYCWsA" type="1034"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_B_luE41SEeWYosrjsYCWsA" type="1071">
-      <children xmi:type="notation:Shape" xmi:id="_La3VsI1SEeWYosrjsYCWsA" type="3002">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_P11sMI1SEeWYosrjsYCWsA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_Lap6UI1SEeWYosrjsYCWsA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_La3VsY1SEeWYosrjsYCWsA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_Wye5sI4MEeWYTrG6651VjA" type="3002">
-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_mUB8AI4MEeWYTrG6651VjA" name="maskLabel">
-          <stringListValue>multiplicity</stringListValue>
-          <stringListValue>name</stringListValue>
-          <stringListValue>type</stringListValue>
-          <stringListValue>derived</stringListValue>
-        </styles>
-        <element xmi:type="uml:Property" href="PapyrusValidationRuleDSML.uml#_WyNM4I4MEeWYTrG6651VjA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wye5sY4MEeWYTrG6651VjA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_B_luFI1SEeWYosrjsYCWsA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_B_luFY1SEeWYosrjsYCWsA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_B_luFo1SEeWYosrjsYCWsA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B_luF41SEeWYosrjsYCWsA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_B_luGI1SEeWYosrjsYCWsA" visible="false" type="1019">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_B_luGY1SEeWYosrjsYCWsA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_B_luGo1SEeWYosrjsYCWsA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_B_luG41SEeWYosrjsYCWsA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B_luHI1SEeWYosrjsYCWsA"/>
-    </children>
-    <element xmi:type="uml:Stereotype" href="PapyrusValidationRuleDSML.uml#_B_fAYI1SEeWYosrjsYCWsA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B_luEY1SEeWYosrjsYCWsA" x="320" y="160" width="301" height="81"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_rIg-sI4MEeWYTrG6651VjA" type="2006">
-    <children xmi:type="notation:DecorationNode" xmi:id="_rIhlwI4MEeWYTrG6651VjA" type="5023"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_rIhlwY4MEeWYTrG6651VjA" type="1063">
-      <children xmi:type="notation:Shape" xmi:id="_wVJboI4MEeWYTrG6651VjA" type="1037">
-        <element xmi:type="uml:EnumerationLiteral" href="PapyrusValidationRuleDSML.uml#_wU_qoI4MEeWYTrG6651VjA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wVJboY4MEeWYTrG6651VjA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_0GbU4I4MEeWYTrG6651VjA" type="1037">
-        <element xmi:type="uml:EnumerationLiteral" href="PapyrusValidationRuleDSML.uml#_0GPHoI4MEeWYTrG6651VjA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_0GbU4Y4MEeWYTrG6651VjA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_3BSjgI4MEeWYTrG6651VjA" type="1037">
-        <element xmi:type="uml:EnumerationLiteral" href="PapyrusValidationRuleDSML.uml#_3BILcI4MEeWYTrG6651VjA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3BSjgY4MEeWYTrG6651VjA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_rIhlwo4MEeWYTrG6651VjA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_rIhlw44MEeWYTrG6651VjA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_rIhlxI4MEeWYTrG6651VjA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rIhlxY4MEeWYTrG6651VjA"/>
-    </children>
-    <element xmi:type="uml:Enumeration" href="PapyrusValidationRuleDSML.uml#_rIeicI4MEeWYTrG6651VjA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rIg-sY4MEeWYTrG6651VjA" x="760" y="260" width="181" height="101"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_S1N6UehOEeCjcc2EgK3Uwg"/>
-  <styles xmi:type="notation:StringValueStyle" xmi:id="_lyHywI1REeWYosrjsYCWsA" name="diagram_compatibility_version" stringValue="1.1.0"/>
-  <element xmi:type="uml:Profile" href="PapyrusValidationRuleDSML.uml#__sUW0OhNEeCjcc2EgK3Uwg"/>
-  <edges xmi:type="notation:Connector" xmi:id="_I_zNAOhREeCjcc2EgK3Uwg" type="1013" source="_xvDVQOhOEeCjcc2EgK3Uwg" target="_wrGk8OhOEeCjcc2EgK3Uwg" lineColor="0">
-    <styles xmi:type="notation:FontStyle" xmi:id="_I_zNAehREeCjcc2EgK3Uwg" fontName="Segoe UI"/>
-    <element xmi:type="uml:Extension" href="PapyrusValidationRuleDSML.uml#_I_fD8OhREeCjcc2EgK3Uwg"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I_zNAuhREeCjcc2EgK3Uwg" points="[2, -22, 14, 113]$[43, -96, 55, 39]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I_8W8OhREeCjcc2EgK3Uwg" id="(0.5198237885462555,0.1981981981981982)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_l5SxwY1REeWYosrjsYCWsA" type="StereotypeCommentLink" source="_wrGk8OhOEeCjcc2EgK3Uwg" target="_l5SKsI1REeWYosrjsYCWsA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_l5Sxwo1REeWYosrjsYCWsA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_l5Sxxo1REeWYosrjsYCWsA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Constraint"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l5Sxw41REeWYosrjsYCWsA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5SxxI1REeWYosrjsYCWsA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5SxxY1REeWYosrjsYCWsA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_9YXERI1REeWYosrjsYCWsA" type="StereotypeCommentLink" source="_9X8NgI1REeWYosrjsYCWsA" target="_9YXEQI1REeWYosrjsYCWsA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_9YXERY1REeWYosrjsYCWsA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9YXESY1REeWYosrjsYCWsA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9YXERo1REeWYosrjsYCWsA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9YXER41REeWYosrjsYCWsA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9YXESI1REeWYosrjsYCWsA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_ZI82UI1SEeWYosrjsYCWsA" type="1013" source="_B_luEI1SEeWYosrjsYCWsA" target="_9X8NgI1REeWYosrjsYCWsA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_ZI82UY1SEeWYosrjsYCWsA"/>
-    <element xmi:type="uml:Extension" href="PapyrusValidationRuleDSML.uml#_ZIkb0I1SEeWYosrjsYCWsA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZI82Uo1SEeWYosrjsYCWsA" points="[440, 160, -643984, -643984]$[420, 81, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZJUpwI1SEeWYosrjsYCWsA" id="(0.498220640569395,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZJVQ0I1SEeWYosrjsYCWsA" id="(0.498220640569395,1.0)"/>
-  </edges>
-</notation:Diagram>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.uml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.uml
deleted file mode 100644
index aec3f60fad3..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/resource/PapyrusValidationRuleDSML.uml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="__sUW0OhNEeCjcc2EgK3Uwg" name="PapyrusDSMLValidationRule" URI="http://www.eclipse.org/papyrus/dsmlvalidation" metaclassReference="_wrBFYOhOEeCjcc2EgK3Uwg _9X5KMI1REeWYosrjsYCWsA">
-  <elementImport xmi:type="uml:ElementImport" xmi:id="_wrBFYOhOEeCjcc2EgK3Uwg" alias="Constraint">
-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Constraint"/>
-  </elementImport>
-  <elementImport xmi:type="uml:ElementImport" xmi:id="_9X5KMI1REeWYosrjsYCWsA" alias="Package">
-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
-  </elementImport>
-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_xu6yYOhOEeCjcc2EgK3Uwg" name="ValidationRule">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_5xSbcOhQEeCjcc2EgK3Uwg" name="severity" visibility="public" type="_1CpM8OhOEeCjcc2EgK3Uwg">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6YAdMOhQEeCjcc2EgK3Uwg" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6YCSYOhQEeCjcc2EgK3Uwg" value="1"/>
-      <defaultValue xmi:type="uml:InstanceValue" xmi:id="_3DogkNgmEeKOqNIXy22Xwg" type="_1CpM8OhOEeCjcc2EgK3Uwg" instance="_3K1ogOhOEeCjcc2EgK3Uwg"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_8gPVAOhQEeCjcc2EgK3Uwg" name="mode" visibility="public" type="_97I3oOhOEeCjcc2EgK3Uwg">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9H_RgOhQEeCjcc2EgK3Uwg" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9IBGsOhQEeCjcc2EgK3Uwg" value="1"/>
-      <defaultValue xmi:type="uml:InstanceValue" xmi:id="_9iCucNgmEeKOqNIXy22Xwg" type="_97I3oOhOEeCjcc2EgK3Uwg" instance="_-4BWoOhOEeCjcc2EgK3Uwg"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_GkavsOhREeCjcc2EgK3Uwg" name="isEnabledByDefault" visibility="public">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HZ0tsOhREeCjcc2EgK3Uwg" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HZ2i4OhREeCjcc2EgK3Uwg" value="1"/>
-      <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_0BdJANgmEeKOqNIXy22Xwg" value="true"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_I_ec4OhREeCjcc2EgK3Uwg" name="base_Constraint" association="_I_fD8OhREeCjcc2EgK3Uwg">
-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Constraint"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_vXrlUOqrEeCnkfBG0tzRQg" name="statusCode">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XFjVANgTEeKgsd1mLVpBNQ" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XFtGANgTEeKgsd1mLVpBNQ" value="1"/>
-      <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_ZUED4NgnEeKOqNIXy22Xwg" value="1"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_ClVF8OqsEeCnkfBG0tzRQg" name="message">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oBa2gPleEeC9cqGrFP9Xuw"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oBpgAPleEeC9cqGrFP9Xuw" value="1"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_JFLeQOqsEeCnkfBG0tzRQg" name="description">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pAft4PleEeC9cqGrFP9Xuw"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pAsiMPleEeC9cqGrFP9Xuw" value="1"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_gvm1wOq4EeCnkfBG0tzRQg" name="target">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ps-IsPaAEeCNFabmhlIhLg"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PtUuAPaAEeCNFabmhlIhLg" value="*"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_a1vCoOtYEeCnkfBG0tzRQg" name="class">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yu5U8NgmEeKOqNIXy22Xwg"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yvE7INgmEeKOqNIXy22Xwg" value="1"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_gGxYQOt1EeCnkfBG0tzRQg" name="id">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VGHM0NgTEeKgsd1mLVpBNQ"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VGOhkNgTEeKgsd1mLVpBNQ" value="1"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_1CpM8OhOEeCjcc2EgK3Uwg" name="Severity">
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_3K1ogOhOEeCjcc2EgK3Uwg" name="ERROR"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_3td0cOhOEeCjcc2EgK3Uwg" name="WARNING"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_4SAr8OhOEeCjcc2EgK3Uwg" name="INFO"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_44A8AOhOEeCjcc2EgK3Uwg" name="CANCEL"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_97I3oOhOEeCjcc2EgK3Uwg" name="Mode">
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_-4BWoOhOEeCjcc2EgK3Uwg" name="Batch"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_43Xw4OhQEeCjcc2EgK3Uwg" name="Live"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Extension" xmi:id="_I_fD8OhREeCjcc2EgK3Uwg" name="E_ValidationRule_Constraint1" memberEnd="_I_fD8ehREeCjcc2EgK3Uwg _I_ec4OhREeCjcc2EgK3Uwg">
-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_I_fD8ehREeCjcc2EgK3Uwg" name="extension_ValidationRule" type="_xu6yYOhOEeCjcc2EgK3Uwg" aggregation="composite" association="_I_fD8OhREeCjcc2EgK3Uwg"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_B_fAYI1SEeWYosrjsYCWsA" name="MessageHandling">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Lap6UI1SEeWYosrjsYCWsA" name="messageMode" visibility="public" type="_rIeicI4MEeWYTrG6651VjA"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_ZImRAY1SEeWYosrjsYCWsA" name="base_Package" association="_ZIkb0I1SEeWYosrjsYCWsA">
-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_WyNM4I4MEeWYTrG6651VjA" name="customTemplate" visibility="public">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DIQqcI4PEeWmSrQiOQqlLg"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DIZNUI4PEeWmSrQiOQqlLg" value="1"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Extension" xmi:id="_ZIkb0I1SEeWYosrjsYCWsA" name="E_MessageHandling_Package1" memberEnd="_ZImRAI1SEeWYosrjsYCWsA _ZImRAY1SEeWYosrjsYCWsA">
-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ZImRAI1SEeWYosrjsYCWsA" name="extension_MessageHandling" type="_B_fAYI1SEeWYosrjsYCWsA" aggregation="composite" association="_ZIkb0I1SEeWYosrjsYCWsA"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_rIeicI4MEeWYTrG6651VjA" name="NameBasedMsgMode">
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_wU_qoI4MEeWYTrG6651VjA" name="Default"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_0GPHoI4MEeWYTrG6651VjA" name="NameIsMessage"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_3BILcI4MEeWYTrG6651VjA" name="CustomTemplate"/>
-  </packagedElement>
-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_jxbQ4I1SEeWYosrjsYCWsA">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jxb38I1SEeWYosrjsYCWsA" source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
-    </eAnnotations>
-    <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
-  </profileApplication>
-</uml:Profile>
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/MessageHandling.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/MessageHandling.java
deleted file mode 100644
index 2467735ad09..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/MessageHandling.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Handling</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getMessageMode <em>Message Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getCustomTemplate <em>Custom Template</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getMessageHandling()
- * @model
- * @generated
- */
-public interface MessageHandling extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Message Mode</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Mode</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Mode</em>' attribute.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode
-	 * @see #setMessageMode(NameBasedMsgMode)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getMessageHandling_MessageMode()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	NameBasedMsgMode getMessageMode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getMessageMode <em>Message Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Mode</em>' attribute.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode
-	 * @see #getMessageMode()
-	 * @generated
-	 */
-	void setMessageMode(NameBasedMsgMode value);
-
-	/**
-	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base Package</em>' reference.
-	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getMessageHandling_Base_Package()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	org.eclipse.uml2.uml.Package getBase_Package();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getBase_Package <em>Base Package</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Package</em>' reference.
-	 * @see #getBase_Package()
-	 * @generated
-	 */
-	void setBase_Package(org.eclipse.uml2.uml.Package value);
-
-	/**
-	 * Returns the value of the '<em><b>Custom Template</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Custom Template</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Custom Template</em>' attribute.
-	 * @see #setCustomTemplate(String)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getMessageHandling_CustomTemplate()
-	 * @model dataType="org.eclipse.uml2.types.String" ordered="false"
-	 * @generated
-	 */
-	String getCustomTemplate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getCustomTemplate <em>Custom Template</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Custom Template</em>' attribute.
-	 * @see #getCustomTemplate()
-	 * @generated
-	 */
-	void setCustomTemplate(String value);
-
-} // MessageHandling
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Mode.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Mode.java
deleted file mode 100644
index 72e15fc792f..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Mode.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Mode</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getMode()
- * @model
- * @generated
- */
-public enum Mode implements Enumerator {
-	/**
-	 * The '<em><b>Batch</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #BATCH_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	BATCH(0, "Batch", "Batch"),
-
-	/**
-	 * The '<em><b>Live</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LIVE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LIVE(1, "Live", "Live");
-
-	/**
-	 * The '<em><b>Batch</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Batch</b></em>' literal object isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BATCH
-	 * @model name="Batch"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BATCH_VALUE = 0;
-
-	/**
-	 * The '<em><b>Live</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Live</b></em>' literal object isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LIVE
-	 * @model name="Live"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LIVE_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Mode[] VALUES_ARRAY =
-			new Mode[] {
-			BATCH,
-			LIVE,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Mode> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Mode</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Mode get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Mode result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Mode</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Mode getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Mode result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Mode</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Mode get(int value) {
-		switch (value) {
-			case BATCH_VALUE: return BATCH;
-			case LIVE_VALUE: return LIVE;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Mode(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-
-} // Mode
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/NameBasedMsgMode.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/NameBasedMsgMode.java
deleted file mode 100644
index b09e88aed52..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/NameBasedMsgMode.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Name Based Msg Mode</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getNameBasedMsgMode()
- * @model
- * @generated
- */
-public enum NameBasedMsgMode implements Enumerator {
-	/**
-	 * The '<em><b>Default</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DEFAULT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DEFAULT(0, "Default", "Default"),
-
-	/**
-	 * The '<em><b>Name Is Message</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NAME_IS_MESSAGE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NAME_IS_MESSAGE(1, "NameIsMessage", "NameIsMessage"),
-
-	/**
-	 * The '<em><b>Custom Template</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_TEMPLATE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CUSTOM_TEMPLATE(2, "CustomTemplate", "CustomTemplate");
-
-	/**
-	 * The '<em><b>Default</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Default</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DEFAULT
-	 * @model name="Default"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DEFAULT_VALUE = 0;
-
-	/**
-	 * The '<em><b>Name Is Message</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Name Is Message</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NAME_IS_MESSAGE
-	 * @model name="NameIsMessage"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NAME_IS_MESSAGE_VALUE = 1;
-
-	/**
-	 * The '<em><b>Custom Template</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Custom Template</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_TEMPLATE
-	 * @model name="CustomTemplate"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CUSTOM_TEMPLATE_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Name Based Msg Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final NameBasedMsgMode[] VALUES_ARRAY =
-		new NameBasedMsgMode[] {
-			DEFAULT,
-			NAME_IS_MESSAGE,
-			CUSTOM_TEMPLATE,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Name Based Msg Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<NameBasedMsgMode> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Name Based Msg Mode</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static NameBasedMsgMode get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			NameBasedMsgMode result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Name Based Msg Mode</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static NameBasedMsgMode getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			NameBasedMsgMode result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Name Based Msg Mode</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static NameBasedMsgMode get(int value) {
-		switch (value) {
-			case DEFAULT_VALUE: return DEFAULT;
-			case NAME_IS_MESSAGE_VALUE: return NAME_IS_MESSAGE;
-			case CUSTOM_TEMPLATE_VALUE: return CUSTOM_TEMPLATE;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private NameBasedMsgMode(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //NameBasedMsgMode
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRuleFactory.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRuleFactory.java
deleted file mode 100644
index 199bb0956ce..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRuleFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage
- * @generated
- */
-public interface PapyrusDSMLValidationRuleFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PapyrusDSMLValidationRuleFactory eINSTANCE = org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRuleFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Validation Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Validation Rule</em>'.
-	 * @generated
-	 */
-	ValidationRule createValidationRule();
-
-	/**
-	 * Returns a new object of class '<em>Message Handling</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Handling</em>'.
-	 * @generated
-	 */
-	MessageHandling createMessageHandling();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	PapyrusDSMLValidationRulePackage getPapyrusDSMLValidationRulePackage();
-
-} // PapyrusDSMLValidationRuleFactory
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRulePackage.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRulePackage.java
deleted file mode 100644
index 43c95ae594e..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/PapyrusDSMLValidationRulePackage.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRuleFactory
- * @model kind="package"
- * @generated
- */
-public interface PapyrusDSMLValidationRulePackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "PapyrusDSMLValidationRule";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/dsmlvalidation";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "PapyrusDSMLValidationRule";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PapyrusDSMLValidationRulePackage eINSTANCE = org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl <em>Validation Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getValidationRule()
-	 * @generated
-	 */
-	int VALIDATION_RULE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Severity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__SEVERITY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__MODE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Is Enabled By Default</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__IS_ENABLED_BY_DEFAULT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Base Constraint</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__BASE_CONSTRAINT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Status Code</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__STATUS_CODE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__MESSAGE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__DESCRIPTION = 6;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__TARGET = 7;
-
-	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__CLASS = 8;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE__ID = 9;
-
-	/**
-	 * The number of structural features of the '<em>Validation Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE_FEATURE_COUNT = 10;
-
-	/**
-	 * The number of operations of the '<em>Validation Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATION_RULE_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.MessageHandlingImpl <em>Message Handling</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.MessageHandlingImpl
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getMessageHandling()
-	 * @generated
-	 */
-	int MESSAGE_HANDLING = 1;
-
-	/**
-	 * The feature id for the '<em><b>Message Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_HANDLING__MESSAGE_MODE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Base Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_HANDLING__BASE_PACKAGE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Custom Template</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_HANDLING__CUSTOM_TEMPLATE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Message Handling</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_HANDLING_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of operations of the '<em>Message Handling</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_HANDLING_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity <em>Severity</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getSeverity()
-	 * @generated
-	 */
-	int SEVERITY = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode <em>Mode</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getMode()
-	 * @generated
-	 */
-	int MODE = 3;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode <em>Name Based Msg Mode</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getNameBasedMsgMode()
-	 * @generated
-	 */
-	int NAME_BASED_MSG_MODE = 4;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule <em>Validation Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Validation Rule</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule
-	 * @generated
-	 */
-	EClass getValidationRule();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getSeverity <em>Severity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Severity</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getSeverity()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EAttribute getValidationRule_Severity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getMode <em>Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mode</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getMode()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EAttribute getValidationRule_Mode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#isEnabledByDefault <em>Is Enabled By Default</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Enabled By Default</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#isEnabledByDefault()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EAttribute getValidationRule_IsEnabledByDefault();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getBase_Constraint <em>Base Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base Constraint</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getBase_Constraint()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EReference getValidationRule_Base_Constraint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getStatusCode <em>Status Code</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Status Code</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getStatusCode()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EAttribute getValidationRule_StatusCode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getMessage <em>Message</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getMessage()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EAttribute getValidationRule_Message();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getDescription()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EAttribute getValidationRule_Description();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Target</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getTarget()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EAttribute getValidationRule_Target();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getClass_()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EAttribute getValidationRule_Class();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getId()
-	 * @see #getValidationRule()
-	 * @generated
-	 */
-	EAttribute getValidationRule_Id();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling <em>Message Handling</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Handling</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling
-	 * @generated
-	 */
-	EClass getMessageHandling();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getMessageMode <em>Message Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Mode</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getMessageMode()
-	 * @see #getMessageHandling()
-	 * @generated
-	 */
-	EAttribute getMessageHandling_MessageMode();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getBase_Package <em>Base Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base Package</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getBase_Package()
-	 * @see #getMessageHandling()
-	 * @generated
-	 */
-	EReference getMessageHandling_Base_Package();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getCustomTemplate <em>Custom Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Custom Template</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling#getCustomTemplate()
-	 * @see #getMessageHandling()
-	 * @generated
-	 */
-	EAttribute getMessageHandling_CustomTemplate();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity <em>Severity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Severity</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity
-	 * @generated
-	 */
-	EEnum getSeverity();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode <em>Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Mode</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode
-	 * @generated
-	 */
-	EEnum getMode();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode <em>Name Based Msg Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Name Based Msg Mode</em>'.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode
-	 * @generated
-	 */
-	EEnum getNameBasedMsgMode();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	PapyrusDSMLValidationRuleFactory getPapyrusDSMLValidationRuleFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 * <li>each class,</li>
-	 * <li>each feature of each class,</li>
-	 * <li>each operation of each class,</li>
-	 * <li>each enum,</li>
-	 * <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl <em>Validation Rule</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getValidationRule()
-		 * @generated
-		 */
-		EClass VALIDATION_RULE = eINSTANCE.getValidationRule();
-
-		/**
-		 * The meta object literal for the '<em><b>Severity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VALIDATION_RULE__SEVERITY = eINSTANCE.getValidationRule_Severity();
-
-		/**
-		 * The meta object literal for the '<em><b>Mode</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VALIDATION_RULE__MODE = eINSTANCE.getValidationRule_Mode();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Enabled By Default</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VALIDATION_RULE__IS_ENABLED_BY_DEFAULT = eINSTANCE.getValidationRule_IsEnabledByDefault();
-
-		/**
-		 * The meta object literal for the '<em><b>Base Constraint</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference VALIDATION_RULE__BASE_CONSTRAINT = eINSTANCE.getValidationRule_Base_Constraint();
-
-		/**
-		 * The meta object literal for the '<em><b>Status Code</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VALIDATION_RULE__STATUS_CODE = eINSTANCE.getValidationRule_StatusCode();
-
-		/**
-		 * The meta object literal for the '<em><b>Message</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VALIDATION_RULE__MESSAGE = eINSTANCE.getValidationRule_Message();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VALIDATION_RULE__DESCRIPTION = eINSTANCE.getValidationRule_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VALIDATION_RULE__TARGET = eINSTANCE.getValidationRule_Target();
-
-		/**
-		 * The meta object literal for the '<em><b>Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VALIDATION_RULE__CLASS = eINSTANCE.getValidationRule_Class();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute VALIDATION_RULE__ID = eINSTANCE.getValidationRule_Id();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.MessageHandlingImpl <em>Message Handling</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.MessageHandlingImpl
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getMessageHandling()
-		 * @generated
-		 */
-		EClass MESSAGE_HANDLING = eINSTANCE.getMessageHandling();
-
-		/**
-		 * The meta object literal for the '<em><b>Message Mode</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_HANDLING__MESSAGE_MODE = eINSTANCE.getMessageHandling_MessageMode();
-
-		/**
-		 * The meta object literal for the '<em><b>Base Package</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MESSAGE_HANDLING__BASE_PACKAGE = eINSTANCE.getMessageHandling_Base_Package();
-
-		/**
-		 * The meta object literal for the '<em><b>Custom Template</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MESSAGE_HANDLING__CUSTOM_TEMPLATE = eINSTANCE.getMessageHandling_CustomTemplate();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity <em>Severity</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getSeverity()
-		 * @generated
-		 */
-		EEnum SEVERITY = eINSTANCE.getSeverity();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode <em>Mode</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getMode()
-		 * @generated
-		 */
-		EEnum MODE = eINSTANCE.getMode();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode <em>Name Based Msg Mode</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode
-		 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.PapyrusDSMLValidationRulePackageImpl#getNameBasedMsgMode()
-		 * @generated
-		 */
-		EEnum NAME_BASED_MSG_MODE = eINSTANCE.getNameBasedMsgMode();
-
-	}
-
-} // PapyrusDSMLValidationRulePackage
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Severity.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Severity.java
deleted file mode 100644
index 241503b4c63..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/Severity.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Severity</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getSeverity()
- * @model
- * @generated
- */
-public enum Severity implements Enumerator {
-	/**
-	 * The '<em><b>ERROR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ERROR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ERROR(0, "ERROR", "ERROR"),
-
-	/**
-	 * The '<em><b>WARNING</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #WARNING_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	WARNING(1, "WARNING", "WARNING"),
-
-	/**
-	 * The '<em><b>INFO</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INFO_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INFO(2, "INFO", "INFO"),
-
-	/**
-	 * The '<em><b>CANCEL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CANCEL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CANCEL(3, "CANCEL", "CANCEL");
-
-	/**
-	 * The '<em><b>ERROR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ERROR</b></em>' literal object isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ERROR
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ERROR_VALUE = 0;
-
-	/**
-	 * The '<em><b>WARNING</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>WARNING</b></em>' literal object isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #WARNING
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int WARNING_VALUE = 1;
-
-	/**
-	 * The '<em><b>INFO</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INFO</b></em>' literal object isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INFO
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INFO_VALUE = 2;
-
-	/**
-	 * The '<em><b>CANCEL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CANCEL</b></em>' literal object isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CANCEL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CANCEL_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>Severity</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Severity[] VALUES_ARRAY =
-			new Severity[] {
-			ERROR,
-			WARNING,
-			INFO,
-			CANCEL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Severity</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Severity> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Severity</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Severity get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Severity result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Severity</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Severity getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Severity result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Severity</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static Severity get(int value) {
-		switch (value) {
-			case ERROR_VALUE: return ERROR;
-			case WARNING_VALUE: return WARNING;
-			case INFO_VALUE: return INFO;
-			case CANCEL_VALUE: return CANCEL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Severity(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-
-} // Severity
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/ValidationRule.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/ValidationRule.java
deleted file mode 100644
index 48ac6afcaa0..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/ValidationRule.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.uml2.uml.Constraint;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Validation Rule</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getSeverity <em>Severity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#isEnabledByDefault <em>Is Enabled By Default</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getBase_Constraint <em>Base Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getStatusCode <em>Status Code</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getId <em>Id</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule()
- * @model
- * @generated
- */
-public interface ValidationRule extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Severity</b></em>' attribute.
-	 * The default value is <code>"ERROR"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Severity</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Severity</em>' attribute.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity
-	 * @see #setSeverity(Severity)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_Severity()
-	 * @model default="ERROR" required="true" ordered="false"
-	 * @generated
-	 */
-	Severity getSeverity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getSeverity <em>Severity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Severity</em>' attribute.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity
-	 * @see #getSeverity()
-	 * @generated
-	 */
-	void setSeverity(Severity value);
-
-	/**
-	 * Returns the value of the '<em><b>Mode</b></em>' attribute.
-	 * The default value is <code>"Batch"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mode</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mode</em>' attribute.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode
-	 * @see #setMode(Mode)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_Mode()
-	 * @model default="Batch" required="true" ordered="false"
-	 * @generated
-	 */
-	Mode getMode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getMode <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mode</em>' attribute.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode
-	 * @see #getMode()
-	 * @generated
-	 */
-	void setMode(Mode value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Enabled By Default</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Enabled By Default</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Is Enabled By Default</em>' attribute.
-	 * @see #setIsEnabledByDefault(boolean)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_IsEnabledByDefault()
-	 * @model default="true" dataType="org.eclipse.uml2.types.Boolean" required="true" ordered="false"
-	 * @generated
-	 */
-	boolean isEnabledByDefault();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#isEnabledByDefault <em>Is Enabled By Default</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Enabled By Default</em>' attribute.
-	 * @see #isEnabledByDefault()
-	 * @generated
-	 */
-	void setIsEnabledByDefault(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Base Constraint</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base Constraint</em>' reference isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base Constraint</em>' reference.
-	 * @see #setBase_Constraint(Constraint)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_Base_Constraint()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	Constraint getBase_Constraint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getBase_Constraint <em>Base Constraint</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Constraint</em>' reference.
-	 * @see #getBase_Constraint()
-	 * @generated
-	 */
-	void setBase_Constraint(Constraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Status Code</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Status Code</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Status Code</em>' attribute.
-	 * @see #setStatusCode(int)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_StatusCode()
-	 * @model default="1" dataType="org.eclipse.uml2.types.Integer" required="true" ordered="false"
-	 * @generated
-	 */
-	int getStatusCode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getStatusCode <em>Status Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Status Code</em>' attribute.
-	 * @see #getStatusCode()
-	 * @generated
-	 */
-	void setStatusCode(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message</em>' attribute.
-	 * @see #setMessage(String)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_Message()
-	 * @model dataType="org.eclipse.uml2.types.String" ordered="false"
-	 * @generated
-	 */
-	String getMessage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getMessage <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message</em>' attribute.
-	 * @see #getMessage()
-	 * @generated
-	 */
-	void setMessage(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_Description()
-	 * @model dataType="org.eclipse.uml2.types.String" ordered="false"
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Target</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target</em>' attribute list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target</em>' attribute list.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_Target()
-	 * @model dataType="org.eclipse.uml2.types.String" ordered="false"
-	 * @generated
-	 */
-	EList<String> getTarget();
-
-	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Class</em>' attribute.
-	 * @see #setClass_(String)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_Class()
-	 * @model dataType="org.eclipse.uml2.types.String" ordered="false"
-	 * @generated
-	 */
-	String getClass_();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
-	 * @see #getClass_()
-	 * @generated
-	 */
-	void setClass_(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#getValidationRule_Id()
-	 * @model dataType="org.eclipse.uml2.types.String" ordered="false"
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-} // ValidationRule
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/MessageHandlingImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/MessageHandlingImpl.java
deleted file mode 100644
index 3e73cf3d6cf..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/MessageHandlingImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Handling</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.MessageHandlingImpl#getMessageMode <em>Message Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.MessageHandlingImpl#getBase_Package <em>Base Package</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.MessageHandlingImpl#getCustomTemplate <em>Custom Template</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class MessageHandlingImpl extends MinimalEObjectImpl.Container implements MessageHandling {
-	/**
-	 * The default value of the '{@link #getMessageMode() <em>Message Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final NameBasedMsgMode MESSAGE_MODE_EDEFAULT = NameBasedMsgMode.DEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMessageMode() <em>Message Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected NameBasedMsgMode messageMode = MESSAGE_MODE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBase_Package()
-	 * @generated
-	 * @ordered
-	 */
-	protected org.eclipse.uml2.uml.Package base_Package;
-
-	/**
-	 * The default value of the '{@link #getCustomTemplate() <em>Custom Template</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomTemplate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CUSTOM_TEMPLATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomTemplate() <em>Custom Template</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomTemplate()
-	 * @generated
-	 * @ordered
-	 */
-	protected String customTemplate = CUSTOM_TEMPLATE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageHandlingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PapyrusDSMLValidationRulePackage.Literals.MESSAGE_HANDLING;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NameBasedMsgMode getMessageMode() {
-		return messageMode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageMode(NameBasedMsgMode newMessageMode) {
-		NameBasedMsgMode oldMessageMode = messageMode;
-		messageMode = newMessageMode == null ? MESSAGE_MODE_EDEFAULT : newMessageMode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__MESSAGE_MODE, oldMessageMode, messageMode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public org.eclipse.uml2.uml.Package getBase_Package() {
-		if (base_Package != null && base_Package.eIsProxy()) {
-			InternalEObject oldBase_Package = (InternalEObject)base_Package;
-			base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
-			if (base_Package != oldBase_Package) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__BASE_PACKAGE, oldBase_Package, base_Package));
-			}
-		}
-		return base_Package;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public org.eclipse.uml2.uml.Package basicGetBase_Package() {
-		return base_Package;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
-		org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
-		base_Package = newBase_Package;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__BASE_PACKAGE, oldBase_Package, base_Package));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCustomTemplate() {
-		return customTemplate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCustomTemplate(String newCustomTemplate) {
-		String oldCustomTemplate = customTemplate;
-		customTemplate = newCustomTemplate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__CUSTOM_TEMPLATE, oldCustomTemplate, customTemplate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__MESSAGE_MODE:
-				return getMessageMode();
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__BASE_PACKAGE:
-				if (resolve) return getBase_Package();
-				return basicGetBase_Package();
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__CUSTOM_TEMPLATE:
-				return getCustomTemplate();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__MESSAGE_MODE:
-				setMessageMode((NameBasedMsgMode)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__CUSTOM_TEMPLATE:
-				setCustomTemplate((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__MESSAGE_MODE:
-				setMessageMode(MESSAGE_MODE_EDEFAULT);
-				return;
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__BASE_PACKAGE:
-				setBase_Package((org.eclipse.uml2.uml.Package)null);
-				return;
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__CUSTOM_TEMPLATE:
-				setCustomTemplate(CUSTOM_TEMPLATE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__MESSAGE_MODE:
-				return messageMode != MESSAGE_MODE_EDEFAULT;
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__BASE_PACKAGE:
-				return base_Package != null;
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING__CUSTOM_TEMPLATE:
-				return CUSTOM_TEMPLATE_EDEFAULT == null ? customTemplate != null : !CUSTOM_TEMPLATE_EDEFAULT.equals(customTemplate);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (messageMode: ");
-		result.append(messageMode);
-		result.append(", customTemplate: ");
-		result.append(customTemplate);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageHandlingImpl
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRuleFactoryImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRuleFactoryImpl.java
deleted file mode 100644
index 367ab0f7056..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRuleFactoryImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.*;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRuleFactory;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusDSMLValidationRuleFactoryImpl extends EFactoryImpl implements PapyrusDSMLValidationRuleFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PapyrusDSMLValidationRuleFactory init() {
-		try {
-			PapyrusDSMLValidationRuleFactory thePapyrusDSMLValidationRuleFactory = (PapyrusDSMLValidationRuleFactory)EPackage.Registry.INSTANCE.getEFactory(PapyrusDSMLValidationRulePackage.eNS_URI);
-			if (thePapyrusDSMLValidationRuleFactory != null) {
-				return thePapyrusDSMLValidationRuleFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new PapyrusDSMLValidationRuleFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDSMLValidationRuleFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE: return createValidationRule();
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING: return createMessageHandling();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case PapyrusDSMLValidationRulePackage.SEVERITY:
-				return createSeverityFromString(eDataType, initialValue);
-			case PapyrusDSMLValidationRulePackage.MODE:
-				return createModeFromString(eDataType, initialValue);
-			case PapyrusDSMLValidationRulePackage.NAME_BASED_MSG_MODE:
-				return createNameBasedMsgModeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case PapyrusDSMLValidationRulePackage.SEVERITY:
-				return convertSeverityToString(eDataType, instanceValue);
-			case PapyrusDSMLValidationRulePackage.MODE:
-				return convertModeToString(eDataType, instanceValue);
-			case PapyrusDSMLValidationRulePackage.NAME_BASED_MSG_MODE:
-				return convertNameBasedMsgModeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValidationRule createValidationRule() {
-		ValidationRuleImpl validationRule = new ValidationRuleImpl();
-		return validationRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageHandling createMessageHandling() {
-		MessageHandlingImpl messageHandling = new MessageHandlingImpl();
-		return messageHandling;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Severity createSeverityFromString(EDataType eDataType, String initialValue) {
-		Severity result = Severity.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSeverityToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Mode createModeFromString(EDataType eDataType, String initialValue) {
-		Mode result = Mode.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertModeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NameBasedMsgMode createNameBasedMsgModeFromString(EDataType eDataType, String initialValue) {
-		NameBasedMsgMode result = NameBasedMsgMode.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertNameBasedMsgModeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDSMLValidationRulePackage getPapyrusDSMLValidationRulePackage() {
-		return (PapyrusDSMLValidationRulePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static PapyrusDSMLValidationRulePackage getPackage() {
-		return PapyrusDSMLValidationRulePackage.eINSTANCE;
-	}
-
-} // PapyrusDSMLValidationRuleFactoryImpl
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRulePackageImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRulePackageImpl.java
deleted file mode 100644
index 12f6a85d244..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/PapyrusDSMLValidationRulePackageImpl.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.NameBasedMsgMode;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRuleFactory;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule;
-import org.eclipse.uml2.types.TypesPackage;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusDSMLValidationRulePackageImpl extends EPackageImpl implements PapyrusDSMLValidationRulePackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass validationRuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageHandlingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum severityEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum modeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum nameBasedMsgModeEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private PapyrusDSMLValidationRulePackageImpl() {
-		super(eNS_URI, PapyrusDSMLValidationRuleFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link PapyrusDSMLValidationRulePackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static PapyrusDSMLValidationRulePackage init() {
-		if (isInited) return (PapyrusDSMLValidationRulePackage)EPackage.Registry.INSTANCE.getEPackage(PapyrusDSMLValidationRulePackage.eNS_URI);
-
-		// Obtain or create and register package
-		PapyrusDSMLValidationRulePackageImpl thePapyrusDSMLValidationRulePackage = (PapyrusDSMLValidationRulePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PapyrusDSMLValidationRulePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PapyrusDSMLValidationRulePackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		UMLPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		thePapyrusDSMLValidationRulePackage.createPackageContents();
-
-		// Initialize created meta-data
-		thePapyrusDSMLValidationRulePackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		thePapyrusDSMLValidationRulePackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(PapyrusDSMLValidationRulePackage.eNS_URI, thePapyrusDSMLValidationRulePackage);
-		return thePapyrusDSMLValidationRulePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getValidationRule() {
-		return validationRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValidationRule_Severity() {
-		return (EAttribute)validationRuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValidationRule_Mode() {
-		return (EAttribute)validationRuleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValidationRule_IsEnabledByDefault() {
-		return (EAttribute)validationRuleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getValidationRule_Base_Constraint() {
-		return (EReference)validationRuleEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValidationRule_StatusCode() {
-		return (EAttribute)validationRuleEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValidationRule_Message() {
-		return (EAttribute)validationRuleEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValidationRule_Description() {
-		return (EAttribute)validationRuleEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValidationRule_Target() {
-		return (EAttribute)validationRuleEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValidationRule_Class() {
-		return (EAttribute)validationRuleEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValidationRule_Id() {
-		return (EAttribute)validationRuleEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageHandling() {
-		return messageHandlingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageHandling_MessageMode() {
-		return (EAttribute)messageHandlingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageHandling_Base_Package() {
-		return (EReference)messageHandlingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageHandling_CustomTemplate() {
-		return (EAttribute)messageHandlingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getSeverity() {
-		return severityEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getMode() {
-		return modeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getNameBasedMsgMode() {
-		return nameBasedMsgModeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDSMLValidationRuleFactory getPapyrusDSMLValidationRuleFactory() {
-		return (PapyrusDSMLValidationRuleFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		validationRuleEClass = createEClass(VALIDATION_RULE);
-		createEAttribute(validationRuleEClass, VALIDATION_RULE__SEVERITY);
-		createEAttribute(validationRuleEClass, VALIDATION_RULE__MODE);
-		createEAttribute(validationRuleEClass, VALIDATION_RULE__IS_ENABLED_BY_DEFAULT);
-		createEReference(validationRuleEClass, VALIDATION_RULE__BASE_CONSTRAINT);
-		createEAttribute(validationRuleEClass, VALIDATION_RULE__STATUS_CODE);
-		createEAttribute(validationRuleEClass, VALIDATION_RULE__MESSAGE);
-		createEAttribute(validationRuleEClass, VALIDATION_RULE__DESCRIPTION);
-		createEAttribute(validationRuleEClass, VALIDATION_RULE__TARGET);
-		createEAttribute(validationRuleEClass, VALIDATION_RULE__CLASS);
-		createEAttribute(validationRuleEClass, VALIDATION_RULE__ID);
-
-		messageHandlingEClass = createEClass(MESSAGE_HANDLING);
-		createEAttribute(messageHandlingEClass, MESSAGE_HANDLING__MESSAGE_MODE);
-		createEReference(messageHandlingEClass, MESSAGE_HANDLING__BASE_PACKAGE);
-		createEAttribute(messageHandlingEClass, MESSAGE_HANDLING__CUSTOM_TEMPLATE);
-
-		// Create enums
-		severityEEnum = createEEnum(SEVERITY);
-		modeEEnum = createEEnum(MODE);
-		nameBasedMsgModeEEnum = createEEnum(NAME_BASED_MSG_MODE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(validationRuleEClass, ValidationRule.class, "ValidationRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getValidationRule_Severity(), this.getSeverity(), "severity", "ERROR", 1, 1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getValidationRule_Mode(), this.getMode(), "mode", "Batch", 1, 1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getValidationRule_IsEnabledByDefault(), theTypesPackage.getBoolean(), "isEnabledByDefault", "true", 1, 1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getValidationRule_Base_Constraint(), theUMLPackage.getConstraint(), null, "base_Constraint", null, 1, 1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getValidationRule_StatusCode(), theTypesPackage.getInteger(), "statusCode", "1", 1, 1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getValidationRule_Message(), theTypesPackage.getString(), "message", null, 0, 1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getValidationRule_Description(), theTypesPackage.getString(), "description", null, 0, 1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getValidationRule_Target(), theTypesPackage.getString(), "target", null, 0, -1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getValidationRule_Class(), theTypesPackage.getString(), "class", null, 0, 1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getValidationRule_Id(), theTypesPackage.getString(), "id", null, 0, 1, ValidationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(messageHandlingEClass, MessageHandling.class, "MessageHandling", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMessageHandling_MessageMode(), this.getNameBasedMsgMode(), "messageMode", null, 1, 1, MessageHandling.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getMessageHandling_Base_Package(), theUMLPackage.getPackage(), null, "base_Package", null, 1, 1, MessageHandling.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getMessageHandling_CustomTemplate(), theTypesPackage.getString(), "customTemplate", null, 0, 1, MessageHandling.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(severityEEnum, Severity.class, "Severity");
-		addEEnumLiteral(severityEEnum, Severity.ERROR);
-		addEEnumLiteral(severityEEnum, Severity.WARNING);
-		addEEnumLiteral(severityEEnum, Severity.INFO);
-		addEEnumLiteral(severityEEnum, Severity.CANCEL);
-
-		initEEnum(modeEEnum, Mode.class, "Mode");
-		addEEnumLiteral(modeEEnum, Mode.BATCH);
-		addEEnumLiteral(modeEEnum, Mode.LIVE);
-
-		initEEnum(nameBasedMsgModeEEnum, NameBasedMsgMode.class, "NameBasedMsgMode");
-		addEEnumLiteral(nameBasedMsgModeEEnum, NameBasedMsgMode.DEFAULT);
-		addEEnumLiteral(nameBasedMsgModeEEnum, NameBasedMsgMode.NAME_IS_MESSAGE);
-		addEEnumLiteral(nameBasedMsgModeEEnum, NameBasedMsgMode.CUSTOM_TEMPLATE);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} // PapyrusDSMLValidationRulePackageImpl
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/ValidationRuleImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/ValidationRuleImpl.java
deleted file mode 100644
index e5a30fa7e32..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/impl/ValidationRuleImpl.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Mode;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.Severity;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule;
-import org.eclipse.uml2.uml.Constraint;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Validation Rule</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#getSeverity <em>Severity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#isEnabledByDefault <em>Is Enabled By Default</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#getBase_Constraint <em>Base Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#getStatusCode <em>Status Code</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.impl.ValidationRuleImpl#getId <em>Id</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ValidationRuleImpl extends MinimalEObjectImpl.Container implements ValidationRule {
-	/**
-	 * The default value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeverity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Severity SEVERITY_EDEFAULT = Severity.ERROR;
-
-	/**
-	 * The cached value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeverity()
-	 * @generated
-	 * @ordered
-	 */
-	protected Severity severity = SEVERITY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMode() <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Mode MODE_EDEFAULT = Mode.BATCH;
-
-	/**
-	 * The cached value of the '{@link #getMode() <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected Mode mode = MODE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isEnabledByDefault() <em>Is Enabled By Default</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEnabledByDefault()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_ENABLED_BY_DEFAULT_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isEnabledByDefault() <em>Is Enabled By Default</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEnabledByDefault()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isEnabledByDefault = IS_ENABLED_BY_DEFAULT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getBase_Constraint() <em>Base Constraint</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBase_Constraint()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint base_Constraint;
-
-	/**
-	 * The default value of the '{@link #getStatusCode() <em>Status Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStatusCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int STATUS_CODE_EDEFAULT = 1;
-
-	/**
-	 * The cached value of the '{@link #getStatusCode() <em>Status Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStatusCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected int statusCode = STATUS_CODE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected String message = MESSAGE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTarget() <em>Target</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTarget()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<String> target;
-
-	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClass_()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClass_()
-	 * @generated
-	 * @ordered
-	 */
-	protected String class_ = CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ValidationRuleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return PapyrusDSMLValidationRulePackage.Literals.VALIDATION_RULE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Severity getSeverity() {
-		return severity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSeverity(Severity newSeverity) {
-		Severity oldSeverity = severity;
-		severity = newSeverity == null ? SEVERITY_EDEFAULT : newSeverity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__SEVERITY, oldSeverity, severity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Mode getMode() {
-		return mode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMode(Mode newMode) {
-		Mode oldMode = mode;
-		mode = newMode == null ? MODE_EDEFAULT : newMode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MODE, oldMode, mode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEnabledByDefault() {
-		return isEnabledByDefault;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsEnabledByDefault(boolean newIsEnabledByDefault) {
-		boolean oldIsEnabledByDefault = isEnabledByDefault;
-		isEnabledByDefault = newIsEnabledByDefault;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__IS_ENABLED_BY_DEFAULT, oldIsEnabledByDefault, isEnabledByDefault));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getBase_Constraint() {
-		if (base_Constraint != null && base_Constraint.eIsProxy()) {
-			InternalEObject oldBase_Constraint = (InternalEObject)base_Constraint;
-			base_Constraint = (Constraint)eResolveProxy(oldBase_Constraint);
-			if (base_Constraint != oldBase_Constraint) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
-			}
-		}
-		return base_Constraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint basicGetBase_Constraint() {
-		return base_Constraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBase_Constraint(Constraint newBase_Constraint) {
-		Constraint oldBase_Constraint = base_Constraint;
-		base_Constraint = newBase_Constraint;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__BASE_CONSTRAINT, oldBase_Constraint, base_Constraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getStatusCode() {
-		return statusCode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStatusCode(int newStatusCode) {
-		int oldStatusCode = statusCode;
-		statusCode = newStatusCode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__STATUS_CODE, oldStatusCode, statusCode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessage(String newMessage) {
-		String oldMessage = message;
-		message = newMessage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MESSAGE, oldMessage, message));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<String> getTarget() {
-		if (target == null) {
-			target = new EDataTypeUniqueEList<String>(String.class, this, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__TARGET);
-		}
-		return target;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getClass_() {
-		return class_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setClass_(String newClass) {
-		String oldClass = class_;
-		class_ = newClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__CLASS, oldClass, class_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusDSMLValidationRulePackage.VALIDATION_RULE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__SEVERITY:
-				return getSeverity();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MODE:
-				return getMode();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__IS_ENABLED_BY_DEFAULT:
-				return isEnabledByDefault();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__BASE_CONSTRAINT:
-				if (resolve) return getBase_Constraint();
-				return basicGetBase_Constraint();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__STATUS_CODE:
-				return getStatusCode();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MESSAGE:
-				return getMessage();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__DESCRIPTION:
-				return getDescription();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__TARGET:
-				return getTarget();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__CLASS:
-				return getClass_();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__ID:
-				return getId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__SEVERITY:
-				setSeverity((Severity)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MODE:
-				setMode((Mode)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__IS_ENABLED_BY_DEFAULT:
-				setIsEnabledByDefault((Boolean)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__STATUS_CODE:
-				setStatusCode((Integer)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MESSAGE:
-				setMessage((String)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__TARGET:
-				getTarget().clear();
-				getTarget().addAll((Collection<? extends String>)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__CLASS:
-				setClass_((String)newValue);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__ID:
-				setId((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__SEVERITY:
-				setSeverity(SEVERITY_EDEFAULT);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MODE:
-				setMode(MODE_EDEFAULT);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__IS_ENABLED_BY_DEFAULT:
-				setIsEnabledByDefault(IS_ENABLED_BY_DEFAULT_EDEFAULT);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__BASE_CONSTRAINT:
-				setBase_Constraint((Constraint)null);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__STATUS_CODE:
-				setStatusCode(STATUS_CODE_EDEFAULT);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MESSAGE:
-				setMessage(MESSAGE_EDEFAULT);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__TARGET:
-				getTarget().clear();
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__CLASS:
-				setClass_(CLASS_EDEFAULT);
-				return;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__ID:
-				setId(ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__SEVERITY:
-				return severity != SEVERITY_EDEFAULT;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MODE:
-				return mode != MODE_EDEFAULT;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__IS_ENABLED_BY_DEFAULT:
-				return isEnabledByDefault != IS_ENABLED_BY_DEFAULT_EDEFAULT;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__BASE_CONSTRAINT:
-				return base_Constraint != null;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__STATUS_CODE:
-				return statusCode != STATUS_CODE_EDEFAULT;
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__MESSAGE:
-				return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__TARGET:
-				return target != null && !target.isEmpty();
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (severity: ");
-		result.append(severity);
-		result.append(", mode: ");
-		result.append(mode);
-		result.append(", isEnabledByDefault: ");
-		result.append(isEnabledByDefault);
-		result.append(", statusCode: ");
-		result.append(statusCode);
-		result.append(", message: ");
-		result.append(message);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", target: ");
-		result.append(target);
-		result.append(", class: ");
-		result.append(class_);
-		result.append(", id: ");
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} // ValidationRuleImpl
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleAdapterFactory.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleAdapterFactory.java
deleted file mode 100644
index 5b866f6f989..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleAdapterFactory.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.*;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage
- * @generated
- */
-public class PapyrusDSMLValidationRuleAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static PapyrusDSMLValidationRulePackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDSMLValidationRuleAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = PapyrusDSMLValidationRulePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusDSMLValidationRuleSwitch<Adapter> modelSwitch =
-			new PapyrusDSMLValidationRuleSwitch<Adapter>() {
-			@Override
-			public Adapter caseValidationRule(ValidationRule object) {
-				return createValidationRuleAdapter();
-			}
-			@Override
-			public Adapter caseMessageHandling(MessageHandling object) {
-				return createMessageHandlingAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule <em>Validation Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule
-	 * @generated
-	 */
-	public Adapter createValidationRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling <em>Message Handling</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.MessageHandling
-	 * @generated
-	 */
-	public Adapter createMessageHandlingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} // PapyrusDSMLValidationRuleAdapterFactory
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceFactoryImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceFactoryImpl.java
deleted file mode 100644
index 073910d8286..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceFactoryImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.util.PapyrusDSMLValidationRuleResourceImpl
- * @generated
- */
-public class PapyrusDSMLValidationRuleResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDSMLValidationRuleResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		XMLResource result = new PapyrusDSMLValidationRuleResourceImpl(uri);
-		return result;
-	}
-
-} // PapyrusDSMLValidationRuleResourceFactoryImpl
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceImpl.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceImpl.java
deleted file mode 100644
index 64ba3d44fc9..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleResourceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.util.PapyrusDSMLValidationRuleResourceFactoryImpl
- * @generated
- */
-public class PapyrusDSMLValidationRuleResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public PapyrusDSMLValidationRuleResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} // PapyrusDSMLValidationRuleResourceImpl
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleSwitch.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleSwitch.java
deleted file mode 100644
index ef546f570c7..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleSwitch.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.*;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.ValidationRule;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage
- * @generated
- */
-public class PapyrusDSMLValidationRuleSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static PapyrusDSMLValidationRulePackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDSMLValidationRuleSwitch() {
-		if (modelPackage == null) {
-			modelPackage = PapyrusDSMLValidationRulePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case PapyrusDSMLValidationRulePackage.VALIDATION_RULE: {
-				ValidationRule validationRule = (ValidationRule)theEObject;
-				T result = caseValidationRule(validationRule);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case PapyrusDSMLValidationRulePackage.MESSAGE_HANDLING: {
-				MessageHandling messageHandling = (MessageHandling)theEObject;
-				T result = caseMessageHandling(messageHandling);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Validation Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Validation Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseValidationRule(ValidationRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Message Handling</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Message Handling</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMessageHandling(MessageHandling object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} // PapyrusDSMLValidationRuleSwitch
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleXMLProcessor.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleXMLProcessor.java
deleted file mode 100644
index 4b3b6f85a99..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src-gen/org/eclipse/papyrus/dsml/validation/PapyrusDSMLValidationRule/util/PapyrusDSMLValidationRuleXMLProcessor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.papyrus.dsml.validation.PapyrusDSMLValidationRule.PapyrusDSMLValidationRulePackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusDSMLValidationRuleXMLProcessor extends XMLProcessor {
-
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDSMLValidationRuleXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		PapyrusDSMLValidationRulePackage.eINSTANCE.eClass();
-	}
-
-	/**
-	 * Register for "*" and "xml" file extensions the PapyrusDSMLValidationRuleResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new PapyrusDSMLValidationRuleResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new PapyrusDSMLValidationRuleResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} // PapyrusDSMLValidationRuleXMLProcessor
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/Activator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/Activator.java
deleted file mode 100644
index e1d25afafc8..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/Activator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.papyrus.dsml.validation;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	/**
-	 * the plugin ID
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.dsml.validation"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java
deleted file mode 100644
index f7bf0f05fe5..00000000000
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/src/org/eclipse/papyrus/dsml/validation/IDSMLValidation.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.dsml.validation;
-
-/**
- * This interface contains all constants to work with the profile DSMLValidationRule
- *
- */
-public interface IDSMLValidation {
-	/** Qualified name of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_STEREOTYPE = "PapyrusDSMLValidationRule::ValidationRule"; //$NON-NLS-1$
-	
-	/** name of property severity of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_SEVERITY_ATT = "severity"; //$NON-NLS-1$
-	
-	/** name of property mode of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_MODE_ATT = "mode"; //$NON-NLS-1$
-	
-	/** name of property isEnabledByDefault of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_ISENABLEDBYDEFAULT_ATT = "isEnabledByDefault"; //$NON-NLS-1$
-	
-	/** name of property base_Constraint of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_BASE_CONSTRAINT_ATT = "base_Constraint"; //$NON-NLS-1$
-	
-	/** name of property statusCode of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_STATUSCODE_ATT = "statusCode"; //$NON-NLS-1$
-	
-	/** name of property message of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_MESSAGE_ATT = "message"; //$NON-NLS-1$
-	
-	/** name of property description of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_DESCRIPTION_ATT = "description"; //$NON-NLS-1$
-	
-	/** name of property target of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_TARGET_ATT = "target"; //$NON-NLS-1$
-	
-	/** name of property class of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_CLASS_ATT = "class"; //$NON-NLS-1$
-	
-	/** name of property id of the stereotype ValidationRule */
-	public static final String VALIDATIONRULE_ID_ATT = "id"; //$NON-NLS-1$
-	
-	/** name of literal ERROR of the Enumeration Severity */
-	public static final String SEVERITY_ERROR_ENUM = "ERROR"; //$NON-NLS-1$
-	
-	/** name of literal WARNING of the Enumeration Severity */
-	public static final String SEVERITY_WARNING_ENUM = "WARNING"; //$NON-NLS-1$
-	
-	/** name of literal INFO of the Enumeration Severity */
-	public static final String SEVERITY_INFO_ENUM = "INFO"; //$NON-NLS-1$
-	
-	/** name of literal CANCEL of the Enumeration Severity */
-	public static final String SEVERITY_CANCEL_ENUM = "CANCEL"; //$NON-NLS-1$
-	
-	/** name of literal Batch of the Enumeration Mode */
-	public static final String MODE_BATCH_ENUM = "Batch"; //$NON-NLS-1$
-	/** name of literal Live of the Enumeration Mode */
-	
-	public static final String MODE_LIVE_ENUM = "Live"; //$NON-NLS-1$
-}
diff --git a/extraplugins/soaml/org.eclipse.papyrus.soaml.profile/META-INF/MANIFEST.MF b/extraplugins/soaml/org.eclipse.papyrus.soaml.profile/META-INF/MANIFEST.MF
index 3d9b13d4a1b..baaf2d66272 100644
--- a/extraplugins/soaml/org.eclipse.papyrus.soaml.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/soaml/org.eclipse.papyrus.soaml.profile/META-INF/MANIFEST.MF
@@ -9,9 +9,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml;visibility:=reexport,
  org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.validation,
- org.eclipse.papyrus.uml.service.validation;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.papyrus.dsml.validation;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.emf.validation,
+ org.eclipse.papyrus.uml.service.validation
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/.project b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/.project
deleted file mode 100644
index fd95970468c..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.extra.dsml.validation.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/build.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/build.properties
deleted file mode 100644
index 128baaa4d3b..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-src.includes = epl-v10.html,\
-               license.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/epl-v10.html b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/epl-v10.html
deleted file mode 100644
index cb1073a4bad..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.properties b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.properties
deleted file mode 100644
index e66ad3e57f1..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.properties
+++ /dev/null
@@ -1,138 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-# "featureName" property - name of the feature
-featureName=Papyrus DSML Validation Feature (Incubation)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project 
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.xml
deleted file mode 100644
index 61a5b0a8c15..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.dsml.validation.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2012 CEA LIST
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-   
-   <description url="https://eclipse.org/papyrus/">
-   	Feature generator that generate the code from ocl rules in the model.
-   </description>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.dsml.validation" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.dsml.validation.model" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.dsml.validation.properties" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.dsml.validation.wizard" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.dsml.validation.model.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.dsml.validation.generator" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature>
-\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/license.html b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/license.html
deleted file mode 100644
index 0fd3dd13aac..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/pom.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/pom.xml
deleted file mode 100644
index 660b2c141aa..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.extra.dsml.validation.feature</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
-</project>
-\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
index 17a457a3ab6..df41cfe3a7f 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
@@ -26,10 +26,6 @@ http://www.eclipse.org/legal/epl-v10.html
    </description>
 
    <includes
-         id="org.eclipse.papyrus.extra.dsml.validation.feature"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.papyrus.extra.eastadl.feature"
          version="0.0.0"/>
 
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
index 357e7db07eb..41f867d2905 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
@@ -21,8 +21,6 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <includes id="org.eclipse.papyrus.extra.feature" version="0.0.0"/>
 
-   <includes id="org.eclipse.papyrus.extra.dsml.validation.source.feature" version="0.0.0"/>
-
    <includes id="org.eclipse.papyrus.extra.eastadl.source.feature" version="0.0.0"/>
 
    <includes id="org.eclipse.papyrus.extra.umlrt.source.feature" version="0.0.0"/>
diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml
index 90e767a3c1e..2f5abeab579 100644
--- a/releng/extra/pom.xml
+++ b/releng/extra/pom.xml
@@ -17,18 +17,11 @@
 	
 	<modules>
 		<!-- features -->
-		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.feature</module>
 		<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.soaml.feature</module>
 		
 		<!-- plug-ins-->
-		<module>../../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation</module>
-		<module>../../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator</module>
-		<module>../../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model</module>
-		<module>../../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui</module>
-		<module>../../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties</module>
-		<module>../../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard</module>
 		<module>../../extraplugins/eastadl/org.eclipse.papyrus.eastadl</module>
 		<module>../../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable</module>
 		<module>../../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation</module>
diff --git a/releng/extra/site/category.xml b/releng/extra/site/category.xml
index d487a70a6a4..3eec39458a7 100644
--- a/releng/extra/site/category.xml
+++ b/releng/extra/site/category.xml
@@ -6,12 +6,6 @@
    <feature url="features/org.eclipse.papyrus.extra.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.feature" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.extra.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.extra.dsml.validation.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.dsml.validation.feature" version="1.2.0.qualifier">
-      <category name="org.eclipse.papyrus.extra.others.category"/>
-   </feature>
-   <feature url="features/org.eclipse.papyrus.extra.dsml.validation.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.dsml.validation.feature.source" version="1.2.0.qualifier">
-      <category name="org.eclipse.papyrus.extra.others.category"/>
-   </feature>
    <feature url="features/org.eclipse.papyrus.extra.eastadl.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.eastadl.feature" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.extra.others.category"/>
    </feature>