You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/03/16 15:46:46 UTC
svn commit: r1301560 - in /cxf/branches/2.4.x-fixes: ./
common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
Author: ningjiang
Date: Fri Mar 16 14:46:46 2012
New Revision: 1301560
URL: http://svn.apache.org/viewvc?rev=1301560&view=rev
Log:
Merged revisions 1301549 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1301549 | ningjiang | 2012-03-16 22:38:18 +0800 (Fri, 16 Mar 2012) | 9 lines
Merged revisions 1301539 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1301539 | ningjiang | 2012-03-16 22:18:01 +0800 (Fri, 16 Mar 2012) | 1 line
CXF-4180 LogUtils should default to CXF's Slf4jLogger if it can't find Log4J or JCL driver
........
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 14:46:46 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1299092,1299637,1299725,1300270,1300343,1300407-1300533,1300536,1300560,1301205
-/cxf/trunk:1298470,1298830,1298832,1299086,1299635,1299682,1299747,1300342,1300518,1300530,1300555,1301201
+/cxf/branches/2.5.x-fixes:1299092,1299637,1299725,1300270,1300343,1300407-1300533,1300536,1300560,1301205,1301549
+/cxf/trunk:1298470,1298830,1298832,1299086,1299635,1299682,1299747,1300342,1300518,1300530,1300555,1301201,1301539
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=1301560&r1=1301559&r2=1301560&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java (original)
+++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Fri Mar 16 14:46:46 2012
@@ -96,17 +96,8 @@ public final class LogUtils {
}
if (StringUtils.isEmpty(cname)) {
Class.forName("org.slf4j.impl.StaticLoggerBinder");
- Class<?> cls = Class.forName("org.slf4j.LoggerFactory");
- Class<?> fcls = cls.getMethod("getILoggerFactory").invoke(null).getClass();
- if (fcls.getName().contains("Log4j")) {
- cname = "org.apache.cxf.common.logging.Log4jLogger";
- } else if (fcls.getName().contains("JCL")) {
- cls = Class.forName("org.apache.commons.logging.LogFactory");
- fcls = cls.getMethod("getFactory").invoke(null).getClass();
- if (fcls.getName().contains("Log4j")) {
- cname = "org.apache.cxf.common.logging.Log4jLogger";
- }
- }
+ // using the Slf4jLogger directly
+ cname = "org.apache.cxf.common.logging.Slf4jLogger";
}
if (!StringUtils.isEmpty(cname)) {
try {