You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/12/13 20:12:44 UTC

svn commit: r603989 - in /incubator/cxf/branches/2.0.x-fixes: ./ api/src/main/java/org/apache/cxf/phase/ rt/core/src/main/java/org/apache/cxf/interceptor/

Author: dkulp
Date: Thu Dec 13 11:12:42 2007
New Revision: 603989

URL: http://svn.apache.org/viewvc?rev=603989&view=rev
Log:
Merged revisions 601868 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r601868 | dkulp | 2007-12-06 16:51:40 -0500 (Thu, 06 Dec 2007) | 2 lines
  
  [CXF-1262] Allow better spring configuration of interceptors
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java?rev=603989&r1=603988&r2=603989&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java Thu Dec 13 11:12:42 2007
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.phase;
 
+import java.util.Collection;
 import java.util.Set;
 
 import javax.xml.stream.XMLStreamReader;
@@ -41,6 +42,21 @@
         phase = p;
     }
 
+    public void setBefore(Collection<String> i) {
+        before.clear();
+        before.addAll(i);
+    }
+    public void setAfter(Collection<String> i) {
+        after.clear();
+        after.addAll(i);
+    }
+    public void addBefore(Collection<String> i) {
+        before.addAll(i);
+    }
+    public void addAfter(Collection<String> i) {
+        after.addAll(i);
+    }
+    
     public void addBefore(String i) {
         before.add(i);
     }

Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java?rev=603989&r1=603988&r2=603989&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java Thu Dec 13 11:12:42 2007
@@ -46,6 +46,10 @@
     public LoggingInInterceptor() {
         super(Phase.RECEIVE);
     }
+    
+    public LoggingInInterceptor(String phase) {
+        super(phase);
+    }
 
     public LoggingInInterceptor(int lim) {
         this();
@@ -55,6 +59,14 @@
     public LoggingInInterceptor(PrintWriter w) {
         this();
         this.writer = w;
+    }
+    
+    public void setPrintWriter(PrintWriter w) {
+        writer = w;
+    }
+    
+    public PrintWriter getPrintWriter() {
+        return writer;
     }
     
     public void setLimit(int lim) {

Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java?rev=603989&r1=603988&r2=603989&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java Thu Dec 13 11:12:42 2007
@@ -53,7 +53,7 @@
     }
 
     public String toString() {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append(heading);
         buffer.append("\nEncoding: ");
         buffer.append(encoding);