Improve JavaScript launch

[lgpl/argeo-commons.git] / dist / argeo-node / base / share / argeo / cms.js

diff --git a/dist/argeo-node/base/share/argeo/cms.js b/dist/argeo-node/base/share/argeo/cms.js
index 1e94fec9553f93082e888b881a0965b293569fe0..75353779deedf38f9ef75bdd89316a6b26651be1 100755 (executable)
--- a/dist/argeo-node/base/share/argeo/cms.js
+++ b/dist/argeo-node/base/share/argeo/cms.js
@@ -20,6 +20,8 @@ osgi.conf("org.osgi.framework.bootdelegation", "com.sun.jndi.ldap,"
 
 var homeUri = java.nio.file.Paths
                .get(java.lang.System.getProperty("user.home")).toUri().toString();
+var execDirUri = java.nio.file.Paths.get(
+               java.lang.System.getProperty("user.dir")).toUri().toString();
 if (typeof app !== 'undefined') {
        if (typeof appHome == 'undefined') {
                var appHome = homeUri + "/.a2/var/lib/" + app;
@@ -32,7 +34,11 @@ if (typeof app !== 'undefined') {
        }
        osgi.conf("osgi.configuration.area", appHome + "/state");
        osgi.conf("osgi.instance.area", appHome + "/data");
-//     System.setProperty("java.security.manager", "");
-//     System.setProperty("java.security.policy", appConf + "/" + policyFile);
+       // System.setProperty("java.security.manager", "");
+       // System.setProperty("java.security.policy", appConf + "/" + policyFile);
        System.setProperty("log4j.configuration", appConf + "/log4j.properties");
+} else {
+       osgi.conf("osgi.configuration.area", execDirUri + "/state");
+       osgi.conf("osgi.instance.area", execDirUri + "/data");
+       System.setProperty("log4j.configuration", execDirUri + "etc/argeo/log4j.properties");
 }