[x3d-public] Following patch to CreateX3dSceneAccessInterfaceJava.xslt (X3DJSAIL) fixed some issues with test.nashorn (but not all of them)

[John Carlson]

svn diff CreateX3dSceneAccessInterfaceJava.xslt
Index: CreateX3dSceneAccessInterfaceJava.xslt
===================================================================
--- CreateX3dSceneAccessInterfaceJava.xslt      (revision 27088)
+++ CreateX3dSceneAccessInterfaceJava.xslt      (working copy)
@@ -3907,9 +3907,9 @@
                                        // patches by John Carlson
                     bufferedWriter = Files.newBufferedWriter(intermediateJSFilePath, charset);
                                        String nashornFolder = "nashorn";
-                                       String tmpStr = "load('"+nashornFolder+"/jvm-npm.js');\n";
+                                       String tmpStr = "load('classpath:"+nashornFolder+"/jvm-npm.js');\n";
                                        bufferedWriter.write(tmpStr, 0, tmpStr.length());
-                                       tmpStr = "load('"+nashornFolder+"/repeatPolyfill.js');\n";
+                                       tmpStr = "load('classpath:"+nashornFolder+"/repeatPolyfill.js');\n";
                                        bufferedWriter.write(tmpStr, 0, tmpStr.length());
                                        tmpStr = "var xmldom = require('"+nashornFolder+"/node_modules/xmldom');\n";
                                        bufferedWriter.write(tmpStr, 0, tmpStr.length());
@@ -3933,9 +3933,9 @@
                                        bufferedWriter.write(tmpStr, 0, tmpStr.length());
                                        tmpStr = "var fieldTypes = require('"+nashornFolder+"/node/fieldTypes.js');\n";
                                        bufferedWriter.write(tmpStr, 0, tmpStr.length());
-                                       tmpStr = "load('"+nashornFolder+"/node/X3DJSONLD.js');\n";
+                                       tmpStr = "load('classpath:"+nashornFolder+"/node/X3DJSONLD.js');\n";
                                        bufferedWriter.write(tmpStr, 0, tmpStr.length());
-                                       tmpStr = "load('"+nashornFolder+"/node/JavaScriptSerializer.js');\n";
+                                       tmpStr = "load('classpath:"+nashornFolder+"/node/JavaScriptSerializer.js');\n";
                                        bufferedWriter.write(tmpStr, 0, tmpStr.length());
                                        tmpStr = "var child = CreateElement('X3D');\n";
                                        bufferedWriter.write(tmpStr, 0, tmpStr.length());
@@ -3963,7 +3963,7 @@
                 }
                 try {
                                        ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn");
-                                        engine.eval("load('"+intermediateJSFileName+"');");
+                                        engine.eval("load('classpath:"+intermediateJSFileName+"');");
                                        if (ConfigurationProperties.isDeleteIntermediateFiles()) // clean up when done
                                                        intermediateJSFilePath.toFile().deleteOnExit();
                                        engine.eval("print('Hello World!');");

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://web3d.org/pipermail/x3d-public_web3d.org/attachments/20180717/5a7c1b82/attachment-0001.html>