Improve OSGi Main launcher

diff --git a/dist/argeo-node/assembly/cms-e4-rap.xml b/dist/argeo-node/assembly/cms-e4-rap.xml
index c474f3cc11d626d45a2bab9b3b4639a018068fa5..a3dda5563718eddc1b64f347f97b411da40911e6 100644 (file)
--- 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 f0fa329c80ac32e93c2784bd01c2ff8b5fdf0e67..fd2b18cd1c07ca5db772b2d6102de663e2932b8d 100644 (file)
--- 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 fdabd995c91f3fe61d76190ac4fd41884247eb42..45094a7ee8731ad0c0dd63c1d216658f42c719e5 100644 (file)
--- 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 b9f9193ffa512e4c4f0eaab7a7dd060118478350..1072a11498fdf03ab10be82df2fcf3d5086a0f0d 100644 (file)
--- 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) {