Use URL instead of loading the script content

[lgpl/argeo-commons.git] / org.argeo.cms.ui / src / org / argeo / cms / script / ScriptUi.java

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 c8b3bb3529a3636aaefa4d5af807c8b4195ab583..ab0708a830ee58037d37c279f469fd4d1484195f 100644 (file)
--- 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