Author: rmannibucau
Date: Mon Aug 13 07:52:38 2012
New Revision: 1372299
URL: http://svn.apache.org/viewvc?rev=1372299&view=rev
Log:
avoiding to trigger OWB logger factory if not mandatory in LogStreamFactory
()^[[Dleads to issues when we don't need OWB like our openejb-core usage in
some arquillian adapters
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.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=1372299&r1=1372298&r2=1372299&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 Aug 13 07:52:38 2012
@@ -60,7 +60,7 @@ public class JuliLogStreamFactory implem
// no-op: openjpa is not at the classpath so don't trigger it
loading with our logger
}
- System.setProperty("openwebbeans.logging.factory",
JULLoggerFactory.class.getName());
+ System.setProperty("openwebbeans.logging.factory",
"org.apache.webbeans.logger.JULLoggerFactory");
}
public static boolean isNotIDE() {
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1372299&r1=1372298&r2=1372299&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
Mon Aug 13 07:52:38 2012
@@ -53,7 +53,7 @@ public class Log4jLogStreamFactory imple
// The fall back here is that if log4j.configuration system
property is set, then that configuration file will be used.
e.printStackTrace();
}
- System.setProperty("openwebbeans.logging.factory",
Log4jLoggerFactory.class.getName());
+ System.setProperty("openwebbeans.logging.factory",
"org.apache.openejb.cdi.logging.Log4jLoggerFactory");
}
private void configureInternal() throws IOException {
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java?rev=1372299&r1=1372298&r2=1372299&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java
Mon Aug 13 07:52:38 2012
@@ -32,7 +32,7 @@ public class Slf4jLogStreamFactory imple
public Slf4jLogStreamFactory() {
System.setProperty("openjpa.Log", "slf4j");
System.setProperty("org.apache.cxf.Logger",
"org.apache.cxf.common.logging.Slf4jLogger");
- System.setProperty("openwebbeans.logging.factory",
Slf4jLoggerFactory.class.getName());
+ System.setProperty("openwebbeans.logging.factory",
"org.apache.openejb.cdi.logging.Slf4jLoggerFactory");
// no need to configure internals:
// by default we are using JUL
