Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1243816 - in /cxf/branches/2.3.x-fixes: ./
 common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
Date: Tue, 14 Feb 2012 08:15:12 -0000
To: commits@cxf.apache.org
From: ningjiang@apache.org
Message-Id: <20120214081512.2CAF0238889B@eris.apache.org>

Author: ningjiang
Date: Tue Feb 14 08:15:11 2012
New Revision: 1243816

URL: http://svn.apache.org/viewvc?rev=1243816&view=rev
Log:
Merged revisions 1243815 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1243815 | ningjiang | 2012-02-14 16:10:51 +0800 (Tue, 14 Feb 2012) | 9 lines
  
  Merged revisions 1243795 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1243795 | ningjiang | 2012-02-14 15:06:36 +0800 (Tue, 14 Feb 2012) | 1 line
    
    CXF-4105 Fixed the mapping issue of Slf4jLogger
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 08:15:11 2012
@@ -1,3 +1,3 @@
-/cxf/branches/2.4.x-fixes:1235732,1236170,1236646,1239371,1240148,1240260,1240347,1241413,1242736
-/cxf/branches/2.5.x-fixes:1235731,1236169,1236643,1239368,1240147,1240255,1241412,1242734
+/cxf/branches/2.4.x-fixes:1235732,1236170,1236646,1239371,1240148,1240260,1240347,1241413,1242736,1243815
+/cxf/branches/2.5.x-fixes:1235731,1236169,1236643,1239368,1240147,1240255,1241412,1242734,1243795
 /cxf/trunk:1235730,1236166,1236624,1239365,1240136,1240252,1241195,1242729

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java?rev=1243816&r1=1243815&r2=1243816&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java (original)
+++ cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java Tue Feb 14 08:15:11 2012
@@ -66,7 +66,7 @@ public class Slf4jLogger extends Abstrac
         Level level;
         // Verify from the wider (trace) to the narrower (error)
         if (logger.isTraceEnabled()) {
-            level = Level.FINER; // FINEST
+            level = Level.FINEST;
         } else if (logger.isDebugEnabled()) {
             // map to the lowest between FINER, FINE and CONFIG
             level = Level.FINER;
@@ -114,7 +114,7 @@ public class Slf4jLogger extends Abstrac
             if (locationAwareLogger == null) {
                 logger.trace(msg, t);
             } else {
-                locationAwareLogger.log(null, FQCN, LocationAwareLogger.TRACE_INT, msg, null, t);
+                locationAwareLogger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, msg, null, t);
             }
         } else if (Level.FINEST.equals(level)) {
             if (locationAwareLogger == null) {