From 9cf957704a056fdc9ee51034ac050a8837857076 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 3 Feb 2018 23:35:39 +0100
Subject: [PATCH] Improve a2jjs

---
 demo/argeo_node.js                            | 11 ++---------
 dist/argeo-node/rpm/usr/share/node/jjs/cms.js |  6 ++++--
 dist/osgi-boot/src/main/rpm/usr/bin/a2jjs     | 14 +++++++++-----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/demo/argeo_node.js b/demo/argeo_node.js
index bfc644129..8e950f9c4 100755
--- a/demo/argeo_node.js
+++ b/demo/argeo_node.js
@@ -8,19 +8,12 @@ var policyFile = "all.policy";
 
 // CMS config
 load("../dist/argeo-node/rpm/usr/share/node/jjs/cms.js");
-
+// Provisioning
 osgi.baseUrl = "http://forge.argeo.org/data/java/argeo-2.1/";
 osgi.install("org.argeo.commons:org.argeo.dep.cms.platform:2.1.70");
+// HTTP
 osgi.conf("org.osgi.service.http.port", 0);
 
 // osgi.conf("osgi.clean", true);
 osgi.launch();
 openUi();
-
-// wait for UI
-//osgi.spring("org.argeo.cms.ui.workbench.rap");
-//var appUrl = "http://localhost:" + osgi.httpPort + "/ui/node";
-//$EXEC("/usr/bin/chromium-browser --app=" + appUrl);
-//
-//// shutdown when the windows is closed
-//osgi.shutdown();
\ No newline at end of file
diff --git a/dist/argeo-node/rpm/usr/share/node/jjs/cms.js b/dist/argeo-node/rpm/usr/share/node/jjs/cms.js
index 2f3bcc436..a67064f71 100755
--- a/dist/argeo-node/rpm/usr/share/node/jjs/cms.js
+++ b/dist/argeo-node/rpm/usr/share/node/jjs/cms.js
@@ -2,6 +2,7 @@ var System = Java.type("java.lang.System")
 var OsgiBuilder = Java.type("org.argeo.osgi.boot.OsgiBuilder");
 
 var osgi = new OsgiBuilder();
+// default bundles
 osgi.start(2, "org.eclipse.equinox.http.servlet");
 osgi.start(2, "org.eclipse.equinox.http.jetty");
 osgi.start(2, "org.eclipse.equinox.metatype");
@@ -10,6 +11,7 @@ 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");
+// specific properties
 osgi.conf("org.eclipse.rap.workbenchAutostart", "false");
 osgi.conf("org.eclipse.equinox.http.jetty.autostart", "false");
 osgi.conf("org.osgi.framework.bootdelegation", "com.sun.jndi.ldap,"
@@ -24,7 +26,7 @@ if (typeof app !== 'undefined') {
 		var appConf = $ENV.HOME + "/.a2/etc/" + app;
 	}
 	if (typeof policyFile == 'undefined') {
-		var policyFile = app + ".policy";
+		var policyFile = "node.policy";
 	}
 	osgi.conf("osgi.configuration.area", appHome + "/state");
 	osgi.conf("osgi.instance.area", appHome + "/data");
@@ -35,7 +37,7 @@ if (typeof app !== 'undefined') {
 			+ "/log4j.properties");
 }
 
-function openUi(){
+function openUi() {
 	osgi.spring("org.argeo.cms.ui.workbench.rap");
 	var appUrl = "http://localhost:" + osgi.httpPort + "/ui/node";
 	$EXEC("/usr/bin/chromium-browser --app=" + appUrl);
diff --git a/dist/osgi-boot/src/main/rpm/usr/bin/a2jjs b/dist/osgi-boot/src/main/rpm/usr/bin/a2jjs
index 4ffab9f13..62762a858 100755
--- a/dist/osgi-boot/src/main/rpm/usr/bin/a2jjs
+++ b/dist/osgi-boot/src/main/rpm/usr/bin/a2jjs
@@ -1,9 +1,13 @@
 #!/bin/sh
 
-PREFIX=$HOME/.a2
-#PREFIX=/usr
+export A2_HOME=$HOME/.a2
+if [ -d "$A2_HOME/share/osgi/boot" ]; then
+	PREFIX=$A2_HOME
+else
+	PREFIX=/usr
+fi
 
-/usr/bin/jjs \
- -cp "$PREFIX/share/osgi/boot/org.eclipse.osgi.jar:$PREFIX/share/osgi/boot/org.argeo.osgi.boot.jar" \
- $*
+EQUINOX=$PREFIX/share/osgi/boot/org.eclipse.osgi.jar
+OSGI_BOOT=$PREFIX/share/osgi/boot/org.argeo.osgi.boot.jar
 
+/usr/bin/jjs -cp "$EQUINOX:$OSGI_BOOT" $*
-- 
2.30.2