Clarify naming.

[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 446747f550b627d2d1fbd239f9127b73f5fffc6d..75353779deedf38f9ef75bdd89316a6b26651be1 100755 (executable)
--- a/dist/argeo-node/base/share/argeo/cms.js
+++ b/dist/argeo-node/base/share/argeo/cms.js
@@ -7,10 +7,10 @@ osgi.start(2, "org.eclipse.equinox.http.servlet");
 osgi.start(2, "org.eclipse.equinox.http.jetty");
 osgi.start(2, "org.eclipse.equinox.metatype");
 osgi.start(2, "org.eclipse.equinox.cm");
+osgi.start(2, "org.eclipse.equinox.ds");
 osgi.start(2, "org.eclipse.rap.rwt.osgi");
 osgi.start(3, "org.argeo.cms");
-osgi.start(4, "org.eclipse.gemini.blueprint.extender");
-osgi.start(4, "org.eclipse.equinox.http.registry");
+osgi.start(4, "org.argeo.cms.e4.rap");
 // specific properties
 osgi.conf("org.eclipse.rap.workbenchAutostart", "false");
 osgi.conf("org.eclipse.equinox.http.jetty.autostart", "false");
@@ -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,15 +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");
 }
-
-function openWorkbench() {
-       osgi.spring("org.argeo.cms.ui.workbench.rap");
-       var appUrl = "http://127.0.0.1:" + osgi.httpPort + "/ui/node";
-       $EXEC("chrome --app=" + appUrl);
-       // shutdown when the window is closed
-       osgi.shutdown();
-}
\ No newline at end of file