You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2017/02/24 14:04:01 UTC
cxf git commit: [CXF-7254] Add back PrintWriter support as it is
needed in the tests
Repository: cxf
Updated Branches:
refs/heads/master 917a3ef2e -> 9e118864a
[CXF-7254] Add back PrintWriter support as it is needed in the tests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9e118864
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9e118864
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9e118864
Branch: refs/heads/master
Commit: 9e118864a7f41988de609877c1e54e287277ffba
Parents: 917a3ef
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Feb 24 15:03:55 2017 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Feb 24 15:03:55 2017 +0100
----------------------------------------------------------------------
.../org/apache/cxf/ext/logging/LoggingInInterceptor.java | 8 ++++++++
.../org/apache/cxf/ext/logging/LoggingOutInterceptor.java | 6 ++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e118864/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
index 55839ca..7f65790 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
@@ -19,6 +19,7 @@
package org.apache.cxf.ext.logging;
import java.io.IOException;
+import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
@@ -28,6 +29,7 @@ import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.ext.logging.event.DefaultLogEventMapper;
import org.apache.cxf.ext.logging.event.LogEvent;
import org.apache.cxf.ext.logging.event.LogEventSender;
+import org.apache.cxf.ext.logging.event.PrintWriterEventSender;
import org.apache.cxf.ext.logging.slf4j.Slf4jVerboseEventSender;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.io.CachedOutputStream;
@@ -59,9 +61,15 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
public LoggingInInterceptor() {
this(new Slf4jVerboseEventSender());
}
+
+ public LoggingInInterceptor(PrintWriter writer) {
+ this(new PrintWriterEventSender(writer));
+ }
+
public LoggingInInterceptor(LogEventSender sender) {
super(Phase.PRE_INVOKE, sender);
}
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
Collection<PhaseInterceptor<? extends Message>> ret = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e118864/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
index 7a0f6a6..93a7a0b 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ext.logging;
import java.io.FilterWriter;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
@@ -29,6 +30,7 @@ import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.ext.logging.event.DefaultLogEventMapper;
import org.apache.cxf.ext.logging.event.LogEvent;
import org.apache.cxf.ext.logging.event.LogEventSender;
+import org.apache.cxf.ext.logging.event.PrintWriterEventSender;
import org.apache.cxf.ext.logging.slf4j.Slf4jVerboseEventSender;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.StaxOutInterceptor;
@@ -47,6 +49,10 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
public LoggingOutInterceptor() {
this(new Slf4jVerboseEventSender());
}
+
+ public LoggingOutInterceptor(PrintWriter writer) {
+ this(new PrintWriterEventSender(writer));
+ }
public LoggingOutInterceptor(LogEventSender sender) {
super(Phase.PRE_STREAM, sender);