Author: dkulp
Date: Mon Jan 26 15:57:38 2009
New Revision: 737716
URL: http://svn.apache.org/viewvc?rev=737716&view=rev
Log:
Merged revisions 737032 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r737032 | seanoc | 2009-01-23 09:40:09 -0500 (Fri, 23 Jan 2009) | 3 lines
CXF-1955 WHICH_JARS text file does not mention commons-collections.jar
CXF-1981 Inconsistent use of logger delegation via LogUtils.
Removed use of DOM from PrettyLoggingOutInterceptor, added test.
........
Added:
cxf/branches/2.1.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java
- copied unchanged from r737032,
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 26 15:57:38 2009
@@ -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,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737046,737124,737246
+/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,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737124,737246
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java?rev=737716&r1=737715&r2=737716&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
(original)
+++
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
Mon Jan 26 15:57:38 2009
@@ -45,7 +45,7 @@
public void log(LogRecord record) {
if (isLoggable(record.getLevel())) {
- internalLog(record);
+ doLog(record);
}
}
Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS?rev=737716&r1=737715&r2=737716&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS Mon
Jan 26 15:57:38 2009
@@ -29,7 +29,8 @@
- The above jars
- jaxb-xjc.jar
- velocity.jar
-- velocity-dep.jar
+- commons-collections.jar
+- commons-lang.jar
For JAX-WS support:
- geronimo-ws-metadata.jar [6]
Modified:
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java?rev=737716&r1=737715&r2=737716&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java
Mon Jan 26 15:57:38 2009
@@ -19,11 +19,20 @@
package org.apache.cxf.interceptor;
+
import java.io.OutputStream;
-import java.io.StringWriter;
+import java.io.PrintWriter;
+
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.bootstrap.DOMImplementationRegistry;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSSerializer;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.io.CacheAndWriteOutputStream;
import org.apache.cxf.io.CachedOutputStream;
@@ -31,10 +40,7 @@
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
-import org.jdom.Document;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+
/**
*
@@ -42,13 +48,13 @@
public class PrettyLoggingOutInterceptor extends AbstractPhaseInterceptor {
private static final Logger LOG =
LogUtils.getL7dLogger(PrettyLoggingOutInterceptor.class);
+ private PrintWriter writer;
- private SAXBuilder saxBuilder = new SAXBuilder();
- private XMLOutputter xmlOutputter = new XMLOutputter();
- public PrettyLoggingOutInterceptor() {
+ public PrettyLoggingOutInterceptor(PrintWriter w) {
super(Phase.PRE_STREAM);
addBefore(StaxOutInterceptor.class.getName());
+ writer = w;
}
public void handleMessage(Message message) throws Fault {
@@ -66,23 +72,40 @@
newOut.registerCallback(new LoggingCallback());
}
- class LoggingCallback implements CachedOutputStreamCallback {
+ public class LoggingCallback implements CachedOutputStreamCallback {
public void onFlush(CachedOutputStream cos) {
}
public void onClose(CachedOutputStream cos) {
-
+
try {
- Document jdoCument = saxBuilder.build(cos.getInputStream());
- xmlOutputter.setFormat(Format.getPrettyFormat());
- StringWriter writer = new StringWriter();
- xmlOutputter.output(jdoCument, writer);
- LOG.info(writer.getBuffer().toString());
+ DOMImplementationRegistry registry =
DOMImplementationRegistry.newInstance();
+ DOMImplementationLS domLS = (DOMImplementationLS)
registry.getDOMImplementation("LS");
+ LSParser lsParser =
domLS.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
+
+ LSInput lsInput = domLS.createLSInput();
+ lsInput.setByteStream(cos.getInputStream());
+ org.w3c.dom.Document doc = lsParser.parse(lsInput);
+
+ LSSerializer lsSerializer = domLS.createLSSerializer();
+ DOMConfiguration config = lsSerializer.getDomConfig();
+ config.setParameter("format-pretty-print", true);
+
+ String prettyStr =
lsSerializer.writeToString(doc.getDocumentElement());
+ if (writer != null) {
+ writer.println(prettyStr);
+ writer.close();
+ } else if (LOG.isLoggable(Level.INFO)) {
+ System.out.println("writer is null " + prettyStr);
+ LOG.info(prettyStr);
+ }
+
} catch (Exception e) {
- LOG.severe("fatal parsing the SOAP message " + e.getMessage());
+ e.printStackTrace();
}
+
}
}
}
\ No newline at end of file
