projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d973135
)
Adapt cms.js to Eclipse 4
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 5 May 2018 19:05:48 +0000
(21:05 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 5 May 2018 19:05:48 +0000
(21:05 +0200)
dist/argeo-node/base/share/argeo/cms.js
patch
|
blob
|
history
diff --git
a/dist/argeo-node/base/share/argeo/cms.js
b/dist/argeo-node/base/share/argeo/cms.js
index 3e8bc827d790e81fda883e1093c5b1d05ec2e56e..1e94fec9553f93082e888b881a0965b293569fe0 100755
(executable)
--- a/
dist/argeo-node/base/share/argeo/cms.js
+++ b/
dist/argeo-node/base/share/argeo/cms.js
@@
-10,8
+10,7
@@
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(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");
// specific properties
osgi.conf("org.eclipse.rap.workbenchAutostart", "false");
osgi.conf("org.eclipse.equinox.http.jetty.autostart", "false");
@@
-33,15
+32,7
@@
if (typeof app !== 'undefined') {
}
osgi.conf("osgi.configuration.area", appHome + "/state");
osgi.conf("osgi.instance.area", appHome + "/data");
}
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");
}
System.setProperty("log4j.configuration", appConf + "/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