cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r738533 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/logging/ rt/core/src/main/java/org/apache/cxf/interceptor/ rt/core/src/test/java/org/apache/cxf/interceptor/
Date Wed, 28 Jan 2009 16:51:33 GMT
Author: dkulp
Date: Wed Jan 28 16:51:32 2009
New Revision: 738533

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

................
  r737716 | dkulp | 2009-01-26 10:57:38 -0500 (Mon, 26 Jan 2009) | 11 lines
  
  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.0.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java
      - copied unchanged from r737716, cxf/branches/2.1.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java
Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
    cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 16:51:32 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732827,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737124
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732827,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737124
 /incubator/cxf/trunk:434594-651668

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

Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java?rev=738533&r1=738532&r2=738533&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
(original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
Wed Jan 28 16:51:32 2009
@@ -45,7 +45,7 @@
 
     public void log(LogRecord record) {
         if (isLoggable(record.getLevel())) {
-            internalLog(record);
+            doLog(record);
         }
     }
 

Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java?rev=738533&r1=738532&r2=738533&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java
Wed Jan 28 16:51:32 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



Mime
View raw message