X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.osgi.boot%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fboot%2FOsgiBootUtils.java;fp=org.argeo.osgi.boot%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fboot%2FOsgiBootUtils.java;h=c152ed74efbffd8d92e17e1626fa26e279c95666;hb=71196c25959b53964edf87aeb4387ed8b11b4868;hp=9593b0cde8bf8babdec9a79fe959aba90c0a679c;hpb=896059bcaa3fb282896d694c667da1a41b421f50;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 9593b0cde..c152ed74e 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
@@ -1,145 +1,130 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.osgi.boot;
-
-import java.text.DateFormat;
-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. */
-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");
-
-	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);
-	}
-
-	public static void debug(Object 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);
-	}
-
-	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 boolean isDebug() {
-		return debug;
-	}
-
-	public static String stateAsString(int state) {
-		switch (state) {
-		case Bundle.UNINSTALLED:
-			return "UNINSTALLED";
-		case Bundle.INSTALLED:
-			return "INSTALLED";
-		case Bundle.RESOLVED:
-			return "RESOLVED";
-		case Bundle.STARTING:
-			return "STARTING";
-		case Bundle.ACTIVE:
-			return "ACTIVE";
-		case Bundle.STOPPING:
-			return "STOPPING";
-		default:
-			return Integer.toString(state);
-		}
-	}
-
-	/**
-	 * @return ==0: versions are identical, <0: tested version is newer, >0:
-	 *         currentVersion is newer.
-	 */
-	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<String> tToks = new ArrayList<String>();
-		StringTokenizer tSt = new StringTokenizer(currentVersion, ".");
-		while (tSt.hasMoreTokens())
-			tToks.add(tSt.nextToken());
-
-		int comp = 0;
-		comp: for (int i = 0; i < cToks.size(); i++) {
-			if (tToks.size() <= i) {
-				// equals until then, tested shorter
-				comp = 1;
-				break comp;
-			}
-
-			String c = (String) cToks.get(i);
-			String t = (String) tToks.get(i);
-
-			try {
-				int cInt = Integer.parseInt(c);
-				int tInt = Integer.parseInt(t);
-				if (cInt == tInt)
-					continue comp;
-				else {
-					comp = (cInt - tInt);
-					break comp;
-				}
-			} catch (NumberFormatException e) {
-				if (c.equals(t))
-					continue comp;
-				else {
-					comp = c.compareTo(t);
-					break comp;
-				}
-			}
-		}
-
-		if (comp == 0 && tToks.size() > cToks.size()) {
-			// equals until then, current shorter
-			comp = -1;
-		}
-
-		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;
-	}
-
-}
+package org.argeo.osgi.boot;
+
+import java.text.DateFormat;
+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. */
+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");
+
+	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);
+	}
+
+	public static void debug(Object 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);
+	}
+
+	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 boolean isDebug() {
+		return debug;
+	}
+
+	public static String stateAsString(int state) {
+		switch (state) {
+		case Bundle.UNINSTALLED:
+			return "UNINSTALLED";
+		case Bundle.INSTALLED:
+			return "INSTALLED";
+		case Bundle.RESOLVED:
+			return "RESOLVED";
+		case Bundle.STARTING:
+			return "STARTING";
+		case Bundle.ACTIVE:
+			return "ACTIVE";
+		case Bundle.STOPPING:
+			return "STOPPING";
+		default:
+			return Integer.toString(state);
+		}
+	}
+
+	/**
+	 * @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<String> cToks = new ArrayList<String>();
+		StringTokenizer cSt = new StringTokenizer(currentVersion, ".");
+		while (cSt.hasMoreTokens())
+			cToks.add(cSt.nextToken());
+		List<String> tToks = new ArrayList<String>();
+		StringTokenizer tSt = new StringTokenizer(currentVersion, ".");
+		while (tSt.hasMoreTokens())
+			tToks.add(tSt.nextToken());
+
+		int comp = 0;
+		comp: for (int i = 0; i < cToks.size(); i++) {
+			if (tToks.size() <= i) {
+				// equals until then, tested shorter
+				comp = 1;
+				break comp;
+			}
+
+			String c = (String) cToks.get(i);
+			String t = (String) tToks.get(i);
+
+			try {
+				int cInt = Integer.parseInt(c);
+				int tInt = Integer.parseInt(t);
+				if (cInt == tInt)
+					continue comp;
+				else {
+					comp = (cInt - tInt);
+					break comp;
+				}
+			} catch (NumberFormatException e) {
+				if (c.equals(t))
+					continue comp;
+				else {
+					comp = c.compareTo(t);
+					break comp;
+				}
+			}
+		}
+
+		if (comp == 0 && tToks.size() > cToks.size()) {
+			// equals until then, current shorter
+			comp = -1;
+		}
+
+		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;
+	}
+
+}