From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 9 May 2010 08:08:09 +0000 (+0000)
Subject: Introduce OSGi standard runtime
X-Git-Tag: argeo-commons-2.1.30~1608
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=da5a4f5ea55536e34a4b7de6b391a1a9f91dad9d;p=lgpl%2Fargeo-commons.git

Introduce OSGi standard runtime

git-svn-id: https://svn.argeo.org/commons/trunk@3575 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/osgi/dep/org.argeo.osgi.dep.stdruntime/pom.xml b/osgi/dep/org.argeo.osgi.dep.stdruntime/pom.xml
new file mode 100644
index 000000000..29d3ac7be
--- /dev/null
+++ b/osgi/dep/org.argeo.osgi.dep.stdruntime/pom.xml
@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.commons.osgi</groupId>
+		<version>0.1.3-SNAPSHOT</version>
+		<artifactId>dep</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.osgi.dep.stdruntime</artifactId>
+	<packaging>pom</packaging>
+	<name>Dep OSGi Runtime</name>
+	<dependencies>
+		<!-- OSGi Boot (and Equinox) -->
+		<dependency>
+			<groupId>org.argeo.commons.osgi</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<!--  Logging -->
+		<dependency>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.dep.log4j</artifactId>
+			<version>${project.version}</version>
+			<type>pom</type>
+		</dependency>
+		<!-- Spring OSGi -->
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/osgi/dep/pom.xml b/osgi/dep/pom.xml
new file mode 100644
index 000000000..f56ec6ef1
--- /dev/null
+++ b/osgi/dep/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.commons</groupId>
+		<version>0.1.3-SNAPSHOT</version>
+		<artifactId>osgi</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.commons.osgi</groupId>
+	<artifactId>dep</artifactId>
+	<name>Commons Server Dependencies</name>
+	<packaging>pom</packaging>
+	<modules>
+		<module>org.argeo.osgi.dep.stdruntime</module>
+	</modules>
+</project>
\ No newline at end of file
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 282558762..302b41de5 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -12,5 +12,6 @@
 	<packaging>pom</packaging>
 	<modules>
 		<module>runtime</module>
+		<module>dep</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Activator.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Activator.java
index 80ec7b7f2..8397a7636 100644
--- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Activator.java
+++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Activator.java
@@ -13,17 +13,6 @@ public class Activator implements BundleActivator {
 	public void start(BundleContext bundleContext) throws Exception {
 		OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
 		osgiBoot.bootstrap();
-//		try {
-//			OsgiBoot.info("SLC OSGi bootstrap starting...");
-//			osgiBoot.installUrls(osgiBoot.getBundlesUrls());
-//			osgiBoot.installUrls(osgiBoot.getLocationsUrls());
-//			osgiBoot.installUrls(osgiBoot.getModulesUrls());
-//			osgiBoot.startBundles();
-//			OsgiBoot.info("SLC OSGi bootstrap completed");
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//			throw e;
-//		}
 	}
 
 	public void stop(BundleContext context) throws Exception {
diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java
index d54fa8899..17547f244 100644
--- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java
+++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java
@@ -118,6 +118,7 @@ public class OsgiBoot {
 	}
 
 	public void bootstrap() {
+		long begin = System.currentTimeMillis();
 		System.out.println();
 		info("OSGi bootstrap starting...");
 		info("Writable data directory : "
@@ -128,7 +129,10 @@ public class OsgiBoot {
 		installUrls(getModulesUrls());
 		checkUnresolved();
 		startBundles();
-		info("OSGi bootstrap completed");
+		long duration = System.currentTimeMillis() - begin;
+		info("OSGi bootstra completed in "
+				+ Math.round(((double) duration) / 1000) + "s (" + duration
+				+ "ms), " + bundleContext.getBundles().length + " bundles");
 		System.out.println();
 	}