From 5f2d4436f67cae57b49e4e1535ead60394352562 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 13 Apr 2019 13:40:54 +0200
Subject: [PATCH] Improve OSGi Main launcher

---
 dist/argeo-node/assembly/cms-e4-rap.xml       | 38 +++++++++++--------
 org.argeo.osgi.boot/bnd.bnd                   |  3 ++
 .../src/org/argeo/osgi/boot/Main.java         | 11 ++++--
 .../org/argeo/osgi/boot/a2/FsA2Source.java    |  2 +-
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/dist/argeo-node/assembly/cms-e4-rap.xml b/dist/argeo-node/assembly/cms-e4-rap.xml
index c474f3cc1..a3dda5563 100644
--- a/dist/argeo-node/assembly/cms-e4-rap.xml
+++ b/dist/argeo-node/assembly/cms-e4-rap.xml
@@ -5,7 +5,7 @@
 	<id>dist</id>
 	<baseDirectory></baseDirectory>
 	<formats>
-		<format>zip</format>
+		<format>dir</format>
 	</formats>
 	<fileSets>
 		<fileSet>
@@ -20,19 +20,25 @@
 			</excludes>
 		</fileSet>
 	</fileSets>
-<!-- 	<dependencySets> -->
-<!-- 		<dependencySet> -->
-<!-- 			<unpack>false</unpack> -->
-<!-- 			<outputFileNameMapping>${artifact.groupId}/${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> -->
-<!-- 			<outputDirectory>share/osgi</outputDirectory> -->
-<!-- 		</dependencySet> -->
-<!-- 		<dependencySet> -->
-<!-- 			<useStrictFiltering>true</useStrictFiltering> -->
-<!-- 			<unpack>true</unpack> -->
-<!-- 			<outputDirectory></outputDirectory> -->
-<!-- 			<includes> -->
-<!-- 				<include>org.argeo.commons:osgi-boot:zip:*:*</include> -->
-<!-- 			</includes> -->
-<!-- 		</dependencySet> -->
-<!-- 	</dependencySets> -->
+	<dependencySets>
+		<dependencySet>
+			<unpack>false</unpack>
+			<outputFileNameMapping>${artifact.groupId}/${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+			<outputDirectory>share/osgi</outputDirectory>
+			<useTransitiveDependencies>true</useTransitiveDependencies>
+			<useTransitiveFiltering>true</useTransitiveFiltering>
+			<scope>compile</scope>
+			<excludes>
+				<exclude>org.argeo.tp:argeo-tp</exclude>
+			</excludes>
+		</dependencySet>
+		<dependencySet>
+			<useStrictFiltering>true</useStrictFiltering>
+			<unpack>true</unpack>
+			<outputDirectory></outputDirectory>
+			<includes>
+				<include>org.argeo.commons:osgi-boot:zip:*:*</include>
+			</includes>
+		</dependencySet>
+	</dependencySets>
 </assembly>
\ No newline at end of file
diff --git a/org.argeo.osgi.boot/bnd.bnd b/org.argeo.osgi.boot/bnd.bnd
index f0fa329c8..fd2b18cd1 100644
--- a/org.argeo.osgi.boot/bnd.bnd
+++ b/org.argeo.osgi.boot/bnd.bnd
@@ -1,3 +1,6 @@
+Main-Class: org.argeo.osgi.boot.Main
+Class-Path: org.eclipse.osgi.jar
+
 Bundle-Activator: org.argeo.osgi.boot.Activator
 Import-Package: org.eclipse.*;resolution:=optional,\
 org.eclipse.osgi.launch.*;resolution:=optional,\
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/Main.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/Main.java
index fdabd995c..45094a7ee 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/Main.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/Main.java
@@ -19,11 +19,14 @@ public class Main {
 		// osgi.conf("osgi.clean", "true");
 		// osgi.conf("osgi.console", "true");
 		osgi.launch();
-		osgi.main(mainClass, args);
 
-		long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
-		String jvmUptimeStr = (jvmUptime / 1000) + "." + (jvmUptime % 1000) + "s";
-		System.out.println("Command " + mainClass + " executed in " + jvmUptimeStr);
+		if (OsgiBootUtils.isDebug()) {
+			long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
+			String jvmUptimeStr = (jvmUptime / 1000) + "." + (jvmUptime % 1000) + "s";
+			OsgiBootUtils.debug("Ready to launch " + mainClass + " in " + jvmUptimeStr);
+		}
+
+		osgi.main(mainClass, args);
 
 		osgi.shutdown();
 
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java
index b9f9193ff..1072a1149 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java
@@ -71,7 +71,7 @@ public class FsA2Source extends ProvisioningSource {
 	public static void main(String[] args) {
 		try {
 			FsA2Source context = new FsA2Source(Paths.get(
-					"/home/mbaudier/dev/git/apache2/argeo-commons/dist/argeo-node/target/argeo-node-2.1.74-SNAPSHOT/argeo-node/share/osgi"));
+					"/home/mbaudier/dev/git/apache2/argeo-commons/dist/argeo-node/target/argeo-node-2.1.77-SNAPSHOT/share/osgi"));
 			context.load();
 			context.asTree();
 		} catch (Exception e) {
-- 
2.30.2