WIP

ctrueden · ctrueden · commit 1c54023aae71 · 2015-06-16T16:35:26.000-05:00
This branch will only be necessary if we decide to explicitly ship the
Rhino script engine version of JavaScript, as opposed to leaning on
Nashorn's compatibility functions in Java 8.

Time will tell whether the Nashorn backwards compatibility is good
enough. But in the meantime, let's leave this branch for a while.
diff --git a/pom.xml b/pom.xml
@@ -17,6 +17,10 @@
 	<url>http://scijava.org/</url>
 	<inceptionYear>2008</inceptionYear>
 
+	<properties>
+		<scijava.jvm.version>1.8</scijava.jvm.version>
+	</properties>
+
 	<licenses>
 		<license>
 			<name>Simplified BSD License</name>
diff --git a/src/main/java/org/scijava/plugins/scripting/javascript/JavaScriptScriptLanguage.java b/src/main/java/org/scijava/plugins/scripting/javascript/JavaScriptScriptLanguage.java
@@ -64,7 +64,7 @@ public ScriptEngine getScriptEngine() {
 		final ScriptEngine engine = super.getScriptEngine();
 		try {
 			engine.eval("function load(path) {\n"
-					+ "  importClass(Packages.sun.org.mozilla.javascript.internal.Context);\n"
+					+ "  importClass(Packages.org.mozilla.javascript.Context);\n"
 					+ "  importClass(Packages.java.io.FileReader);\n"
 					+ "  var cx = Context.getCurrentContext();\n"
 					+ "  cx.evaluateReader(this, new FileReader(path), path, 1, null);\n"
diff --git a/src/test/java/org/scijava/plugins/scripting/javascript/JavaScriptTest.java b/src/test/java/org/scijava/plugins/scripting/javascript/JavaScriptTest.java
@@ -75,11 +75,12 @@ public void testBasic() throws InterruptedException, ExecutionException,
 
 	@Test
 	public void testLocals() throws ScriptException {
-		final Context context = new Context(ScriptService.class);
-		final ScriptService scriptService = context.getService(ScriptService.class);
-
-		final ScriptLanguage language = scriptService.getLanguageByExtension("js");
-		final ScriptEngine engine = language.getScriptEngine();
+//		final Context context = new Context(ScriptService.class);
+//		final ScriptService scriptService = context.getService(ScriptService.class);
+//
+//		final ScriptLanguage language = scriptService.getLanguageByExtension("js");
+//		final ScriptEngine engine = language.getScriptEngine();
+		final ScriptEngine engine = new RhinoScriptEngine();
 		assertTrue(engine.getClass().getName().endsWith(".RhinoScriptEngine"));
 		engine.put("$hello", 17);
 		assertEquals("17", engine.eval("$hello").toString());
@@ -123,7 +124,7 @@ public void testLoad() throws IOException, InterruptedException, ExecutionExcept
 		final ScriptService scriptService = context.getService(ScriptService.class);
 		final String script = "load('" + tmp.getPath() + "'); three();";
 		final Object result = scriptService.run("three.js", script, false).get().getReturnValue();
-		assertEquals(4.0, (Number) result);
+		assertEquals(4, result);
 		assertTrue(tmp.delete());
 	}
 }
