Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2013-11-08 04:39:15 -0500
committerFlorian Waibel2013-11-08 04:39:15 -0500
commit30460ed1a2a01ea944cdfa0401d32b4e888257cb (patch)
tree5cdfdb4a5b55c040ce40789e38a6d07f13e4574f /org.eclipse.virgo.management.console
parent11d5c9a252e8b7c1b935604536be6618d1dfb168 (diff)
downloadorg.eclipse.virgo.kernel-30460ed1a2a01ea944cdfa0401d32b4e888257cb.tar.gz
org.eclipse.virgo.kernel-30460ed1a2a01ea944cdfa0401d32b4e888257cb.tar.xz
org.eclipse.virgo.kernel-30460ed1a2a01ea944cdfa0401d32b4e888257cb.zip
Bug 390017 - Replaces JDK Rhino with org.mozilla.javascript from Orbit for kernel javascript tests.
Diffstat (limited to 'org.eclipse.virgo.management.console')
-rw-r--r--org.eclipse.virgo.management.console/.classpath1
-rw-r--r--org.eclipse.virgo.management.console/ivy.xml1
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/js/artifacts.js7
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/js/dumps.js2
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/js/repositories.js2
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js2
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/AbstractJSTests.java10
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ArtifactsJSTests.java162
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/BundlesGuiJSTests.java10
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/CommonJSTests.java6
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationsJSTests.java6
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/DumpsJSTests.java6
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/LoggingJSTests.java6
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/OverviewJSTests.java6
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/RepositoriesJSTests.java8
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/WiringsJSTests.java6
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Dollar.java8
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java8
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Window.java2
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Element.java6
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/ParentStub.java2
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Server.java2
-rw-r--r--org.eclipse.virgo.management.console/template.mf11
23 files changed, 147 insertions, 133 deletions
diff --git a/org.eclipse.virgo.management.console/.classpath b/org.eclipse.virgo.management.console/.classpath
index 0e3770ee..b2ace256 100644
--- a/org.eclipse.virgo.management.console/.classpath
+++ b/org.eclipse.virgo.management.console/.classpath
@@ -27,5 +27,6 @@
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-sources-3.1.0.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.io/1.4.0/com.springsource.org.apache.commons.io-1.4.0.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.mozilla.javascript/1.7.4.v201209142200/org.mozilla.javascript-1.7.4.v201209142200.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.management.console/ivy.xml b/org.eclipse.virgo.management.console/ivy.xml
index cc450a3b..3929038c 100644
--- a/org.eclipse.virgo.management.console/ivy.xml
+++ b/org.eclipse.virgo.management.console/ivy.xml
@@ -28,6 +28,7 @@
<dependency org="org.springframework" name="org.springframework.test" rev="${org.springframework}" conf="test->runtime"/>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.nop" rev="${org.slf4j.nop}" conf="test->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.mozilla.javascript" rev="${org.mozilla.javascript}" conf="test->runtime"/>
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/js/artifacts.js b/org.eclipse.virgo.management.console/src/main/webapp/js/artifacts.js
index 3c11819a..58e504fc 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/js/artifacts.js
+++ b/org.eclipse.virgo.management.console/src/main/webapp/js/artifacts.js
@@ -9,11 +9,14 @@
* VMware Inc. - initial contribution
*******************************************************************************/
+
+var uploadManager = new UploadManager();
+
/**
* Script to be loaded in to the head of the artifacts view
*/
+
function pageinit(){
- uploadManager = new UploadManager();
$('#upload-target-id').load(uploadManager.deployComplete);
$('#add-upload-box').click(uploadManager.addUploadBox);
$('#minus-upload-box').click(uploadManager.minusUploadBox);
@@ -423,7 +426,7 @@ var FullArtifact = function(metaData, objectName) {
};
-var UploadManager = function() {
+function UploadManager() {
var self = this;
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/js/dumps.js b/org.eclipse.virgo.management.console/src/main/webapp/js/dumps.js
index 174fa100..5eeefbfe 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/js/dumps.js
+++ b/org.eclipse.virgo.management.console/src/main/webapp/js/dumps.js
@@ -28,7 +28,7 @@ function pageinit(){
});
}
-var DumpViewer = function(){
+function DumpViewer(){
var self = this;
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/js/repositories.js b/org.eclipse.virgo.management.console/src/main/webapp/js/repositories.js
index 85a73870..153a4f14 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/js/repositories.js
+++ b/org.eclipse.virgo.management.console/src/main/webapp/js/repositories.js
@@ -28,7 +28,7 @@ function pageinit() {
};
-Repositories = {
+var Repositories = {
renderRepositoryMBeans: function(mbeanNames){
var getNameAttribute = function(mbeanName){
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js b/org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js
index cbc0b69f..502b79ec 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js
+++ b/org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js
@@ -32,7 +32,7 @@ function pageinit() {
});
}
-var SideBar = function(layoutManager, dataSource){
+function SideBar(layoutManager, dataSource){
var self = this;
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/AbstractJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/AbstractJSTests.java
index 10804fd2..750bfba5 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/AbstractJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/AbstractJSTests.java
@@ -26,11 +26,11 @@ import org.eclipse.virgo.management.console.stubs.types.Server;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.FunctionObject;
-import sun.org.mozilla.javascript.internal.Scriptable;
-import sun.org.mozilla.javascript.internal.ScriptableObject;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.FunctionObject;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ArtifactsJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ArtifactsJSTests.java
index 7217ce1a..2ec7942d 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ArtifactsJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ArtifactsJSTests.java
@@ -23,106 +23,106 @@ import org.eclipse.virgo.management.console.stubs.objects.Dollar;
import org.eclipse.virgo.management.console.stubs.types.Element;
import org.junit.Test;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
-import sun.org.mozilla.javascript.internal.ScriptableObject;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
/**
*
*
*/
public class ArtifactsJSTests extends AbstractJSTests {
-
- @Test
- public void testPageinit() throws ScriptException, IOException, NoSuchMethodException{
- addCommonObjects();
- readFile("src/main/webapp/js/artifacts.js");
-
- invokePageInit();
- assertNotNull(commonUtil.getLastQueryCallBack());
-
- commonUtil.getLastQueryCallBack().call(context, scope, scope, new Object[]{this.getTestData(), "type"});
- assertTrue("Page ready has not been called", commonUtil.isPageReady());
- }
-
- @Test
- public void testTreeLoad() {
- Dollar.getEachOperation().call(context, scope, scope, new Object[]{1, "filterMatch"});
- assertEquals("Tree inserted in to the wrong dom node", "#artifacts-tree", Dollar.getDollarLookup());
- }
-
- @Test
- public void testFileUpload() throws IOException {
- ScriptableObject uploadManager = (ScriptableObject) scope.get("uploadManager", scope);
-
- Element element = (Element) ((Function) scope.get("Element", scope)).construct(context, scope, new Object[]{"<div />"});
- Dollar.setDollarLookupResultForIds(element, 3);
- ScriptableObject.callMethod(uploadManager, "toggle", new Object[]{});
- assertTrue(element.getClasses().contains("button-selected"));
-
- Element element2 = (Element) ((Function) scope.get("Element", scope)).construct(context, scope, new Object[]{"#upload-form"});
- Dollar.setDollarLookupResultForIds(element2, 1);
- assertFalse((Boolean) Context.jsToJava(ScriptableObject.getProperty(uploadManager, "uploading"), Boolean.class));
- ScriptableObject.callMethod(uploadManager, "startUpload", new Object[]{});
- assertTrue((Boolean) Context.jsToJava(ScriptableObject.getProperty(uploadManager, "uploading"), Boolean.class));
- assertTrue(element2.isSubmitted());
-
- Element element3 = (Element) ((Function) scope.get("Element", scope)).construct(context, scope, new Object[]{"#upload-target-id"});
- Element element4 = (Element) ((Function) scope.get("Element", scope)).construct(context, scope, new Object[]{"#uploadLocations"});
- element3.setContentDocument(element4);
- Dollar.setDollarLookupResultForIds(new Scriptable[]{element3}, 1);
- ScriptableObject.callMethod(uploadManager, "deployComplete", new Object[]{});
- assertFalse((Boolean) Context.jsToJava(ScriptableObject.getProperty(uploadManager, "uploading"), Boolean.class));
- assertTrue(alertMsg.startsWith("Deployment result"));
-
- }
-
- @Test
- public void testTreeTopLevelTwisty() throws IOException {
- commonUtil.clean();
- ScriptableObject tree = (ScriptableObject) scope.get("tree", scope);
- ScriptableObject.callMethod(tree, "nodeTwistyClicked", new Object[]{getTestTopLevelEventData()});
- assertEquals("<li />", Dollar.getDollarLookup());
- assertEquals("search/org.eclipse.virgo.kernel:type=ArtifactModel,*", commonUtil.getLastQuery());
- }
-
- @Test
- public void testTreeTwisty() throws IOException {
- commonUtil.clean();
- ScriptableObject tree = (ScriptableObject) scope.get("tree", scope);
- ScriptableObject.callMethod(tree, "nodeTwistyClicked", new Object[]{getTestOtherLevelEventData()});
- assertEquals("<li />", Dollar.getDollarLookup());
- assertEquals("read/objectName", commonUtil.getLastQuery());
- }
-
- private Scriptable getTestData() throws IOException{
+
+ @Test
+ public void testPageinit() throws ScriptException, IOException, NoSuchMethodException {
+ addCommonObjects();
+ readFile("src/main/webapp/js/artifacts.js");
+
+ invokePageInit();
+ assertNotNull(commonUtil.getLastQueryCallBack());
+
+ commonUtil.getLastQueryCallBack().call(context, scope, scope, new Object[] { this.getTestData(), "type" });
+ assertTrue("Page ready has not been called", commonUtil.isPageReady());
+ }
+
+ @Test
+ public void testTreeLoad() {
+ Dollar.getEachOperation().call(context, scope, scope, new Object[] { 1, "filterMatch" });
+ assertEquals("Tree inserted in to the wrong dom node", "#artifacts-tree", Dollar.getDollarLookup());
+ }
+
+ @Test
+ public void testFileUpload() throws IOException {
+ ScriptableObject uploadManager = (ScriptableObject) scope.get("uploadManager", scope);
+
+ Element element = (Element) ((Function) scope.get("Element", scope)).construct(context, scope, new Object[] { "<div />" });
+ Dollar.setDollarLookupResultForIds(element, 3);
+ ScriptableObject.callMethod(uploadManager, "toggle", new Object[] {});
+ assertTrue(element.getClasses().contains("button-selected"));
+
+ Element element2 = (Element) ((Function) scope.get("Element", scope)).construct(context, scope, new Object[] { "#upload-form" });
+ Dollar.setDollarLookupResultForIds(element2, 1);
+ assertFalse((Boolean) Context.jsToJava(ScriptableObject.getProperty(uploadManager, "uploading"), Boolean.class));
+ ScriptableObject.callMethod(uploadManager, "startUpload", new Object[] {});
+ assertTrue((Boolean) Context.jsToJava(ScriptableObject.getProperty(uploadManager, "uploading"), Boolean.class));
+ assertTrue(element2.isSubmitted());
+
+ Element element3 = (Element) ((Function) scope.get("Element", scope)).construct(context, scope, new Object[] { "#upload-target-id" });
+ Element element4 = (Element) ((Function) scope.get("Element", scope)).construct(context, scope, new Object[] { "#uploadLocations" });
+ element3.setContentDocument(element4);
+ Dollar.setDollarLookupResultForIds(new Scriptable[] { element3 }, 1);
+ ScriptableObject.callMethod(uploadManager, "deployComplete", new Object[] {});
+ assertFalse((Boolean) Context.jsToJava(ScriptableObject.getProperty(uploadManager, "uploading"), Boolean.class));
+ assertTrue(alertMsg.startsWith("Deployment result"));
+
+ }
+
+ @Test
+ public void testTreeTopLevelTwisty() throws IOException {
+ commonUtil.clean();
+ ScriptableObject tree = (ScriptableObject) scope.get("tree", scope);
+ ScriptableObject.callMethod(tree, "nodeTwistyClicked", new Object[] { getTestTopLevelEventData() });
+ assertEquals("<li />", Dollar.getDollarLookup());
+ assertEquals("search/org.eclipse.virgo.kernel:type=ArtifactModel,*", commonUtil.getLastQuery());
+ }
+
+ @Test
+ public void testTreeTwisty() throws IOException {
+ commonUtil.clean();
+ ScriptableObject tree = (ScriptableObject) scope.get("tree", scope);
+ ScriptableObject.callMethod(tree, "nodeTwistyClicked", new Object[] { getTestOtherLevelEventData() });
+ assertEquals("<li />", Dollar.getDollarLookup());
+ assertEquals("read/objectName", commonUtil.getLastQuery());
+ }
+
+ private Scriptable getTestData() throws IOException {
readString( "var TestData = function() {" +
" this.value = {};" +
"};");
- Function testData = (Function) scope.get("TestData", scope);
- return testData.construct(context, scope, Context.emptyArgs);
- }
-
- private Scriptable getTestTopLevelEventData() throws IOException{
+ Function testData = (Function) scope.get("TestData", scope);
+ return testData.construct(context, scope, Context.emptyArgs);
+ }
+
+ private Scriptable getTestTopLevelEventData() throws IOException {
readString( "var TestEventData = function() {" +
" this.data = {};" +
" this.data.node = new Element('node');" +
" this.data.node.addClass('top-level');" +
" this.data.queryData = {};" +
"};");
- Function testData = (Function) scope.get("TestEventData", scope);
- return testData.construct(context, scope, Context.emptyArgs);
- }
-
- private Scriptable getTestOtherLevelEventData() throws IOException{
+ Function testData = (Function) scope.get("TestEventData", scope);
+ return testData.construct(context, scope, Context.emptyArgs);
+ }
+
+ private Scriptable getTestOtherLevelEventData() throws IOException {
readString( "var TestEventData = function() {" +
" this.data = {};" +
" this.data.node = new Element('node');" +
" this.data.queryData = {};" +
" this.data.queryData.toString = 'objectName';" +
"};");
- Function testData = (Function) scope.get("TestEventData", scope);
- return testData.construct(context, scope, Context.emptyArgs);
- }
+ Function testData = (Function) scope.get("TestEventData", scope);
+ return testData.construct(context, scope, Context.emptyArgs);
+ }
}
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/BundlesGuiJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/BundlesGuiJSTests.java
index 2885fac7..f10afbb6 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/BundlesGuiJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/BundlesGuiJSTests.java
@@ -18,11 +18,11 @@ import javax.script.ScriptException;
import org.junit.Test;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.FunctionObject;
-import sun.org.mozilla.javascript.internal.Scriptable;
-import sun.org.mozilla.javascript.internal.ScriptableObject;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.FunctionObject;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/CommonJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/CommonJSTests.java
index 49a37318..d0cf08da 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/CommonJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/CommonJSTests.java
@@ -16,9 +16,9 @@ import javax.script.ScriptException;
import org.junit.Test;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
-import sun.org.mozilla.javascript.internal.ScriptableObject;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationsJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationsJSTests.java
index 002eddb2..efeee6a7 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationsJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationsJSTests.java
@@ -23,9 +23,9 @@ import org.eclipse.virgo.management.console.stubs.objects.ObjectName;
import org.eclipse.virgo.management.console.stubs.types.Element;
import org.junit.Test;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/DumpsJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/DumpsJSTests.java
index aab17f6a..ac3f595d 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/DumpsJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/DumpsJSTests.java
@@ -23,9 +23,9 @@ import org.eclipse.virgo.management.console.stubs.objects.Dollar;
import org.eclipse.virgo.management.console.stubs.types.Element;
import org.junit.Test;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
/**
* All the methods in this test class should be run in the defined order. In particular, testPageInit must be run first
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/LoggingJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/LoggingJSTests.java
index 689c565f..b7db7ea6 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/LoggingJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/LoggingJSTests.java
@@ -18,9 +18,9 @@ import javax.script.ScriptException;
import org.junit.Test;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/OverviewJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/OverviewJSTests.java
index 7750f61b..a8956e08 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/OverviewJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/OverviewJSTests.java
@@ -20,9 +20,9 @@ import javax.script.ScriptException;
import org.eclipse.virgo.management.console.stubs.objects.Dollar;
import org.junit.Test;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
/**
* Unit test of overview.js.
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/RepositoriesJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/RepositoriesJSTests.java
index 0ae9ef6f..3fbbd44d 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/RepositoriesJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/RepositoriesJSTests.java
@@ -22,10 +22,10 @@ import javax.script.ScriptException;
import org.eclipse.virgo.management.console.stubs.objects.Dollar;
import org.junit.Test;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
-import sun.org.mozilla.javascript.internal.ScriptableObject;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
/**
* All the methods in this test class should be run in the defined order. In particular, testPageInit must be run first
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/WiringsJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/WiringsJSTests.java
index cc0992e4..d9fb613f 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/WiringsJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/WiringsJSTests.java
@@ -20,9 +20,9 @@ import javax.script.ScriptException;
import org.junit.Test;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Dollar.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Dollar.java
index 843a20c3..1a80096b 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Dollar.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Dollar.java
@@ -14,10 +14,10 @@ package org.eclipse.virgo.management.console.stubs.objects;
import java.util.HashMap;
import java.util.Map;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
-import sun.org.mozilla.javascript.internal.ScriptableObject;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java
index 9a500cf9..5ff9818c 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.virgo.management.console.stubs.objects;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.Scriptable;
-import sun.org.mozilla.javascript.internal.ScriptableObject;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Window.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Window.java
index c7f5b5e2..7a57df7f 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Window.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Window.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.virgo.management.console.stubs.objects;
-import sun.org.mozilla.javascript.internal.Function;
+import org.mozilla.javascript.Function;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Element.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Element.java
index 0455af9a..8c4230ac 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Element.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Element.java
@@ -20,9 +20,9 @@ import java.util.Map;
import org.eclipse.virgo.management.console.stubs.objects.Util;
-import sun.org.mozilla.javascript.internal.Context;
-import sun.org.mozilla.javascript.internal.Function;
-import sun.org.mozilla.javascript.internal.ScriptableObject;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.ScriptableObject;
/**
*/
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/ParentStub.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/ParentStub.java
index 74ba38dc..d4067cf7 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/ParentStub.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/ParentStub.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.virgo.management.console.stubs.types;
-import sun.org.mozilla.javascript.internal.ScriptableObject;
+import org.mozilla.javascript.ScriptableObject;
/**
*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Server.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Server.java
index f6b7bcce..595f2a8b 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Server.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/types/Server.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.virgo.management.console.stubs.types;
-import sun.org.mozilla.javascript.internal.Function;
+import org.mozilla.javascript.Function;
/**
*
diff --git a/org.eclipse.virgo.management.console/template.mf b/org.eclipse.virgo.management.console/template.mf
index 1f1f6f5d..f7f5c624 100644
--- a/org.eclipse.virgo.management.console/template.mf
+++ b/org.eclipse.virgo.management.console/template.mf
@@ -17,5 +17,14 @@ Import-Template:
org.osgi.service.*;version="0",
org.osgi.util.tracker.*;version="0",
javax.management.*;version="0",
- javax.security.*;version="0"
+ javax.security.*;version="0",
+ com.sun.javadoc.*;version="0",
+ com.sun.tools.javadoc.*;version="0",
+ javax.swing.*;version="0",
+ javax.xml.parsers.*;version="0",
+ javax.xml.stream.*;version="0",
+ javax.xml.transform.*;version="0",
+ org.apache.tools.ant.*;version="0",
+ org.w3c.dom.*;version="0",
+ org.xml.sax.*;version="0"
Excluded-Exports: *

Back to the top