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 2011/02/15 06:32:48 UTC
svn commit: r1070780 - in /cxf/branches/2.3.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/interceptor/
Author: ningjiang
Date: Tue Feb 15 05:32:48 2011
New Revision: 1070780
URL: http://svn.apache.org/viewvc?rev=1070780&view=rev
Log:
Merged revisions 1070778 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1070778 | ningjiang | 2011-02-15 13:10:53 +0800 (Tue, 15 Feb 2011) | 1 line
CXF-3314 Separate loggers for LoggingInInterceptor and LoggingOutInterceptor
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 05:32:48 2011
@@ -1 +1 @@
-/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069138,1069249,1069318,1069492,1069500,1069716,1069720,1069814,1070034,1070430,1070471,1070558
+/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069138,1069249,1069318,1069492,1069500,1069716,1069720,1069814,1070034,1070430,1070471,1070558,1070778
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java?rev=1070780&r1=1070779&r2=1070780&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java Tue Feb 15 05:32:48 2011
@@ -31,7 +31,6 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.io.CachedOutputStream;
@@ -44,19 +43,18 @@ import org.apache.cxf.phase.AbstractPhas
*/
public abstract class AbstractLoggingInterceptor extends AbstractPhaseInterceptor<Message> {
- protected static final Logger LOG = LogUtils.getL7dLogger(AbstractLoggingInterceptor.class);
-
protected int limit = 100 * 1024;
protected PrintWriter writer;
protected boolean prettyLogging;
-
public AbstractLoggingInterceptor(String phase) {
super(phase);
}
public AbstractLoggingInterceptor(String id, String phase) {
super(id, phase);
}
+
+ protected abstract Logger getLogger();
public void setOutputLocation(String s) {
if (s == null || "<logger>".equals(s)) {
@@ -71,7 +69,7 @@ public abstract class AbstractLoggingInt
File file = new File(uri);
writer = new PrintWriter(new FileWriter(file, true), true);
} catch (Exception ex) {
- LOG.log(Level.WARNING, "Error configuring log location " + s, ex);
+ getLogger().log(Level.WARNING, "Error configuring log location " + s, ex);
}
}
}
@@ -147,8 +145,8 @@ public abstract class AbstractLoggingInt
message = transform(message);
if (writer != null) {
writer.println(message);
- } else if (LOG.isLoggable(Level.INFO)) {
- LOG.info(message);
+ } else if (getLogger().isLoggable(Level.INFO)) {
+ getLogger().info(message);
}
}
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java?rev=1070780&r1=1070779&r2=1070780&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java Tue Feb 15 05:32:48 2011
@@ -21,8 +21,10 @@ package org.apache.cxf.interceptor;
import java.io.InputStream;
import java.io.PrintWriter;
import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Message;
@@ -34,6 +36,7 @@ import org.apache.cxf.phase.Phase;
*/
@NoJSR250Annotations
public class LoggingInInterceptor extends AbstractLoggingInterceptor {
+ private static final Logger LOG = LogUtils.getLogger(LoggingInInterceptor.class);
public LoggingInInterceptor() {
super(Phase.RECEIVE);
@@ -66,7 +69,7 @@ public class LoggingInInterceptor extend
}
public void handleMessage(Message message) throws Fault {
- if (writer != null || LOG.isLoggable(Level.INFO)) {
+ if (writer != null || getLogger().isLoggable(Level.INFO)) {
logging(message);
}
}
@@ -139,4 +142,9 @@ public class LoggingInInterceptor extend
}
log(buffer.toString());
}
+
+ @Override
+ protected Logger getLogger() {
+ return LOG;
+ }
}
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java?rev=1070780&r1=1070779&r2=1070780&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java Tue Feb 15 05:32:48 2011
@@ -22,8 +22,10 @@ package org.apache.cxf.interceptor;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.io.CacheAndWriteOutputStream;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.io.CachedOutputStreamCallback;
@@ -35,6 +37,7 @@ import org.apache.cxf.phase.Phase;
*/
@NoJSR250Annotations
public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
+ private static final Logger LOG = LogUtils.getLogger(LoggingOutInterceptor.class);
private static final String LOG_SETUP = LoggingOutInterceptor.class.getName() + ".log-setup";
public LoggingOutInterceptor(String phase) {
@@ -60,7 +63,7 @@ public class LoggingOutInterceptor exten
if (os == null) {
return;
}
- if (LOG.isLoggable(Level.INFO) || writer != null) {
+ if (getLogger().isLoggable(Level.INFO) || writer != null) {
// Write the output while caching it for the log message
boolean hasLogged = message.containsKey(LOG_SETUP);
if (!hasLogged) {
@@ -154,4 +157,10 @@ public class LoggingOutInterceptor exten
}
}
+ @Override
+ protected Logger getLogger() {
+ return LOG;
+
+ }
+
}