X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fscript%2FCmsScriptRwtApplication.java;h=cc5ea7ff50590959f6b57ce533d63a788ffab262;hb=2e8e5c43aa204d43fcd80d445c6f4863dc5b54ae;hp=1bc2b0b5a18e9f9b7043363bcc17ee996b680ca3;hpb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptRwtApplication.java b/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptRwtApplication.java
index 1bc2b0b5a..cc5ea7ff5 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptRwtApplication.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/script/CmsScriptRwtApplication.java
@@ -32,38 +32,43 @@ public class CmsScriptRwtApplication implements ApplicationConfiguration {
 
 	public void init(BundleContext bundleContext) {
 		this.bundleContext = bundleContext;
-		// System.out.println("bundleContext=" + bundleContext);
-		// System.out.println("repository=" + repository);
-		ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
 		ClassLoader bundleCl = bundleContext.getBundle().adapt(BundleWiring.class).getClassLoader();
-		ClassLoader currentCcl = Thread.currentThread().getContextClassLoader();
+		ClassLoader originalCcl = Thread.currentThread().getContextClassLoader();
 		try {
-			Thread.currentThread().setContextClassLoader(bundleCl);
-			engine = scriptEngineManager.getEngineByName("JavaScript");
+//			Thread.currentThread().setContextClassLoader(bundleCl);// GraalVM needs it to be before creating manager
+//			ScriptEngineManager scriptEngineManager = new ScriptEngineManager(bundleCl);
+//			engine = scriptEngineManager.getEngineByName("JavaScript");
+//			if (engine == null) {// Nashorn
+//				Thread.currentThread().setContextClassLoader(originalCcl);
+//				scriptEngineManager = new ScriptEngineManager();
+//				Thread.currentThread().setContextClassLoader(bundleCl);
+//				engine = scriptEngineManager.getEngineByName("JavaScript");
+//			}
+			engine = loadScriptEngine(originalCcl, bundleCl);
+
+			// Load script
+			URL appUrl = bundleContext.getBundle().getEntry("cms/app.js");
+			// System.out.println("Loading " + appUrl);
+			// System.out.println("Loading " + appUrl.getHost());
+			// System.out.println("Loading " + appUrl.getPath());
+
+			CmsScriptApp app = new CmsScriptApp(engine);
+			engine.put(APP, app);
+			engine.put(BC, bundleContext);
+			try (Reader reader = new InputStreamReader(appUrl.openStream())) {
+				engine.eval(reader);
+			} catch (IOException | ScriptException e) {
+				throw new CmsException("Cannot execute " + appUrl, e);
+			}
+
+			if (log.isDebugEnabled())
+				log.debug("CMS script app initialized from " + appUrl);
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {
-			Thread.currentThread().setContextClassLoader(currentCcl);
+			Thread.currentThread().setContextClassLoader(originalCcl);
 		}
-
-		// Load script
-		URL appUrl = bundleContext.getBundle().getEntry("cms/app.js");
-		// System.out.println("Loading " + appUrl);
-		// System.out.println("Loading " + appUrl.getHost());
-		// System.out.println("Loading " + appUrl.getPath());
-
-		CmsScriptApp app = new CmsScriptApp(engine);
-		engine.put(APP, app);
-		engine.put(BC, bundleContext);
-		try (Reader reader = new InputStreamReader(appUrl.openStream())) {
-			engine.eval(reader);
-		} catch (IOException | ScriptException e) {
-			throw new CmsException("Cannot execute " + appUrl, e);
-		}
-
-		if (log.isDebugEnabled())
-			log.debug("CMS script app initialized from " + appUrl);
-
 	}
 
 	public void destroy(BundleContext bundleContext) {
@@ -101,4 +106,16 @@ public class CmsScriptRwtApplication implements ApplicationConfiguration {
 		this.repository = repository;
 	}
 
+	private static ScriptEngine loadScriptEngine(ClassLoader originalCcl, ClassLoader bundleCl) {
+		Thread.currentThread().setContextClassLoader(bundleCl);// GraalVM needs it to be before creating manager
+		ScriptEngineManager scriptEngineManager = new ScriptEngineManager(bundleCl);
+		ScriptEngine engine = scriptEngineManager.getEngineByName("JavaScript");
+		if (engine == null) {// Nashorn
+			Thread.currentThread().setContextClassLoader(originalCcl);
+			scriptEngineManager = new ScriptEngineManager();
+			Thread.currentThread().setContextClassLoader(bundleCl);
+			engine = scriptEngineManager.getEngineByName("JavaScript");
+		}
+		return engine;
+	}
 }