You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/12/02 15:12:51 UTC
svn commit: r1209501 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
Author: rmannibucau
Date: Fri Dec 2 14:12:51 2011
New Revision: 1209501
URL: http://svn.apache.org/viewvc?rev=1209501&view=rev
Log:
trying to merge logging between openejb and cxf (managing slf4j)
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1209501&r1=1209500&r2=1209501&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java Fri Dec 2 14:12:51 2011
@@ -62,7 +62,9 @@ public class Logger {
try {
// ensure Log4j is in the CP
Logger.class.getClassLoader().loadClass("org.slf4j.LoggerFactory");
-
+ if (!System.getProperties().containsKey("org.apache.cxf.Logger")) {
+ System.setProperty("org.apache.cxf.Logger", "org.apache.cxf.common.logging.Slf4jLogger");
+ }
factory = new Slf4jLogStreamFactory();
} catch (NoClassDefFoundError e) {
// slf4j not in classpath
@@ -76,7 +78,9 @@ public class Logger {
try {
// ensure Log4j is in the CP
Logger.class.getClassLoader().loadClass("org.apache.log4j.Layout");
-
+ if (!System.getProperties().containsKey("org.apache.cxf.Logger")) {
+ System.setProperty("org.apache.cxf.Logger", "org.apache.cxf.common.logging.Log4jLogger");
+ }
factory = new Log4jLogStreamFactory();
} catch (NoClassDefFoundError e) {
//log4j not in classpath
@@ -88,10 +92,6 @@ public class Logger {
// else JUL
if (factory == null) {
factory = new JuliLogStreamFactory();
- } else { // we suppose we use log4j with slf4j since it is not a drama if it is not the case
- if (!System.getProperties().containsKey("org.apache.cxf.Logger")) {
- System.setProperty("org.apache.cxf.Logger", "org.apache.cxf.common.logging.Log4jLogger");
- }
}
logStreamFactory = factory;