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

[rm...@apache.org]

Author: rmannibucau
Date: Mon Jan 23 16:44:57 2012
New Revision: 1234891

URL: http://svn.apache.org/viewvc?rev=1234891&view=rev
Log:
OPENEJB-1739 embedded logging should use a short format when the remote/production logging should be more complete

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=1234891&r1=1234890&r2=1234891&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 Mon Jan 23 16:44:57 2012
@@ -16,9 +16,6 @@
  */
 package org.apache.openejb.util;
 
-import org.apache.openejb.assembler.classic.WebAppBuilder;
-import org.apache.openejb.loader.SystemInstance;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -39,10 +36,11 @@ public class JuliLogStreamFactory implem
     }
 
     static {
+        final boolean tomee = is("org.apache.tomee.catalina.TomcatLoader");
+        final boolean embedded = is("org.apache.tomee.embedded.Container");
+
         // if embedded case enhance a bit logging if not set
-        if (SystemInstance.get().getComponent(WebAppBuilder.class) == null
-                || System.getProperty("tomee.ejbcontainer.http.port") != null
-                || System.getProperty("tomee.arquillian.http") != null) {
+        if (!tomee || embedded) {
             final Class<LogCategory> clazz = LogCategory.class;
             final List<String> loggerNames = new ArrayList<String>();
             final Enumeration<String> names = LogManager.getLogManager().getLoggerNames();
@@ -77,4 +75,13 @@ public class JuliLogStreamFactory implem
             }
         }
     }
+
+    private static boolean is(String classname) {
+        try {
+            JuliLogStreamFactory.class.getClassLoader().loadClass(classname);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }