cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1128035 - in /cxf/trunk: api/src/main/java/org/apache/cxf/phase/ rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/ rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/ rt/core/src/main/java/org/apache/c...
Date Thu, 26 May 2011 18:58:56 GMT
Author: dkulp
Date: Thu May 26 18:58:55 2011
New Revision: 1128035

URL: http://svn.apache.org/viewvc?rev=1128035&view=rev
Log:
[CXF-3514] Start splitting the PRE_PROTOCOL phase to reduce the number
of interceptors that live in it and help make sure the interceptors are
all run in an order that actually will work.
(Note to self: Need to run TCK to verify this change)

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java
    cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptor.java
    cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
    cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java Thu May 26 18:58:55 2011
@@ -36,6 +36,7 @@ public class Phase implements Comparable
     public static final String POST_MARSHAL = "post-marshal";
     public static final String MARSHAL_ENDING = "marshal-ending";
     public static final String PRE_PROTOCOL = "pre-protocol";
+    public static final String PRE_PROTOCOL_FRONTEND = "pre-protocol-frontend";
     public static final String PRE_PROTOCOL_ENDING = "pre-protocol-ending";
     public static final String USER_PROTOCOL = "user-protocol";
     public static final String USER_PROTOCOL_ENDING = "user-protocol-ending";

Modified: cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptor.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptor.java
(original)
+++ cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptor.java
Thu May 26 18:58:55 2011
@@ -43,7 +43,7 @@ public class JBIOperationInInterceptor e
     private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
 
     public JBIOperationInInterceptor() {
-        super(Phase.PRE_PROTOCOL);
+        super(Phase.PRE_PROTOCOL_FRONTEND);
     }
 
     public void handleMessage(JBIMessage message) throws Fault {

Modified: cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java
(original)
+++ cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptorTest.java
Thu May 26 18:58:55 2011
@@ -50,7 +50,7 @@ public class JBIOperationInInterceptorTe
     @Test
     public void testPhase() throws Exception {
         PhaseInterceptor<JBIMessage> interceptor = new JBIOperationInInterceptor();
-        assertEquals(Phase.PRE_PROTOCOL, interceptor.getPhase());
+        assertEquals(Phase.PRE_PROTOCOL_FRONTEND, interceptor.getPhase());
     }
     
     @Test

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java Thu May 26
18:58:55 2011
@@ -63,6 +63,7 @@ public class PhaseManagerImpl implements
         inPhases.add(new Phase(Phase.POST_STREAM, ++i * 1000));
         inPhases.add(new Phase(Phase.READ, ++i * 1000));
         inPhases.add(new Phase(Phase.PRE_PROTOCOL, ++i * 1000));
+        inPhases.add(new Phase(Phase.PRE_PROTOCOL_FRONTEND, ++i * 1000));
         inPhases.add(new Phase(Phase.USER_PROTOCOL, ++i * 1000));
         inPhases.add(new Phase(Phase.POST_PROTOCOL, ++i * 1000));
         inPhases.add(new Phase(Phase.UNMARSHAL, ++i * 1000));
@@ -88,6 +89,7 @@ public class PhaseManagerImpl implements
         outPhases.add(new Phase(Phase.PRE_STREAM, ++i * 1000));
 
         outPhases.add(new Phase(Phase.PRE_PROTOCOL, ++i * 1000));
+        outPhases.add(new Phase(Phase.PRE_PROTOCOL_FRONTEND, ++i * 1000));
 
         outPhases.add(new Phase(Phase.WRITE, ++i * 1000));
         outPhases.add(new Phase(Phase.PRE_MARSHAL, ++i * 1000));

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
Thu May 26 18:58:55 2011
@@ -32,7 +32,7 @@ public class LogicalHandlerFaultInInterc
     extends AbstractJAXWSHandlerInterceptor<Message> {
 
     public LogicalHandlerFaultInInterceptor(Binding binding) {
-        super(binding, Phase.PRE_PROTOCOL);
+        super(binding, Phase.PRE_PROTOCOL_FRONTEND);
         addAfter(SOAPHandlerFaultInInterceptor.class.getName());       
     }
 

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
Thu May 26 18:58:55 2011
@@ -25,8 +25,6 @@ import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.ws.Binding;
 
-import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
-import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.InterceptorChain;
 import org.apache.cxf.interceptor.OutgoingChainInterceptor;
@@ -44,9 +42,7 @@ public class LogicalHandlerInInterceptor
     extends AbstractJAXWSHandlerInterceptor<Message> {
 
     public LogicalHandlerInInterceptor(Binding binding) {
-        super(binding, Phase.PRE_PROTOCOL);
-        addAfter(MustUnderstandInterceptor.class.getName());
-        addAfter(SAAJOutInterceptor.class.getName());
+        super(binding, Phase.PRE_PROTOCOL_FRONTEND);
         addAfter(SOAPHandlerInterceptor.class.getName());
     }
 

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
Thu May 26 18:58:55 2011
@@ -48,7 +48,7 @@ public class SOAPHandlerFaultInIntercept
         SoapInterceptor {
 
     public SOAPHandlerFaultInInterceptor(Binding binding) {
-        super(binding, Phase.PRE_PROTOCOL);
+        super(binding, Phase.PRE_PROTOCOL_FRONTEND);
     }
 
     public Set<URI> getRoles() {

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
Thu May 26 18:58:55 2011
@@ -40,12 +40,10 @@ import org.apache.cxf.binding.soap.Heade
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
-import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
 import org.apache.cxf.binding.soap.interceptor.SoapInterceptor;
 import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.StaxOutInterceptor;
 import org.apache.cxf.jaxws.handler.AbstractProtocolHandlerInterceptor;
 import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
 import org.apache.cxf.phase.Phase;
@@ -64,10 +62,7 @@ public class SOAPHandlerFaultOutIntercep
     };
     
     public SOAPHandlerFaultOutInterceptor(Binding binding) {
-        super(binding, Phase.PRE_PROTOCOL);
-        addAfter(MustUnderstandInterceptor.class.getName());
-        addAfter(StaxOutInterceptor.class.getName());
-        addAfter(SAAJOutInterceptor.class.getName());
+        super(binding, Phase.PRE_PROTOCOL_FRONTEND);
     }
 
     public Set<URI> getRoles() {

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
Thu May 26 18:58:55 2011
@@ -46,7 +46,6 @@ import javax.xml.ws.handler.soap.SOAPMes
 import org.apache.cxf.binding.soap.HeaderUtil;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
-import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
 import org.apache.cxf.binding.soap.interceptor.SoapInterceptor;
 import org.apache.cxf.binding.soap.interceptor.SoapPreProtocolOutInterceptor;
 import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
@@ -83,9 +82,7 @@ public class SOAPHandlerInterceptor exte
     };
 
     public SOAPHandlerInterceptor(Binding binding) {
-        super(binding, Phase.PRE_PROTOCOL);
-        addAfter(MustUnderstandInterceptor.class.getName());
-        addAfter(SAAJOutInterceptor.class.getName());
+        super(binding, Phase.PRE_PROTOCOL_FRONTEND);
     }
 
     public Set<URI> getRoles() {

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
Thu May 26 18:58:55 2011
@@ -99,7 +99,7 @@ public class LogicalHandlerInterceptorTe
 
         control.replay();
         LogicalHandlerInInterceptor li = new LogicalHandlerInInterceptor(binding);
-        assertEquals("unexpected phase", "pre-protocol", li.getPhase());
+        assertEquals("unexpected phase", "pre-protocol-frontend", li.getPhase());
         li.handleMessage(message);
         control.verify();
     }

Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=1128035&r1=1128034&r2=1128035&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Thu
May 26 18:58:55 2011
@@ -96,7 +96,6 @@ public class MAPCodec extends AbstractSo
      */
     public MAPCodec() {
         super(Phase.PRE_PROTOCOL);
-        addBefore("org.apache.cxf.jaxws.handler.soap.SOAPHandlerInterceptor");
         transformer = new VersionTransformer(this);
     } 
 



Mime
View raw message