Author: ningjiang
Date: Fri Oct 31 21:17:19 2008
New Revision: 709644
URL: http://svn.apache.org/viewvc?rev=709644&view=rev
Log:
Merged revisions 708554 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r708554 | bimargulies | 2008-10-28 20:30:06 +0800 (Tue, 28 Oct 2008) | 2 lines
Apply patch for CXF-1887. Thanks!
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 31 21:17:19 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,709353-709354
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java?rev=709644&r1=709643&r2=709644&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
Fri Oct 31 21:17:19 2008
@@ -77,6 +77,18 @@
newOut.registerCallback(new LoggingCallback(message, os));
}
}
+
+ /**
+ * Transform the string before display. The implementation in this class
+ * does nothing. Override this method if you want to change the contents
of the
+ * logged message before it is delivered to the output.
+ * For example, you can use this to masking out sensitive information.
+ * @param originalLogString the raw log message.
+ * @return transformed data
+ */
+ protected String transform(String originalLogString) {
+ return originalLogString;
+ }
class LoggingCallback implements CachedOutputStreamCallback {
@@ -126,9 +138,9 @@
}
if (writer != null) {
- writer.println(buffer.toString());
+ writer.println(transform(buffer.toString()));
} else if (LOG.isLoggable(Level.INFO)) {
- LOG.info(buffer.toString());
+ LOG.info(transform(buffer.toString()));
}
try {
//empty out the cache
@@ -140,5 +152,6 @@
message.setContent(OutputStream.class,
origStream);
}
- }
+ }
+
}
