r9629 - in helma-ng/trunk/src/org/helma/tools: . launcher

Author: hannes
Date: 2009-04-20 18:31:07 +0200 (Mon, 20 Apr 2009)
New Revision: 9629

Modified:
   helma-ng/trunk/src/org/helma/tools/HelmaConfiguration.java
   helma-ng/trunk/src/org/helma/tools/HelmaRunner.java
   helma-ng/trunk/src/org/helma/tools/launcher/Main.java
Log:
Allow setting helma home and module path via environment variables HELMA_HOME and HELMA_MODULE_PATH in addtion to java system properties helma.home and helma.modulepath.

Details at http://dev.helma.org/trac/helma/changeset/9629

Modified: helma-ng/trunk/src/org/helma/tools/HelmaConfiguration.java
===================================================================
--- helma-ng/trunk/src/org/helma/tools/HelmaConfiguration.java	2009-04-20 11:07:55 UTC (rev 9628)
+++ helma-ng/trunk/src/org/helma/tools/HelmaConfiguration.java	2009-04-20 16:31:07 UTC (rev 9629)
@@ -66,7 +66,7 @@
         }
 
         if (modulePath != null) {
-            String[] paths = StringUtils.split(modulePath, ",");
+            String[] paths = StringUtils.split(modulePath, File.pathSeparator);
             for (int i = 0; i < paths.length; i++) {
                 String path = paths[i].trim();
                 Repository repo = home.getChildRepository(path);

Modified: helma-ng/trunk/src/org/helma/tools/HelmaRunner.java
===================================================================
--- helma-ng/trunk/src/org/helma/tools/HelmaRunner.java	2009-04-20 11:07:55 UTC (rev 9628)
+++ helma-ng/trunk/src/org/helma/tools/HelmaRunner.java	2009-04-20 16:31:07 UTC (rev 9629)
@@ -61,8 +61,18 @@
             }
         }
 
-        FileRepository home = new FileRepository(System.getProperty("helma.home", "."));
+        String helmaHome = System.getProperty("helma.home");
+        if (helmaHome == null) {
+            helmaHome = System.getenv("HELMA_HOME");
+        }
+        if (helmaHome == null) {
+            helmaHome = ".";
+        }
+        FileRepository home = new FileRepository(helmaHome);
         String modulePath = System.getProperty("helma.modulepath");
+        if (modulePath == null) {
+            modulePath = System.getenv("HELMA_MODULE_PATH");
+        }
         HelmaConfiguration config = new HelmaConfiguration(home, modulePath, "modules");
         config.addScriptRepository(scriptName);
         if (optlevel >= -1) {

Modified: helma-ng/trunk/src/org/helma/tools/launcher/Main.java
===================================================================
--- helma-ng/trunk/src/org/helma/tools/launcher/Main.java	2009-04-20 11:07:55 UTC (rev 9628)
+++ helma-ng/trunk/src/org/helma/tools/launcher/Main.java	2009-04-20 16:31:07 UTC (rev 9629)
@@ -97,6 +97,9 @@
             throws IOException, MalformedURLException {
         // check if home directory is set via system property
         String helmaHome = System.getProperty("helma.home");
+        if (helmaHome == null) {
+            helmaHome = System.getenv("HELMA_HOME");
+        }
 
         if (helmaHome == null) {