X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fargeo-node%2Fbase%2Fshare%2Fargeo%2Fcms.js;h=75353779deedf38f9ef75bdd89316a6b26651be1;hb=43e8bb2c3186c925991091e2b0f7002a940093c3;hp=1e94fec9553f93082e888b881a0965b293569fe0;hpb=4a71b1783c1066cc4499942f8c4c7853863addf9;p=lgpl%2Fargeo-commons.git

diff --git a/dist/argeo-node/base/share/argeo/cms.js b/dist/argeo-node/base/share/argeo/cms.js
index 1e94fec95..75353779d 100755
--- 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");
 }