From 4a71b1783c1066cc4499942f8c4c7853863addf9 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 5 May 2018 21:05:48 +0200 Subject: [PATCH] Adapt cms.js to Eclipse 4 --- dist/argeo-node/base/share/argeo/cms.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dist/argeo-node/base/share/argeo/cms.js b/dist/argeo-node/base/share/argeo/cms.js index 3e8bc827d..1e94fec95 100755 --- 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(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"); @@ -33,15 +32,7 @@ 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"); } - -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 -- 2.30.2