Bug 553487: [Jython] merge jython and jython.debug plugin

Change-Id: I01b09fd28b8dcb491468123d9f577c76913f4a7f
diff --git a/features/org.eclipse.ease.lang.python.jython.feature/feature.xml b/features/org.eclipse.ease.lang.python.jython.feature/feature.xml
index 1238a92..e4bfa87 100644
--- a/features/org.eclipse.ease.lang.python.jython.feature/feature.xml
+++ b/features/org.eclipse.ease.lang.python.jython.feature/feature.xml
@@ -37,11 +37,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ease.lang.python.jython.debugger"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/plugins/org.eclipse.ease.help/build.properties b/plugins/org.eclipse.ease.help/build.properties
index 9422389..daba533 100644
--- a/plugins/org.eclipse.ease.help/build.properties
+++ b/plugins/org.eclipse.ease.help/build.properties
@@ -5,6 +5,7 @@
 
 # for javadoc API generation.
 jars.extra.classpath = platform:/plugin/org.eclipse.ease,\
+						platform:/plugin/org.eclipse.ease.classloader,\
 						platform:/plugin/org.eclipse.ease.ui,\
 						platform:/plugin/org.eclipse.ease.ui.scripts,\
 						platform:/plugin/org.eclipse.ease.lang.javascript,\
@@ -15,7 +16,6 @@
 						platform:/plugin/org.eclipse.ease.lang.jvm.compiled,\
 						platform:/plugin/org.eclipse.ease.lang.python,\
 						platform:/plugin/org.eclipse.ease.lang.python.jython,\
-						platform:/plugin/org.eclipse.ease.lang.python.jython.debugger,\
 						platform:/plugin/org.eclipse.ease.lang.python.py4j,\
 						platform:/plugin/org.eclipse.ease.lang.groovy,\
 						platform:/plugin/org.eclipse.ease.lang.groovy.interpreter,\
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/.classpath b/plugins/org.eclipse.ease.lang.python.jython.debugger/.classpath
deleted file mode 100644
index cb8e90e..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/.classpath
+++ /dev/null
@@ -1,11 +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/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/core/internal/resources/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/.project b/plugins/org.eclipse.ease.lang.python.jython.debugger/.project
deleted file mode 100644
index 3457052..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ease.lang.python.jython.debugger</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/.pydevproject b/plugins/org.eclipse.ease.lang.python.jython.debugger/.pydevproject
deleted file mode 100644
index 40e9f40..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/.pydevproject
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-</pydev_project>
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.ease.lang.python.jython.debugger/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.ease.lang.python.jython.debugger/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 64e8545..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,325 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=f
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
-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_expressions_in_for_loop_header=0
-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_parameterized_type_references=0
-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_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
-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=160
-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_enum_constant=insert
-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=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=160
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.ease.lang.python.jython.debugger/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4aea3c1..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,130 +0,0 @@
-cleanup.add_default_serial_version_id=false
-cleanup.add_generated_serial_version_id=true
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=true
-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=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=false
-cleanup.make_parameters_final=true
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=false
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_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=false
-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=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_EASE Development
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Eclipse EASE Development
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-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.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="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\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\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} ${user} and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     ${user} - initial API and implementation\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\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\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\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} handle this exception (but for now, at least know it happened)\nthrow new RuntimeException(${exception_var});\n</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>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=true
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=true
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=false
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_type_arguments=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=true
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/META-INF/MANIFEST.MF b/plugins/org.eclipse.ease.lang.python.jython.debugger/META-INF/MANIFEST.MF
deleted file mode 100644
index e259e45..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Jython Debugger Support
-Bundle-SymbolicName: org.eclipse.ease.lang.python.jython.debugger;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.debug.core;bundle-version="[3.7.1,4.0.0)",
- org.jython;bundle-version="[2.5.3,3.0.0)",
- org.eclipse.ease,
- org.eclipse.ease.lang.python.jython,
- org.eclipse.ease.lang.python
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ease.lang.python.jython.debugger
-Automatic-Module-Name: org.eclipse.ease.lang.python.jython.debugger
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/about.html b/plugins/org.eclipse.ease.lang.python.jython.debugger/about.html
deleted file mode 100644
index 612454c..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/about.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>org.eclipse.e4.tools.git - </title>
-<meta name='generator' content='cgit v0.8.3.4-115-g1759'/>
-<meta name='robots' content='index, nofollow'/>
-<link rel='stylesheet' type='text/css' href=''/>
-<link rel='shortcut icon' href='/favicon.ico'/>
-<link rel='alternate' title='Atom feed' href='http://git.eclipse.org/c/e4/org.eclipse.e4.tools.git/atom/bundles/org.eclipse.e4.tools.compat/about.html?h=master' type='application/atom+xml'/>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Nova/css/layout.css" media="screen" />
-<link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Nova/css/header.css" media="screen" />
-<link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Nova/css/footer.css" media="screen" />
-<link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Nova/css/visual.css" media="screen" /> 
-<link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Nova/css/novaWide.css" media="screen" />
-<link rel="stylesheet" type="text/css" href="/cgit.css" media="screen" />
-
-<!--[if IE]>    <link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Nova/css/ie_style.css" media="screen"/> <![endif]-->
-<!--[if IE 6]>  <link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Nova/css/ie6_style.css" media="screen"/> <![endif]-->
-</head>
-<body>
-<div id="novaWrapper"><div id="clearHeader">
-<div id="logo"><img src="/eclipse.org-common/themes/Nova/images/eclipse.png" alt="Eclipse.org"/></div>
-<div id="otherSites"><div id="sites"><ul id="sitesUL"><li><a href='http://marketplace.eclipse.org/'><img alt="Eclipse Marketplace" src="//dev.eclipse.org/custom_icons/network-wired-bw.png"/>&nbsp;<div>Eclipse Marketplace</div></a></li>
-<li><a href='http://live.eclipse.org'><img alt="Eclipse Live" src="//dev.eclipse.org/custom_icons/audio-input-microphone-bw.png"/>&nbsp;<div>Eclipse Live</div></a></li>
-<li><a href='https://bugs.eclipse.org/bugs/'><img alt="Bugzilla" src="//dev.eclipse.org/custom_icons/system-search-bw.png"/>&nbsp;<div>Bugzilla</div></a></li>
-<li><a href='http://www.planeteclipse.org/'><img alt="Planet Eclipse" src="//dev.eclipse.org/large_icons/devices/audio-card.png"/>&nbsp;<div>Planet Eclipse</div></a></li>
-<li><a href='http://wiki.eclipse.org/'><img alt="Eclipse Wiki" src="//dev.eclipse.org/custom_icons/accessories-text-editor-bw.png"/>&nbsp;<div>Eclipse Wiki</div></a></li>
-<li><a href='http://portal.eclipse.org'><img alt="MyFoundation Portal" src="//dev.eclipse.org/custom_icons/preferences-system-network-proxy-bw.png"/><div>My Foundation Portal</div></a></li></ul></div></div></div>
-<div id="header"><div id="menu"><ul>
-<li><a href="http://www.eclipse.org/">Eclipse Home</a></li> 
-<li><a href="http://www.eclipse.org/users/">Users</a></li> 
-<li><a href="http://www.eclipse.org/membership/">Members</a></li> 
-<li><a href="http://www.eclipse.org/committers/">Committers</a></li> 
-<li><a href="http://www.eclipse.org/downloads/">Downloads</a></li> 
-<li><a href="http://www.eclipse.org/resources/">Resources</a></li> 
-<li><a href="http://www.eclipse.org/projects/">Projects</a></li> 
-<li><a href="http://www.eclipse.org/org/">About Us</a></li> 
-</ul></div>
-<div id="search">
-<form action="http://www.google.com/cse" id="searchbox_017941334893793413703:sqfrdtd112s">
-<input type="hidden" name="cx" value="017941334893793413703:sqfrdtd112s" />
-<input id="searchBox" type="text" name="q" size="25" />
-<input id="searchButton" type="submit" name="sa" value="Search" />
-</form>
-<script type="text/javascript" src="//www.google.com/coop/cse/brand?form=searchbox_017941334893793413703%3Asqfrdtd112s&lang=en"></script>
-</div></div><div id="novaContent">
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/c/'><img src='/git.png' alt='cgit logo'/></a></td>
-<td class='main'><a href='/c/'>index</a> : <a title='org.eclipse.e4.tools.git' href='/c/e4/org.eclipse.e4.tools.git/'>org.eclipse.e4.tools.git</a></td><td class='form'><form method='get' action=''>
-<select name='h' onchange='this.form.submit();'>
-<option value='R4_1_maintenance'>R4_1_maintenance</option>
-<option value='change/16620/3'>change/16620/3</option>
-<option value='integration'>integration</option>
-<option value='interm_rc2'>interm_rc2</option>
-<option value='intermediate_rc2'>intermediate_rc2</option>
-<option value='master' selected='selected'>master</option>
-<option value='model_tweaking_round3'>model_tweaking_round3</option>
-<option value='post_40_release'>post_40_release</option>
-<option value='post_m5'>post_m5</option>
-<option value='pwebster/start_421'>pwebster/start_421</option>
-<option value='smcela/393150'>smcela/393150</option>
-<option value='smcela/HandlerAddonUpdates'>smcela/HandlerAddonUpdates</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'></td><td class='sub right'>Paul Webster</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/c/e4/org.eclipse.e4.tools.git/'>summary</a><a href='/c/e4/org.eclipse.e4.tools.git/refs/'>refs</a><a href='/c/e4/org.eclipse.e4.tools.git/log/bundles/org.eclipse.e4.tools.compat/about.html'>log</a><a class='active' href='/c/e4/org.eclipse.e4.tools.git/tree/bundles/org.eclipse.e4.tools.compat/about.html'>tree</a><a href='/c/e4/org.eclipse.e4.tools.git/commit/bundles/org.eclipse.e4.tools.compat/about.html'>commit</a><a href='/c/e4/org.eclipse.e4.tools.git/diff/bundles/org.eclipse.e4.tools.compat/about.html'>diff</a><a href='/c/e4/org.eclipse.e4.tools.git/stats/bundles/org.eclipse.e4.tools.compat/about.html'>stats</a></td><td class='form'><form class='right' method='get' action='/c/e4/org.eclipse.e4.tools.git/log/bundles/org.eclipse.e4.tools.compat/about.html'>
-<select name='qt'>
-<option value='grep'>log msg</option>
-<option value='author'>author</option>
-<option value='committer'>committer</option>
-<option value='range'>range</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input type='submit' value='search'/>
-</form>
-</td></tr></table>
-<div class='path'>path: <a href='/c/e4/org.eclipse.e4.tools.git/tree/'>root</a>/<a href='/c/e4/org.eclipse.e4.tools.git/tree/bundles'>bundles</a>/<a href='/c/e4/org.eclipse.e4.tools.git/tree/bundles/org.eclipse.e4.tools.compat'>org.eclipse.e4.tools.compat</a>/<a href='/c/e4/org.eclipse.e4.tools.git/tree/bundles/org.eclipse.e4.tools.compat/about.html'>about.html</a></div><div class='content'>blob: 824948673da06a22e505360b9283ab86d073d6c3 (<a href='/c/e4/org.eclipse.e4.tools.git/plain/bundles/org.eclipse.e4.tools.compat/about.html'>plain</a>)
-<table summary='blob content' class='blob'>
-<tr><td class='linenumbers'><pre><a class='no' id='n1' name='n1' href='#n1'>1</a>
-<a class='no' id='n2' name='n2' href='#n2'>2</a>
-<a class='no' id='n3' name='n3' href='#n3'>3</a>
-<a class='no' id='n4' name='n4' href='#n4'>4</a>
-<a class='no' id='n5' name='n5' href='#n5'>5</a>
-<a class='no' id='n6' name='n6' href='#n6'>6</a>
-<a class='no' id='n7' name='n7' href='#n7'>7</a>
-<a class='no' id='n8' name='n8' href='#n8'>8</a>
-<a class='no' id='n9' name='n9' href='#n9'>9</a>
-<a class='no' id='n10' name='n10' href='#n10'>10</a>
-<a class='no' id='n11' name='n11' href='#n11'>11</a>
-<a class='no' id='n12' name='n12' href='#n12'>12</a>
-<a class='no' id='n13' name='n13' href='#n13'>13</a>
-<a class='no' id='n14' name='n14' href='#n14'>14</a>
-<a class='no' id='n15' name='n15' href='#n15'>15</a>
-<a class='no' id='n16' name='n16' href='#n16'>16</a>
-<a class='no' id='n17' name='n17' href='#n17'>17</a>
-<a class='no' id='n18' name='n18' href='#n18'>18</a>
-<a class='no' id='n19' name='n19' href='#n19'>19</a>
-<a class='no' id='n20' name='n20' href='#n20'>20</a>
-<a class='no' id='n21' name='n21' href='#n21'>21</a>
-<a class='no' id='n22' name='n22' href='#n22'>22</a>
-<a class='no' id='n23' name='n23' href='#n23'>23</a>
-<a class='no' id='n24' name='n24' href='#n24'>24</a>
-<a class='no' id='n25' name='n25' href='#n25'>25</a>
-<a class='no' id='n26' name='n26' href='#n26'>26</a>
-<a class='no' id='n27' name='n27' href='#n27'>27</a>
-<a class='no' id='n28' name='n28' href='#n28'>28</a>
-</pre></td>
-<td class='lines'><pre><code>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;
-&lt;html xmlns="http://www.w3.org/1999/xhtml"&gt;
-&lt;head&gt;
-&lt;meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/&gt;
-&lt;title&gt;About&lt;/title&gt;
-&lt;/head&gt;
-&lt;body lang="EN-US"&gt;
-&lt;h2&gt;About This Content&lt;/h2&gt;
- 
-&lt;p&gt;December 3, 2009&lt;/p&gt;	
-&lt;h3&gt;License&lt;/h3&gt;
-
-&lt;p&gt;The Eclipse Foundation makes available all content in this plug-in (&amp;quot;Content&amp;quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&amp;quot;EPL&amp;quot;).  A copy of the EPL is available 
-at &lt;a href="https://www.eclipse.org/legal/epl-2.0/"&gt;https://www.eclipse.org/legal/epl-2.0/&lt;/a&gt;.
-For purposes of the EPL, &amp;quot;Program&amp;quot; will mean the Content.&lt;/p&gt;
-
-&lt;p&gt;If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&amp;quot;Redistributor&amp;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 &lt;a href="http://www.eclipse.org"&gt;http://www.eclipse.org&lt;/a&gt;.&lt;/p&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;</code></pre></td></tr></table>
-</div> <!-- class=content -->
-</div><br style="clear:both;height:1em;"/>&nbsp;</div><div id="clearFooter"></div><div id="footer"><ul id="footernav"><li><a href="http://www.eclipse.org/">Eclipse Home</a></li><li><a href="http://www.eclipse.org/legal/privacy.php">Privacy Policy</a></li><li><a href="http://www.eclipse.org/legal/termsofuse.php">Terms of Use</a></li><li><a href="http://www.eclipse.org/legal/">Legal</a></li><li><a href="http://www.eclipse.org/org/foundation/contact.php">Contact Us</a></li></ul><span id="copyright">Copyright &copy; 2009-2010 The Eclipse Foundation. All Rights Reserved.</span></div></div>	
-
-</div> <!-- id=cgit -->
-</body>
-</html>
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/build.properties b/plugins/org.eclipse.ease.lang.python.jython.debugger/build.properties
deleted file mode 100644
index 4c63aa0..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/plugin.xml b/plugins/org.eclipse.ease.lang.python.jython.debugger/plugin.xml
deleted file mode 100644
index d924aa3..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ease.language">
-      <engine
-            class="org.eclipse.ease.lang.python.jython.debugger.JythonDebuggerEngine"
-            debugger="true"
-            id="org.eclipse.ease.python.jythonDebugger"
-            name="Python (Jython Debugger)"
-            priority="1">
-         <binding
-               scriptType="Python">
-         </binding>
-      </engine>
-      <moduleWrapper
-            class="org.eclipse.ease.lang.python.jython.PythonModuleWrapper"
-            engineID="org.eclipse.ease.python.jythonDebugger">
-      </moduleWrapper>
-      <launchExtension
-            class="org.eclipse.ease.lang.python.jython.PythonEnvironementBootStrapper"
-            engineID="org.eclipse.ease.python.jythonDebugger">
-      </launchExtension>
-   </extension>
-</plugin>
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/pom.xml b/plugins/org.eclipse.ease.lang.python.jython.debugger/pom.xml
deleted file mode 100644
index ca54635..0000000
--- a/plugins/org.eclipse.ease.lang.python.jython.debugger/pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.eclipse.ease.lang.python.jython.debugger</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <parent>
-  	<groupId>org.eclipse.ease</groupId>
-  	<artifactId>org.eclipse.ease.releng</artifactId>
-  	<version>0.8.0-SNAPSHOT</version>
-  	<relativePath>../../releng/org.eclipse.ease.releng</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.ease.lang.python.jython/plugin.xml b/plugins/org.eclipse.ease.lang.python.jython/plugin.xml
index 1454f92..af66dc6 100644
--- a/plugins/org.eclipse.ease.lang.python.jython/plugin.xml
+++ b/plugins/org.eclipse.ease.lang.python.jython/plugin.xml
@@ -16,6 +16,20 @@
             class="org.eclipse.ease.lang.python.jython.PythonEnvironementBootStrapper"

             engineID="org.eclipse.ease.python.jython">

       </launchExtension>

+            <engine

+                  class="org.eclipse.ease.lang.python.jython.debugger.JythonDebuggerEngine"

+                  debugger="true"

+                  id="org.eclipse.ease.python.jythonDebugger"

+                  name="Python (Jython Debugger)"

+                  priority="1">

+               <binding

+                     scriptType="Python">

+               </binding>

+            </engine>

+            <launchExtension

+                  class="org.eclipse.ease.lang.python.jython.PythonEnvironementBootStrapper"

+                  engineID="org.eclipse.ease.python.jythonDebugger">

+            </launchExtension>

    </extension>

  <extension

        point="org.eclipse.ui.preferencePages">

diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/src/org/eclipse/ease/lang/python/jython/debugger/JythonCodeTracer.java b/plugins/org.eclipse.ease.lang.python.jython/src/org/eclipse/ease/lang/python/jython/debugger/JythonCodeTracer.java
similarity index 100%
rename from plugins/org.eclipse.ease.lang.python.jython.debugger/src/org/eclipse/ease/lang/python/jython/debugger/JythonCodeTracer.java
rename to plugins/org.eclipse.ease.lang.python.jython/src/org/eclipse/ease/lang/python/jython/debugger/JythonCodeTracer.java
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugger.java b/plugins/org.eclipse.ease.lang.python.jython/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugger.java
similarity index 100%
rename from plugins/org.eclipse.ease.lang.python.jython.debugger/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugger.java
rename to plugins/org.eclipse.ease.lang.python.jython/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugger.java
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebuggerEngine.java b/plugins/org.eclipse.ease.lang.python.jython/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebuggerEngine.java
similarity index 100%
rename from plugins/org.eclipse.ease.lang.python.jython.debugger/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebuggerEngine.java
rename to plugins/org.eclipse.ease.lang.python.jython/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebuggerEngine.java
diff --git a/plugins/org.eclipse.ease.lang.python.jython.debugger/src/org/eclipse/ease/lang/python/jython/debugger/JythonFrame.java b/plugins/org.eclipse.ease.lang.python.jython/src/org/eclipse/ease/lang/python/jython/debugger/JythonFrame.java
similarity index 100%
rename from plugins/org.eclipse.ease.lang.python.jython.debugger/src/org/eclipse/ease/lang/python/jython/debugger/JythonFrame.java
rename to plugins/org.eclipse.ease.lang.python.jython/src/org/eclipse/ease/lang/python/jython/debugger/JythonFrame.java
diff --git a/releng/org.eclipse.ease.releng/pom.xml b/releng/org.eclipse.ease.releng/pom.xml
index 209da85..f8a88d2 100644
--- a/releng/org.eclipse.ease.releng/pom.xml
+++ b/releng/org.eclipse.ease.releng/pom.xml
@@ -192,7 +192,6 @@
 		<module>../../plugins/org.eclipse.ease.lang.python</module>
 		<module>../../features/org.eclipse.ease.lang.python.feature</module>
 		<module>../../plugins/org.eclipse.ease.lang.python.jython</module>
-		<module>../../plugins/org.eclipse.ease.lang.python.jython.debugger</module>
 		<module>../../features/org.eclipse.ease.lang.python.jython.feature</module>
 		<module>../../plugins/org.eclipse.ease.lang.python.py4j</module>
 		<module>../../features/org.eclipse.ease.lang.python.py4j.feature</module>
@@ -233,7 +232,7 @@
 		<module>../../tests/org.eclipse.ease.lang.javascript.rhino.debugger.test</module>
 		<module>../../tests/org.eclipse.ease.lang.javascript.test</module>
 		<module>../../tests/org.eclipse.ease.lang.python.test</module>
-		<module>../../tests/org.eclipse.ease.lang.python.jython.debugger.test</module>
+		<module>../../tests/org.eclipse.ease.lang.python.jython.test</module>
 		<module>../../tests/org.eclipse.ease.lang.python.py4j.test</module>
 		<module>../../tests/org.eclipse.ease.lang.scriptarchive.test</module>
 		<module>../../tests/org.eclipse.ease.lang.unittest.test</module>
diff --git a/releng/org.eclipse.ease.releng/target-tests-pom.xml b/releng/org.eclipse.ease.releng/target-tests-pom.xml
index 5721bb4..b6da321 100644
--- a/releng/org.eclipse.ease.releng/target-tests-pom.xml
+++ b/releng/org.eclipse.ease.releng/target-tests-pom.xml
@@ -67,7 +67,7 @@
 		<module>../../tests/org.eclipse.ease.lang.javascript.rhino.debugger.test</module>
 		<module>../../tests/org.eclipse.ease.lang.javascript.test</module>
 		<module>../../tests/org.eclipse.ease.lang.python.test</module>
-		<module>../../tests/org.eclipse.ease.lang.python.jython.debugger.test</module>
+		<module>../../tests/org.eclipse.ease.lang.python.jython.test</module>
 		<module>../../tests/org.eclipse.ease.lang.python.py4j.test</module>
 		<module>../../tests/org.eclipse.ease.lang.scriptarchive.test</module>
 		<module>../../tests/org.eclipse.ease.ui.test</module>
diff --git a/tests/org.eclipse.ease.lang.python.jython.debugger.test/META-INF/MANIFEST.MF b/tests/org.eclipse.ease.lang.python.jython.debugger.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 1777bbb..0000000
--- a/tests/org.eclipse.ease.lang.python.jython.debugger.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Jython Debugger Test
-Bundle-SymbolicName: org.eclipse.ease.lang.python.jython.debugger.test
-Bundle-Version: 0.8.0.qualifier
-Fragment-Host: org.eclipse.ease.lang.python.jython.debugger
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.ease.testhelper,
- org.junit;bundle-version="[4.11.0,5.0.0)",
- org.mockito;bundle-version="1.9.5",
- org.hamcrest;bundle-version="1.1.0"
-Automatic-Module-Name: org.eclipse.ease.lang.python.jython.debugger.test
diff --git a/tests/org.eclipse.ease.lang.python.jython.debugger.test/.classpath b/tests/org.eclipse.ease.lang.python.jython.test/.classpath
similarity index 71%
rename from tests/org.eclipse.ease.lang.python.jython.debugger.test/.classpath
rename to tests/org.eclipse.ease.lang.python.jython.test/.classpath
index eca7bdb..3e5654f 100644
--- a/tests/org.eclipse.ease.lang.python.jython.debugger.test/.classpath
+++ b/tests/org.eclipse.ease.lang.python.jython.test/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.ease.lang.python.jython.debugger.test/.project b/tests/org.eclipse.ease.lang.python.jython.test/.project
similarity index 90%
rename from tests/org.eclipse.ease.lang.python.jython.debugger.test/.project
rename to tests/org.eclipse.ease.lang.python.jython.test/.project
index b84a607..63ae506 100644
--- a/tests/org.eclipse.ease.lang.python.jython.debugger.test/.project
+++ b/tests/org.eclipse.ease.lang.python.jython.test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.ease.lang.python.jython.debugger.test</name>
+	<name>org.eclipse.ease.lang.python.jython.test</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/org.eclipse.ease.lang.python.jython.debugger.test/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.ease.lang.python.jython.test/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from tests/org.eclipse.ease.lang.python.jython.debugger.test/.settings/org.eclipse.core.resources.prefs
rename to tests/org.eclipse.ease.lang.python.jython.test/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/org.eclipse.ease.lang.python.jython.debugger.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ease.lang.python.jython.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tests/org.eclipse.ease.lang.python.jython.debugger.test/.settings/org.eclipse.jdt.core.prefs
rename to tests/org.eclipse.ease.lang.python.jython.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.ease.lang.python.jython.debugger.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.ease.lang.python.jython.test/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tests/org.eclipse.ease.lang.python.jython.debugger.test/.settings/org.eclipse.jdt.ui.prefs
rename to tests/org.eclipse.ease.lang.python.jython.test/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/org.eclipse.ease.lang.python.jython.test/META-INF/MANIFEST.MF b/tests/org.eclipse.ease.lang.python.jython.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..90b0f92
--- /dev/null
+++ b/tests/org.eclipse.ease.lang.python.jython.test/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jython Engine Tests
+Bundle-SymbolicName: org.eclipse.ease.lang.python.jython.test
+Bundle-Version: 0.8.0.qualifier
+Fragment-Host: org.eclipse.ease.lang.python.jython;bundle-version="0.8.0"
+Automatic-Module-Name: org.eclipse.ease.lang.python.jython.test
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.ease.testhelper
diff --git a/tests/org.eclipse.ease.lang.python.jython.debugger.test/build.properties b/tests/org.eclipse.ease.lang.python.jython.test/build.properties
similarity index 100%
rename from tests/org.eclipse.ease.lang.python.jython.debugger.test/build.properties
rename to tests/org.eclipse.ease.lang.python.jython.test/build.properties
diff --git a/tests/org.eclipse.ease.lang.python.jython.debugger.test/pom.xml b/tests/org.eclipse.ease.lang.python.jython.test/pom.xml
similarity index 69%
rename from tests/org.eclipse.ease.lang.python.jython.debugger.test/pom.xml
rename to tests/org.eclipse.ease.lang.python.jython.test/pom.xml
index cf6dde9..49c5533 100644
--- a/tests/org.eclipse.ease.lang.python.jython.debugger.test/pom.xml
+++ b/tests/org.eclipse.ease.lang.python.jython.test/pom.xml
@@ -1,8 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.ease.lang.python.jython.debugger.test</artifactId>
+	<artifactId>org.eclipse.ease.lang.python.jython.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<parent>
 		<groupId>org.eclipse.ease</groupId>
diff --git a/tests/org.eclipse.ease.lang.python.jython.debugger.test/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugTest.java b/tests/org.eclipse.ease.lang.python.jython.test/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugTest.java
similarity index 100%
rename from tests/org.eclipse.ease.lang.python.jython.debugger.test/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugTest.java
rename to tests/org.eclipse.ease.lang.python.jython.test/src/org/eclipse/ease/lang/python/jython/debugger/JythonDebugTest.java