From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 26 Oct 2018 10:41:37 +0000 (+0200)
Subject: Use URL instead of loading the script content
X-Git-Tag: argeo-commons-2.1.76~37
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=66a14b840fda87223c5bbfb605cb7ca4e0d82289;p=lgpl%2Fargeo-commons.git

Use URL instead of loading the script content
---

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptUi.java b/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptUi.java
index c8b3bb352..ab0708a83 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptUi.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/script/ScriptUi.java
@@ -51,11 +51,18 @@ public class ScriptUi implements CmsUiProvider {
 	}
 
 	private void load() {
-		try (Reader reader = new InputStreamReader(appUrl.openStream())) {
-			scriptEngine.eval(reader);
-		} catch (IOException | ScriptException e) {
+//		try (Reader reader = new InputStreamReader(appUrl.openStream())) {
+//			scriptEngine.eval(reader);
+//		} catch (IOException | ScriptException e) {
+//			log.warn("Cannot execute " + appUrl, e);
+//		}
+
+		try {
+			scriptEngine.eval("load('" + appUrl + "')");
+		} catch (ScriptException e) {
 			log.warn("Cannot execute " + appUrl, e);
 		}
+
 	}
 
 	// public ScriptUiProvider(ScriptEngine scriptEngine, String script) throws