osgiboot: log date and time

[lgpl/argeo-commons.git] / osgi / runtime / org.argeo.osgi.boot / src / main / java / org / argeo / osgi / boot / OsgiBootUtils.java

diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java
index a9067a213c04e912985fb139651db012c4b3ff3b..fa3ecc2b10ca2dd99951a9573b24c991bd270143 100644 (file)
--- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java
+++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java
@@ -16,33 +16,43 @@
 \r
 package org.argeo.osgi.boot;\r
 \r
+import java.text.DateFormat;\r
+import java.text.SimpleDateFormat;\r
+import java.util.Date;\r
+\r
+/** Utilities, mostly related to logging. */\r
 public class OsgiBootUtils {\r
+       /** ISO8601 (as per log4j) and difference to UTC */\r
+       private static DateFormat dateFormat = new SimpleDateFormat(\r
+                       "yyyy-MM-dd HH:mm:ss,SSS Z");\r
 \r
        public static void info(Object obj) {\r
-               System.out.println("# OSGiBOOT      # " + obj);\r
+               System.out.println("# OSGiBOOT      # " + dateFormat.format(new Date())\r
+                               + " # " + obj);\r
        }\r
 \r
        public static void debug(Object obj) {\r
-                       System.out.println("# OSGiBOOT DBG  # " + obj);\r
+               System.out.println("# OSGiBOOT DBG  # " + dateFormat.format(new Date())\r
+                               + " # " + obj);\r
        }\r
 \r
        public static void warn(Object obj) {\r
-               System.out.println("# OSGiBOOT WARN # " + obj);\r
-               // Because of a weird bug under Windows when starting it in a forked VM\r
-               // if (System.getProperty("os.name").contains("Windows"))\r
-               // System.out.println("# WARN " + obj);\r
-               // else\r
-               // System.err.println("# WARN " + obj);\r
+               System.out.println("# OSGiBOOT WARN # " + dateFormat.format(new Date())\r
+                               + " # " + obj);\r
        }\r
 \r
-       //FIXE: returns null when defaultValue is ""\r
+       /**\r
+        * Gets a property value\r
+        * \r
+        * @return null when defaultValue is ""\r
+        */\r
        public static String getProperty(String name, String defaultValue) {\r
                final String value;\r
                if (defaultValue != null)\r
                        value = System.getProperty(name, defaultValue);\r
                else\r
                        value = System.getProperty(name);\r
-               \r
+\r
                if (value == null || value.equals(""))\r
                        return null;\r
                else\r
@@ -53,36 +63,4 @@ public class OsgiBootUtils {
                return getProperty(name, null);\r
        }\r
 \r
-       public static String getPropertyCompat(String name, String oldName) {\r
-               return getPropertyCompat(name, oldName, null);\r
-       }\r
-\r
-       public static String getPropertyCompat(String name, String oldName,\r
-                       String defaultValue) {\r
-               String res = null;\r
-\r
-               if (defaultValue != null) {\r
-                       res = getProperty(name, defaultValue);\r
-                       if (res.equals(defaultValue)) {\r
-                               res = getProperty(oldName, defaultValue);\r
-                               if (!res.equals(defaultValue))\r
-                                       warnDeprecated(name, oldName);\r
-                       }\r
-               } else {\r
-                       res = getProperty(name, null);\r
-                       if (res == null) {\r
-                               res = getProperty(oldName, null);\r
-                               if (res != null)\r
-                                       warnDeprecated(name, oldName);\r
-                       }\r
-               }\r
-               return res;\r
-       }\r
-\r
-       public static void warnDeprecated(String name, String oldName) {\r
-               warn("Property '" + oldName\r
-                               + "' is deprecated and will be removed soon, use '" + name\r
-                               + "' instead.");\r
-       }       \r
-       \r
 }\r