Bug 563395 - Remove standalone JavaScript editors from Web UI

Standalone JS Editor is finally removed. JUnit  Tests are fixed.

Change-Id: I019acd8a52e8512b315852cc43ca9d0abb48b864
Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>
diff --git a/bundles/org.eclipse.wst.jsdt.debug.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.debug.ui/META-INF/MANIFEST.MF
index e0f30a5..d0e289b 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.jsdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName.name
 Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.ui;singleton:=true
-Bundle-Version: 1.0.601.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.wst.jsdt.debug.internal.ui.JavaScriptDebugUIPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
@@ -15,7 +15,6 @@
  org.eclipse.jface.text,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.wst.jsdt.ui,
- org.eclipse.wst.jsdt.standalone.ui,
  org.eclipse.ui.editors,
  org.eclipse.core.expressions,
  org.eclipse.debug.core,
diff --git a/bundles/org.eclipse.wst.jsdt.debug.ui/pom.xml b/bundles/org.eclipse.wst.jsdt.debug.ui/pom.xml
index 6c09bd1..49be4a5 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.ui/pom.xml
+++ b/bundles/org.eclipse.wst.jsdt.debug.ui/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsdt.bundles</groupId>
   <artifactId>org.eclipse.wst.jsdt.debug.ui</artifactId>
-  <version>1.0.601-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index aafcd0f..76a500b 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -28,7 +28,6 @@
     <module>org.eclipse.wst.jsdt.support.firefox</module>
     <module>org.eclipse.wst.jsdt.support.ie</module>
     <module>org.eclipse.wst.jsdt.ui</module>
-    <module>org.eclipse.wst.jsdt.standalone.ui</module>
 
     <module>org.eclipse.wst.jsdt.debug.core</module>
     <module>org.eclipse.wst.jsdt.debug.crossfire</module>
@@ -37,7 +36,7 @@
     <module>org.eclipse.wst.jsdt.debug.rhino.ui</module>
     <module>org.eclipse.wst.jsdt.debug.transport</module>
     <module>org.eclipse.wst.jsdt.debug.ui</module>
-    
+
     <module>org.eclipse.wst.jsdt.chromium.debug</module>
     <module>org.eclipse.wst.jsdt.chromium.debug.core</module>
     <module>org.eclipse.wst.jsdt.chromium.debug.jsdtbridge</module>
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/.classpath b/development/org.eclipse.wst.jsdt.standalone.ui/.classpath
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/.classpath
rename to development/org.eclipse.wst.jsdt.standalone.ui/.classpath
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/.options b/development/org.eclipse.wst.jsdt.standalone.ui/.options
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/.options
rename to development/org.eclipse.wst.jsdt.standalone.ui/.options
diff --git a/development/org.eclipse.wst.jsdt.standalone.ui/.project b/development/org.eclipse.wst.jsdt.standalone.ui/.project
new file mode 100644
index 0000000..95d66fa
--- /dev/null
+++ b/development/org.eclipse.wst.jsdt.standalone.ui/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.wst.jsdt.standalone.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>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.core.resources.prefs b/development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.core.resources.prefs
rename to development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.core.runtime.prefs b/development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.core.runtime.prefs
rename to development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.jdt.core.prefs b/development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.jdt.core.prefs
rename to development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.jdt.ui.prefs b/development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.jdt.ui.prefs
rename to development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
rename to development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.pde.prefs b/development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.pde.prefs
rename to development/org.eclipse.wst.jsdt.standalone.ui/.settings/org.eclipse.pde.prefs
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/META-INF/MANIFEST.MF b/development/org.eclipse.wst.jsdt.standalone.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/META-INF/MANIFEST.MF
rename to development/org.eclipse.wst.jsdt.standalone.ui/META-INF/MANIFEST.MF
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/about.html b/development/org.eclipse.wst.jsdt.standalone.ui/about.html
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/about.html
rename to development/org.eclipse.wst.jsdt.standalone.ui/about.html
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/about.ini b/development/org.eclipse.wst.jsdt.standalone.ui/about.ini
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/about.ini
rename to development/org.eclipse.wst.jsdt.standalone.ui/about.ini
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/about.mappings b/development/org.eclipse.wst.jsdt.standalone.ui/about.mappings
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/about.mappings
rename to development/org.eclipse.wst.jsdt.standalone.ui/about.mappings
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/about.properties b/development/org.eclipse.wst.jsdt.standalone.ui/about.properties
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/about.properties
rename to development/org.eclipse.wst.jsdt.standalone.ui/about.properties
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/build.properties b/development/org.eclipse.wst.jsdt.standalone.ui/build.properties
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/build.properties
rename to development/org.eclipse.wst.jsdt.standalone.ui/build.properties
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/icons/WTP_icon_x32_v2.png b/development/org.eclipse.wst.jsdt.standalone.ui/icons/WTP_icon_x32_v2.png
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/icons/WTP_icon_x32_v2.png
rename to development/org.eclipse.wst.jsdt.standalone.ui/icons/WTP_icon_x32_v2.png
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/icons/full/etool16/newjprj_wiz.gif b/development/org.eclipse.wst.jsdt.standalone.ui/icons/full/etool16/newjprj_wiz.gif
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/icons/full/etool16/newjprj_wiz.gif
rename to development/org.eclipse.wst.jsdt.standalone.ui/icons/full/etool16/newjprj_wiz.gif
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/icons/full/eview16/jperspective.gif b/development/org.eclipse.wst.jsdt.standalone.ui/icons/full/eview16/jperspective.gif
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/icons/full/eview16/jperspective.gif
rename to development/org.eclipse.wst.jsdt.standalone.ui/icons/full/eview16/jperspective.gif
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/icons/full/obj16/classf_obj.gif b/development/org.eclipse.wst.jsdt.standalone.ui/icons/full/obj16/classf_obj.gif
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/icons/full/obj16/classf_obj.gif
rename to development/org.eclipse.wst.jsdt.standalone.ui/icons/full/obj16/classf_obj.gif
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/icons/full/obj16/jcu_obj.gif b/development/org.eclipse.wst.jsdt.standalone.ui/icons/full/obj16/jcu_obj.gif
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/icons/full/obj16/jcu_obj.gif
rename to development/org.eclipse.wst.jsdt.standalone.ui/icons/full/obj16/jcu_obj.gif
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/plugin.properties b/development/org.eclipse.wst.jsdt.standalone.ui/plugin.properties
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/plugin.properties
rename to development/org.eclipse.wst.jsdt.standalone.ui/plugin.properties
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/plugin.xml b/development/org.eclipse.wst.jsdt.standalone.ui/plugin.xml
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/plugin.xml
rename to development/org.eclipse.wst.jsdt.standalone.ui/plugin.xml
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/pom.xml b/development/org.eclipse.wst.jsdt.standalone.ui/pom.xml
similarity index 96%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/pom.xml
rename to development/org.eclipse.wst.jsdt.standalone.ui/pom.xml
index fc113db..4c6cf07 100644
--- a/bundles/org.eclipse.wst.jsdt.standalone.ui/pom.xml
+++ b/development/org.eclipse.wst.jsdt.standalone.ui/pom.xml
@@ -20,7 +20,7 @@
     <version>3.6.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.eclipse.webtools.jsdt.bundles</groupId>
+  <groupId>org.eclipse.webtools.jsdt.development</groupId>
   <artifactId>org.eclipse.wst.jsdt.standalone.ui</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.wst.jsdt.standalone.ui/src/org/eclipse/wst/jsdt/internal/standalone/ui/JavaScriptStandalonePlugin.java b/development/org.eclipse.wst.jsdt.standalone.ui/src/org/eclipse/wst/jsdt/internal/standalone/ui/JavaScriptStandalonePlugin.java
similarity index 100%
rename from bundles/org.eclipse.wst.jsdt.standalone.ui/src/org/eclipse/wst/jsdt/internal/standalone/ui/JavaScriptStandalonePlugin.java
rename to development/org.eclipse.wst.jsdt.standalone.ui/src/org/eclipse/wst/jsdt/internal/standalone/ui/JavaScriptStandalonePlugin.java
diff --git a/development/pom.xml b/development/pom.xml
index 715f869..b399c99 100644
--- a/development/pom.xml
+++ b/development/pom.xml
@@ -29,5 +29,6 @@
     <module>org.eclipse.wst.jsdt.debug.jsd2</module>
     <module>org.eclipse.wst.jsdt.debug.node</module>
     <module>org.eclipse.wst.jsdt.debug.opera</module>
+    <module>org.eclipse.wst.jsdt.standalone.ui</module>
   </modules>
 </project>
diff --git a/features/org.eclipse.wst.jsdt.feature/feature.xml b/features/org.eclipse.wst.jsdt.feature/feature.xml
index b368244..e0a374a 100644
--- a/features/org.eclipse.wst.jsdt.feature/feature.xml
+++ b/features/org.eclipse.wst.jsdt.feature/feature.xml
@@ -42,13 +42,6 @@
          unpack="false"/>

 

    <plugin

-         id="org.eclipse.wst.jsdt.standalone.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

          id="org.eclipse.wst.jsdt.support.firefox"

          download-size="0"

          install-size="0"

diff --git a/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml b/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml
index 1d6aabe..b574f46 100644
--- a/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.jsdt_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.wst.jsdt_sdk.feature"

       label="%featureName"

-      version="2.1.6.qualifier"

+      version="2.3.0.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml b/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml
index ccef726..8103cde 100644
--- a/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.jsdt_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsdt.features</groupId>
   <artifactId>org.eclipse.wst.jsdt_sdk.feature</artifactId>
-  <version>2.1.6-SNAPSHOT</version>
+  <version>2.3.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/feature.xml b/features/org.eclipse.wst.jsdt_tests.feature/feature.xml
index 00f95b4..66f71f2 100644
--- a/features/org.eclipse.wst.jsdt_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.jsdt_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.wst.jsdt_tests.feature"

       label="%featureName"

-      version="2.1.4.qualifier"

+      version="2.2.0.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/features/org.eclipse.wst.jsdt_tests.feature/pom.xml b/features/org.eclipse.wst.jsdt_tests.feature/pom.xml
index a71ffd0..d16b66e 100644
--- a/features/org.eclipse.wst.jsdt_tests.feature/pom.xml
+++ b/features/org.eclipse.wst.jsdt_tests.feature/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsdt.features</groupId>
   <artifactId>org.eclipse.wst.jsdt_tests.feature</artifactId>
-  <version>2.1.4-SNAPSHOT</version>
+  <version>2.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF
index f923451..a8e1e49 100644
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.jsdt.debug.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.core.tests;singleton:=true
-Bundle-Version: 1.0.401.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.wst.debug.core.tests.JSDTDebugTestPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
@@ -15,6 +15,7 @@
  org.eclipse.wst.jsdt.core,
  org.eclipse.core.resources,
  org.eclipse.debug.core,
+ org.eclipse.wst.jsdt.ui,
  org.eclipse.wst.jsdt.debug.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.wst.jsdt.debug.core.tests/OSGI-INF/l10n/bundle.properties
index 6956b33..313af26 100644
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/OSGI-INF/l10n/bundle.properties
+++ b/tests/org.eclipse.wst.jsdt.debug.core.tests/OSGI-INF/l10n/bundle.properties
@@ -9,4 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 Bundle-Vendor = Eclipse Web Tools Platform
-Bundle-Name = JavaScript Debug Core Tests
\ No newline at end of file
+Bundle-Name = JavaScript Debug Core Tests
+
+CompilationUnitEditorName= JavaScript Editor
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties b/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties
index 1a8e76e..b7860b0 100644
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties
+++ b/tests/org.eclipse.wst.jsdt.debug.core.tests/build.properties
@@ -14,6 +14,8 @@
 src.excludes = src
 bin.includes = META-INF/,\
                .,\
+               plugin.properties,\
+               plugin.xml,\
                OSGI-INF/l10n/bundle.properties,\
                about.html,\
                test.xml,\
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/plugin.properties b/tests/org.eclipse.wst.jsdt.debug.core.tests/plugin.properties
new file mode 100644
index 0000000..8d4c470
--- /dev/null
+++ b/tests/org.eclipse.wst.jsdt.debug.core.tests/plugin.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2007, 2010 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
+#
+# Messages in plugin.xml.
+#
+pluginName=JSDT UI Tests
+providerName=Eclipse Web Tools Platform
+packagesViewName= Script Explorer
+
+CompilationUnitEditorName= JavaScript Editor
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/plugin.xml b/tests/org.eclipse.wst.jsdt.debug.core.tests/plugin.xml
new file mode 100644
index 0000000..28ee0fd
--- /dev/null
+++ b/tests/org.eclipse.wst.jsdt.debug.core.tests/plugin.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension
+         id="javaeditor"
+         point="org.eclipse.ui.editors">
+      <editor
+            name="%CompilationUnitEditorName"
+            default="false"
+            icon="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/obj16/jcu_obj.gif"
+            contributorClass="org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditorActionContributor"
+            class="org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditor"
+            symbolicFontName="org.eclipse.wst.jsdt.ui.editors.textfont"
+            id="org.eclipse.wst.jsdt.ui.CompilationUnitEditor"
+            extensions="js">
+            <contentTypeBinding contentTypeId="org.eclipse.wst.jsdt.core.jsSource" /> 
+      </editor>
+   </extension>
+</plugin>
+
diff --git a/tests/org.eclipse.wst.jsdt.debug.core.tests/pom.xml b/tests/org.eclipse.wst.jsdt.debug.core.tests/pom.xml
index 0fc2fcd..02a5b14 100644
--- a/tests/org.eclipse.wst.jsdt.debug.core.tests/pom.xml
+++ b/tests/org.eclipse.wst.jsdt.debug.core.tests/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.jsdt.tests</groupId>
   <artifactId>org.eclipse.wst.jsdt.debug.core.tests</artifactId>
-  <version>1.0.401-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
   <properties>
diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.ui.tests/META-INF/MANIFEST.MF
index edc8694..95da509 100644
--- a/tests/org.eclipse.wst.jsdt.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.jsdt.ui.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.jsdt.ui.tests; singleton:=true
-Bundle-Version: 1.1.700.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.wst.jsdt.core,
  org.eclipse.wst.jsdt.ui,
- org.eclipse.wst.jsdt.standalone.ui,
  org.eclipse.ui.editors,
  org.eclipse.jface,
  org.eclipse.jface.text,
diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/plugin.properties b/tests/org.eclipse.wst.jsdt.ui.tests/plugin.properties
index ba0326c..f4f0eb9 100644
--- a/tests/org.eclipse.wst.jsdt.ui.tests/plugin.properties
+++ b/tests/org.eclipse.wst.jsdt.ui.tests/plugin.properties
@@ -15,3 +15,5 @@
 pluginName=JSDT UI Tests

 providerName=Eclipse Web Tools Platform

 packagesViewName= Script Explorer

+

+CompilationUnitEditorName= JavaScript Editor
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/plugin.xml b/tests/org.eclipse.wst.jsdt.ui.tests/plugin.xml
index dbb1a3a..a9fac30 100644
--- a/tests/org.eclipse.wst.jsdt.ui.tests/plugin.xml
+++ b/tests/org.eclipse.wst.jsdt.ui.tests/plugin.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?eclipse version="3.0"?>

 <plugin>

+   <extension

+         id="javaeditor"

+         point="org.eclipse.ui.editors">

+      <editor

+            name="%CompilationUnitEditorName"

+            default="false"

+            icon="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/obj16/jcu_obj.gif"

+            contributorClass="org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditorActionContributor"

+            class="org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditor"

+            symbolicFontName="org.eclipse.wst.jsdt.ui.editors.textfont"

+            id="org.eclipse.wst.jsdt.ui.CompilationUnitEditor"

+            extensions="js">

+            <contentTypeBinding contentTypeId="org.eclipse.wst.jsdt.core.jsSource" /> 

+      </editor>

+   </extension>

 </plugin>

 

diff --git a/tests/org.eclipse.wst.jsdt.ui.tests/pom.xml b/tests/org.eclipse.wst.jsdt.ui.tests/pom.xml
index f2e0953..0755a78 100644
--- a/tests/org.eclipse.wst.jsdt.ui.tests/pom.xml
+++ b/tests/org.eclipse.wst.jsdt.ui.tests/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.jsdt.tests</groupId>
   <artifactId>org.eclipse.wst.jsdt.ui.tests</artifactId>
-  <version>1.1.700-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>