X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.osgi.boot%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fboot%2FOsgiBootUtils.java;h=9593b0cde8bf8babdec9a79fe959aba90c0a679c;hb=79e0a2a5d751c7c077e52f9ee54469656dc96a44;hp=8c63344e5d330fa2a55de7259057116e9b89e4c8;hpb=807ccba419e96a18f7af67a66f986ae4c91c03d9;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBootUtils.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBootUtils.java
index 8c63344e5..9593b0cde 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBootUtils.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBootUtils.java
@@ -20,52 +20,43 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.StringTokenizer;
 
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.launch.Framework;
+import org.osgi.framework.launch.FrameworkFactory;
 
 /** Utilities, mostly related to logging. */
-@SuppressWarnings({ "rawtypes", "unchecked" })
 public class OsgiBootUtils {
 	/** ISO8601 (as per log4j) and difference to UTC */
-	private static DateFormat dateFormat = new SimpleDateFormat(
-			"yyyy-MM-dd HH:mm:ss,SSS Z");
+	private static DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS Z");
+
+	static boolean debug = System.getProperty(OsgiBoot.PROP_ARGEO_OSGI_BOOT_DEBUG) == null ? false
+			: !System.getProperty(OsgiBoot.PROP_ARGEO_OSGI_BOOT_DEBUG).trim().equals("false");
 
 	public static void info(Object obj) {
-		System.out.println("# OSGiBOOT      # " + dateFormat.format(new Date())
-				+ " # " + obj);
+		System.out.println("# OSGiBOOT      # " + dateFormat.format(new Date()) + " # " + obj);
 	}
 
 	public static void debug(Object obj) {
-		System.out.println("# OSGiBOOT DBG  # " + dateFormat.format(new Date())
-				+ " # " + obj);
+		if (debug)
+			System.out.println("# OSGiBOOT DBG  # " + dateFormat.format(new Date()) + " # " + obj);
 	}
 
 	public static void warn(Object obj) {
-		System.out.println("# OSGiBOOT WARN # " + dateFormat.format(new Date())
-				+ " # " + obj);
+		System.out.println("# OSGiBOOT WARN # " + dateFormat.format(new Date()) + " # " + obj);
 	}
 
-	/**
-	 * Gets a property value
-	 * 
-	 * @return null when defaultValue is ""
-	 */
-	public static String getProperty(String name, String defaultValue) {
-		final String value;
-		if (defaultValue != null)
-			value = System.getProperty(name, defaultValue);
-		else
-			value = System.getProperty(name);
-
-		if (value == null || value.equals(""))
-			return null;
-		else
-			return value;
+	public static void error(Object obj, Throwable e) {
+		System.err.println("# OSGiBOOT ERR  # " + dateFormat.format(new Date()) + " # " + obj);
+		if (e != null)
+			e.printStackTrace();
 	}
 
-	public static String getProperty(String name) {
-		return getProperty(name, null);
+	public static boolean isDebug() {
+		return debug;
 	}
 
 	public static String stateAsString(int state) {
@@ -88,16 +79,15 @@ public class OsgiBootUtils {
 	}
 
 	/**
-	 * @return ==0: versions are identical, <0: tested version is newer, >0:
+	 * @return ==0: versions are identical, &lt;0: tested version is newer, &gt;0:
 	 *         currentVersion is newer.
 	 */
-	public static int compareVersions(String currentVersion,
-			String testedVersion) {
-		List cToks = new ArrayList();
+	public static int compareVersions(String currentVersion, String testedVersion) {
+		List<String> cToks = new ArrayList<String>();
 		StringTokenizer cSt = new StringTokenizer(currentVersion, ".");
 		while (cSt.hasMoreTokens())
 			cToks.add(cSt.nextToken());
-		List tToks = new ArrayList();
+		List<String> tToks = new ArrayList<String>();
 		StringTokenizer tSt = new StringTokenizer(currentVersion, ".");
 		while (tSt.hasMoreTokens())
 			tToks.add(tSt.nextToken());
@@ -140,4 +130,16 @@ public class OsgiBootUtils {
 		return comp;
 	}
 
+	/** Launch an OSGi framework. */
+	public static Framework launch(FrameworkFactory frameworkFactory, Map<String, String> configuration) {
+		// start OSGi
+		Framework framework = frameworkFactory.newFramework(configuration);
+		try {
+			framework.start();
+		} catch (BundleException e) {
+			throw new OsgiBootException("Cannot start OSGi framework", e);
+		}
+		return framework;
+	}
+
 }