From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 3 Feb 2018 22:18:25 +0000 (+0100)
Subject: Improve UI lifecycle
X-Git-Tag: argeo-commons-2.1.71~29
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=2af62c95bf8ba23905d703dcb0610bc8025d067a

Improve UI lifecycle
---

diff --git a/demo/argeo_node.js b/demo/argeo_node.js
index e2af03d17..bfc644129 100755
--- a/demo/argeo_node.js
+++ b/demo/argeo_node.js
@@ -15,11 +15,12 @@ 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
+//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 b78fe0b5f..2f3bcc436 100755
--- a/dist/argeo-node/rpm/usr/share/node/jjs/cms.js
+++ b/dist/argeo-node/rpm/usr/share/node/jjs/cms.js
@@ -33,4 +33,12 @@ if (typeof app !== 'undefined') {
 			+ policyFile);
 	System.setProperty("log4j.configuration", "file://" + appConf
 			+ "/log4j.properties");
+}
+
+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);
+	// shutdown when the window is closed
+	osgi.shutdown();
 }
\ No newline at end of file
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBuilder.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBuilder.java
index 3dfe486d0..81315cf4e 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBuilder.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBuilder.java
@@ -159,6 +159,12 @@ public class OsgiBuilder {
 			e.printStackTrace();
 			System.exit(1);
 		}
+		try {
+			framework.waitForStop(10 * 60 * 1000);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+			System.exit(1);
+		}
 		System.exit(0);
 	}