svn commit: r1244279 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Feb 14 23:41:29 2012
New Revision: 1244279

URL: http://svn.apache.org/viewvc?rev=1244279&view=rev
Log:
forcing to use JUL for OpenJPA even if we are not in embedded mode (sysout are really ugly)

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1244279&r1=1244278&r2=1244279&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Tue Feb 14 23:41:29 2012
@@ -35,13 +35,16 @@ public class JuliLogStreamFactory implem
 
         // if embedded case enhance a bit logging if not set
         if ((!tomee || embedded) && System.getProperty("java.util.logging.manager") == null) {
-            try {
+            System.setProperty("java.util.logging.manager", OpenEJBLogManager.class.getName());
+        }
+
+        try {
+            if (System.getProperty("openjpa.Log") == null) {
                 JuliLogStreamFactory.class.getClassLoader().loadClass("org.apache.openjpa.lib.log.LogFactoryAdapter");
                 System.setProperty("openjpa.Log", "org.apache.openejb.openjpa.JULOpenJPALogFactory");
-            } catch (Exception ignored) {
-                // no-op: openjpa is not at the classpath so don't trigger it loading with our logger
             }
-            System.setProperty("java.util.logging.manager", OpenEJBLogManager.class.getName());
+        } catch (Exception ignored) {
+            // no-op: openjpa is not at the classpath so don't trigger it loading with our logger
         }
     }