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/06/11 20:54:17 UTC
svn commit: r546222 [2/3] - in /incubator/cxf/trunk:
api/src/main/java/org/apache/cxf/phase/
api/src/test/java/org/apache/cxf/phase/
common/common/src/main/java/org/apache/cxf/common/util/
rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ r...
Modified: incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIFaultInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIFaultInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIFaultInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -45,7 +45,8 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JBIFaultInInterceptor.class);
public JBIFaultInInterceptor() {
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
+ addBefore("*");
}
public void handleMessage(JBIMessage message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIFaultOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIFaultOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIFaultOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -42,7 +42,7 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JBIFaultOutInterceptor.class);
public JBIFaultOutInterceptor() {
- setPhase(Phase.MARSHAL);
+ super(Phase.MARSHAL);
}
public void handleMessage(JBIMessage message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIOperationInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -43,8 +43,7 @@
private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
public JBIOperationInInterceptor() {
- super();
- setPhase(Phase.PRE_PROTOCOL);
+ super(Phase.PRE_PROTOCOL);
}
public void handleMessage(JBIMessage message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -54,7 +54,7 @@
private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
public JBIWrapperInInterceptor() {
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/interceptor/JBIWrapperOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -42,7 +42,7 @@
private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
public JBIWrapperOutInterceptor() {
- setPhase(Phase.MARSHAL);
+ super(Phase.MARSHAL);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -35,8 +35,7 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ObjectDispatchInInterceptor.class);
public ObjectDispatchInInterceptor() {
- super();
- setPhase(Phase.READ);
+ super(Phase.READ);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -29,8 +29,7 @@
public class ObjectDispatchOutInterceptor extends AbstractPhaseInterceptor<Message> {
public ObjectDispatchOutInterceptor() {
- super();
- setPhase(Phase.SETUP);
+ super(Phase.SETUP);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java Mon Jun 11 11:54:11 2007
@@ -34,6 +34,21 @@
public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<SoapMessage>
implements SoapInterceptor {
+ /**
+ * @deprecated
+ */
+ public AbstractSoapInterceptor() {
+ super(null);
+ }
+
+ public AbstractSoapInterceptor(String p) {
+ super(p);
+ }
+ public AbstractSoapInterceptor(String i, String p) {
+ super(i, p);
+ }
+
+
protected boolean isRequestor(org.apache.cxf.message.Message message) {
return Boolean.TRUE.equals(message.containsKey(
org.apache.cxf.message.Message.REQUESTOR_ROLE));
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java Mon Jun 11 11:54:11 2007
@@ -40,8 +40,7 @@
public class EndpointSelectionInterceptor extends AbstractEndpointSelectionInterceptor {
public EndpointSelectionInterceptor() {
- super();
- setPhase(Phase.READ);
+ super(Phase.READ);
getAfter().add(ReadHeadersInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java Mon Jun 11 11:54:11 2007
@@ -44,8 +44,10 @@
private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
public MustUnderstandInterceptor() {
- super();
- setPhase(Phase.PRE_PROTOCOL);
+ super(Phase.PRE_PROTOCOL);
+ }
+ public MustUnderstandInterceptor(String phase) {
+ super(phase);
}
public void handleMessage(SoapMessage soapMessage) {
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -47,8 +47,7 @@
private static final Logger LOG = Logger.getLogger(RPCInInterceptor.class.getName());
public RPCInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
addAfter(URIMappingInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -37,8 +37,7 @@
public class RPCOutInterceptor extends AbstractOutDatabindingInterceptor {
public RPCOutInterceptor() {
- super();
- setPhase(Phase.MARSHAL);
+ super(Phase.MARSHAL);
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java Mon Jun 11 11:54:11 2007
@@ -60,8 +60,11 @@
private Bus bus;
public ReadHeadersInterceptor(Bus b) {
- super();
- setPhase(Phase.READ);
+ super(Phase.READ);
+ bus = b;
+ }
+ public ReadHeadersInterceptor(Bus b, String phase) {
+ super(phase);
bus = b;
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -37,8 +37,7 @@
public Soap11FaultInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
addBefore(ClientFaultConverter.class.getName());
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -44,8 +44,7 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(Soap11FaultOutInterceptor.class);
public Soap11FaultOutInterceptor() {
- super();
- setPhase(Phase.MARSHAL);
+ super(Phase.MARSHAL);
}
public void handleMessage(SoapMessage message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -46,8 +46,7 @@
public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
public Soap12FaultInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
addBefore(ClientFaultConverter.class.getName());
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -44,8 +44,7 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(Soap12FaultOutInterceptor.class);
public Soap12FaultOutInterceptor() {
- super();
- setPhase(Phase.MARSHAL);
+ super(Phase.MARSHAL);
}
public void handleMessage(SoapMessage message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInterceptor.java Mon Jun 11 11:54:11 2007
@@ -37,8 +37,7 @@
public class SoapActionInterceptor extends AbstractSoapInterceptor {
public SoapActionInterceptor() {
- super();
- setPhase(Phase.POST_LOGICAL);
+ super(Phase.POST_LOGICAL);
}
public void handleMessage(SoapMessage message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java Mon Jun 11 11:54:11 2007
@@ -45,8 +45,7 @@
public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
public SoapHeaderInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
addAfter(BareInInterceptor.class.getName());
addAfter(RPCInInterceptor.class.getName());
addAfter(DocLiteralInInterceptor.class.getName());
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -57,8 +57,11 @@
private Bus bus;
public SoapOutInterceptor(Bus b) {
- super();
- setPhase(Phase.WRITE);
+ super(Phase.WRITE);
+ bus = b;
+ }
+ public SoapOutInterceptor(Bus b, String phase) {
+ super(phase);
bus = b;
}
@@ -204,8 +207,7 @@
public class SoapOutEndingInterceptor extends AbstractSoapInterceptor {
public SoapOutEndingInterceptor() {
- super();
- setPhase(Phase.WRITE_ENDING);
+ super(SoapOutEndingInterceptor.class.getName(), Phase.WRITE_ENDING);
}
public void handleMessage(SoapMessage message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -39,8 +39,7 @@
public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
public SoapPreProtocolOutInterceptor() {
- super();
- setPhase(Phase.PRE_STREAM);
+ super(Phase.PRE_STREAM);
getBefore().add(AttachmentOutInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -64,7 +64,10 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(SAAJInInterceptor.class);
public SAAJInInterceptor() {
- setPhase(Phase.PRE_PROTOCOL);
+ super(Phase.PRE_PROTOCOL);
+ }
+ public SAAJInInterceptor(String phase) {
+ super(phase);
}
public void handleMessage(SoapMessage message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -58,7 +58,7 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(SAAJOutInterceptor.class);
public SAAJOutInterceptor() {
- setPhase(Phase.PRE_PROTOCOL);
+ super(Phase.PRE_PROTOCOL);
}
public void handleMessage(SoapMessage message) throws Fault {
@@ -100,8 +100,7 @@
public class SAAJOutEndingInterceptor extends AbstractSoapInterceptor {
public SAAJOutEndingInterceptor() {
- super();
- setPhase(Phase.PRE_PROTOCOL_ENDING);
+ super(SAAJOutEndingInterceptor.class.getName(), Phase.PRE_PROTOCOL_ENDING);
}
public void handleMessage(SoapMessage message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java Mon Jun 11 11:54:11 2007
@@ -57,16 +57,13 @@
Bus bus = BusFactory.getDefaultBus();
- rhi = new ReadHeadersInterceptor(bus);
- rhi.setPhase("phase1");
+ rhi = new ReadHeadersInterceptor(bus, "phase1");
chain.add(rhi);
- mui = new MustUnderstandInterceptor();
- mui.setPhase("phase2");
+ mui = new MustUnderstandInterceptor("phase2");
chain.add(mui);
- dsi = new DummySoapInterceptor();
- dsi.setPhase("phase3");
+ dsi = new DummySoapInterceptor("phase3");
chain.add(dsi);
}
@@ -138,6 +135,13 @@
private Set<URI> roles = new HashSet<URI>();
private Set<QName> understood = new HashSet<QName>();
+
+ public DummySoapInterceptor() {
+ super("");
+ }
+ public DummySoapInterceptor(String phase) {
+ super(phase);
+ }
public void handleMessage(SoapMessage messageParam) {
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java Mon Jun 11 11:54:11 2007
@@ -47,8 +47,7 @@
public void setUp() throws Exception {
super.setUp();
- rhi = new ReadHeadersInterceptor(BusFactory.getDefaultBus());
- rhi.setPhase("phase1");
+ rhi = new ReadHeadersInterceptor(BusFactory.getDefaultBus(), "phase1");
chain.add(rhi);
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java Mon Jun 11 11:54:11 2007
@@ -40,16 +40,13 @@
public void setUp() throws Exception {
super.setUp();
- StaxInInterceptor sii = new StaxInInterceptor();
- sii.setPhase("phase1");
+ StaxInInterceptor sii = new StaxInInterceptor("phase1");
chain.add(sii);
- rhi = new ReadHeadersInterceptor(BusFactory.getDefaultBus());
- rhi.setPhase("phase2");
+ rhi = new ReadHeadersInterceptor(BusFactory.getDefaultBus(), "phase2");
chain.add(rhi);
- soi = new SoapOutInterceptor(BusFactory.getDefaultBus());
- soi.setPhase("phase3");
+ soi = new SoapOutInterceptor(BusFactory.getDefaultBus(), "phase3");
chain.add(soi);
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java Mon Jun 11 11:54:11 2007
@@ -22,9 +22,9 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
import javax.wsdl.Definition;
import javax.wsdl.Service;
@@ -57,7 +57,7 @@
public void setUp() throws Exception {
- List<Phase> phases = new ArrayList<Phase>();
+ SortedSet<Phase> phases = new TreeSet<Phase>();
Phase phase1 = new Phase("phase1", 1);
Phase phase2 = new Phase("phase2", 2);
Phase phase3 = new Phase("phase3", 3);
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java Mon Jun 11 11:54:11 2007
@@ -48,12 +48,10 @@
public void setUp() throws Exception {
super.setUp();
- rhi = new ReadHeadersInterceptor(BusFactory.getDefaultBus());
- rhi.setPhase("phase1");
+ rhi = new ReadHeadersInterceptor(BusFactory.getDefaultBus(), "phase1");
chain.add(rhi);
- saajIntc = new SAAJInInterceptor();
- saajIntc.setPhase("phase2");
+ saajIntc = new SAAJInInterceptor("phase2");
chain.add(saajIntc);
}
Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -42,8 +42,10 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(XMLFaultInInterceptor.class);
public XMLFaultInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ this(Phase.UNMARSHAL);
+ }
+ public XMLFaultInInterceptor(String phase) {
+ super(phase);
addBefore(ClientFaultConverter.class.getName());
}
Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -41,8 +41,10 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(XMLFaultOutInterceptor.class);
public XMLFaultOutInterceptor() {
- super();
- setPhase(Phase.MARSHAL);
+ super(Phase.MARSHAL);
+ }
+ public XMLFaultOutInterceptor(String phase) {
+ super(phase);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -50,8 +50,10 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(XMLMessageInInterceptor.class);
public XMLMessageInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ this(Phase.UNMARSHAL);
+ }
+ public XMLMessageInInterceptor(String phase) {
+ super(phase);
addBefore(DocLiteralInInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -43,8 +43,10 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(XMLMessageOutInterceptor.class);
public XMLMessageOutInterceptor() {
- super();
- setPhase(Phase.MARSHAL);
+ this(Phase.MARSHAL);
+ }
+ public XMLMessageOutInterceptor(String phase) {
+ super(phase);
addAfter(WrappedOutInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java Mon Jun 11 11:54:11 2007
@@ -22,8 +22,8 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
import javax.xml.bind.JAXBContext;
import javax.xml.namespace.QName;
@@ -68,7 +68,7 @@
protected ServiceInfo serviceInfo;
public void setUp() throws Exception {
- List<Phase> phases = new ArrayList<Phase>();
+ SortedSet<Phase> phases = new TreeSet<Phase>();
Phase phase1 = new Phase("phase1", 1);
Phase phase2 = new Phase("phase2", 2);
Phase phase3 = new Phase("phase3", 3);
Modified: incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInterceptorsTest.java Mon Jun 11 11:54:11 2007
@@ -47,15 +47,11 @@
xmlMessage.setContent(OutputStream.class, baos);
xmlMessage.setContent(XMLStreamWriter.class, StaxUtils.createXMLStreamWriter(baos));
xmlMessage.setContent(Exception.class, new Fault(new RuntimeException("dummy exception")));
- XMLFaultOutInterceptor xfo = new XMLFaultOutInterceptor();
- xfo.setPhase("phase1");
+ XMLFaultOutInterceptor xfo = new XMLFaultOutInterceptor("phase1");
chain.add(xfo);
- InHelpInterceptor ih = new InHelpInterceptor();
- ClientFaultConverter cfc = new ClientFaultConverter();
- XMLFaultInInterceptor xfi = new XMLFaultInInterceptor();
- ih.setPhase("phase2");
- cfc.setPhase("phase3");
- xfi.setPhase("phase3");
+ InHelpInterceptor ih = new InHelpInterceptor("phase2");
+ ClientFaultConverter cfc = new ClientFaultConverter("phase3");
+ XMLFaultInInterceptor xfi = new XMLFaultInInterceptor("phase3");
chain.add(ih);
chain.add(cfc);
chain.add(xfi);
@@ -68,6 +64,9 @@
}
private class InHelpInterceptor extends AbstractInDatabindingInterceptor {
+ InHelpInterceptor(String phase) {
+ super(phase);
+ }
public void handleMessage(Message message) {
Modified: incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java Mon Jun 11 11:54:11 2007
@@ -33,12 +33,11 @@
public class XMLMessageInInterceptorTest extends TestBase {
- XMLMessageInInterceptor in = new XMLMessageInInterceptor();
+ XMLMessageInInterceptor in = new XMLMessageInInterceptor("phase1");
DocLiteralInInterceptor docLitIn = new DocLiteralInInterceptor();
public void setUp() throws Exception {
super.setUp();
- in.setPhase("phase1");
chain.add(in);
}
Modified: incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java Mon Jun 11 11:54:11 2007
@@ -52,7 +52,7 @@
XMLStreamWriter writer;
- XMLMessageOutInterceptor out = new XMLMessageOutInterceptor();
+ XMLMessageOutInterceptor out = new XMLMessageOutInterceptor("phase1");
List<Object> params = new ArrayList<Object>();
@@ -68,7 +68,6 @@
public void setUp() throws Exception {
super.setUp();
- out.setPhase("phase1");
chain.add(out);
prepareMessage(params);
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java Mon Jun 11 11:54:11 2007
@@ -31,9 +31,19 @@
public abstract class AbstractEndpointSelectionInterceptor extends AbstractPhaseInterceptor<Message> {
+ /**
+ * @deprecated
+ */
public AbstractEndpointSelectionInterceptor() {
- super();
-
+ super(null);
+ }
+
+
+ public AbstractEndpointSelectionInterceptor(String phase) {
+ super(phase);
+ }
+ public AbstractEndpointSelectionInterceptor(String id, String phase) {
+ super(id, phase);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java Mon Jun 11 11:54:11 2007
@@ -19,7 +19,7 @@
package org.apache.cxf.interceptor;
-import java.util.List;
+import java.util.SortedSet;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -91,7 +91,7 @@
protected abstract boolean isOutboundObserver();
- protected abstract List<Phase> getPhases();
+ protected abstract SortedSet<Phase> getPhases();
protected void initializeInterceptors(Exchange ex, PhaseInterceptorChain chain) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java Mon Jun 11 11:54:11 2007
@@ -52,6 +52,20 @@
private static final ResourceBundle BUNDLE = BundleUtils
.getBundle(AbstractInDatabindingInterceptor.class);
+ /**
+ * @deprecated
+ */
+ public AbstractInDatabindingInterceptor() {
+ super(null, null);
+ }
+
+ public AbstractInDatabindingInterceptor(String phase) {
+ super(phase);
+ }
+ public AbstractInDatabindingInterceptor(String i, String phase) {
+ super(i, phase);
+ }
+
protected boolean isRequestor(Message message) {
return Boolean.TRUE.equals(message.get(Message.REQUESTOR_ROLE));
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java Mon Jun 11 11:54:11 2007
@@ -36,6 +36,20 @@
public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInterceptor<Message> {
+ /**
+ * @deprecated
+ */
+ public AbstractOutDatabindingInterceptor() {
+ super(null);
+ }
+
+ public AbstractOutDatabindingInterceptor(String phase) {
+ super(phase);
+ }
+ public AbstractOutDatabindingInterceptor(String id, String phase) {
+ super(id, phase);
+ }
+
protected boolean isRequestor(Message message) {
return Boolean.TRUE.equals(message.containsKey(Message.REQUESTOR_ROLE));
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -41,8 +41,7 @@
*/
public AttachmentInInterceptor() {
- super();
- setPhase(Phase.RECEIVE);
+ super(Phase.RECEIVE);
}
public void handleMessage(Message message) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -35,9 +35,10 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(AttachmentOutInterceptor.class);
+ private AttachmentOutEndingInterceptor ending = new AttachmentOutEndingInterceptor();
+
public AttachmentOutInterceptor() {
- super();
- setPhase(Phase.PRE_STREAM);
+ super(Phase.PRE_STREAM);
}
public void handleMessage(Message message) {
@@ -61,13 +62,12 @@
message.setContent(AttachmentSerializer.class, serializer);
// Add a final interceptor to write attachements
- message.getInterceptorChain().add(new AttachmentOutEndingInterceptor());
+ message.getInterceptorChain().add(ending);
}
public class AttachmentOutEndingInterceptor extends AbstractPhaseInterceptor<Message> {
public AttachmentOutEndingInterceptor() {
- super();
- setPhase(Phase.PRE_STREAM_ENDING);
+ super(Phase.PRE_STREAM_ENDING);
}
public void handleMessage(Message message) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -57,8 +57,7 @@
}
public BareInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
addAfter(URIMappingInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/BareOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -33,8 +33,7 @@
public class BareOutInterceptor extends AbstractOutDatabindingInterceptor {
public BareOutInterceptor() {
- super();
- setPhase(Phase.MARSHAL);
+ super(Phase.MARSHAL);
}
public void handleMessage(Message message) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java Mon Jun 11 11:54:11 2007
@@ -52,8 +52,10 @@
public class ClientFaultConverter extends AbstractPhaseInterceptor<Message> {
public ClientFaultConverter() {
- super();
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
+ }
+ public ClientFaultConverter(String phase) {
+ super(phase);
}
public void handleMessage(Message msg) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java Mon Jun 11 11:54:11 2007
@@ -19,7 +19,7 @@
package org.apache.cxf.interceptor;
-import java.util.List;
+import java.util.SortedSet;
import org.apache.cxf.Bus;
import org.apache.cxf.message.Message;
@@ -34,7 +34,7 @@
}
@Override
- protected List<Phase> getPhases() {
+ protected SortedSet<Phase> getPhases() {
return getBus().getExtension(PhaseManager.class).getOutPhases();
}
/**
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -56,9 +56,9 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(DocLiteralInInterceptor.class);
public DocLiteralInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
addAfter(URIMappingInterceptor.class.getName());
+ addBefore(WrappedInInterceptor.class.getName());
}
public void handleMessage(Message message) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java Mon Jun 11 11:54:11 2007
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.interceptor;
-import java.util.List;
+import java.util.SortedSet;
import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Endpoint;
@@ -42,7 +42,7 @@
chain.add(getBus().getInFaultInterceptors());
}
- protected List<Phase> getPhases() {
+ protected SortedSet<Phase> getPhases() {
return getBus().getExtension(PhaseManager.class).getInPhases();
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -40,8 +40,7 @@
private static final Logger LOG = LogUtils.getL7dLogger(LoggingInInterceptor.class);
public LoggingInInterceptor() {
- super();
- setPhase(Phase.RECEIVE);
+ super(Phase.RECEIVE);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -21,8 +21,6 @@
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
-import java.util.Collections;
-import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -39,10 +37,10 @@
public class LoggingOutInterceptor extends AbstractPhaseInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(LoggingOutInterceptor.class);
- private Set<String> before = Collections.singleton(StaxOutInterceptor.class.getName());
public LoggingOutInterceptor() {
- setPhase(Phase.PRE_PROTOCOL);
+ super(Phase.PRE_PROTOCOL);
+ addBefore(StaxOutInterceptor.class.getName());
}
public void handleMessage(Message message) throws Fault {
@@ -53,11 +51,6 @@
if (os instanceof AbstractCachedOutputStream) {
((AbstractCachedOutputStream)os).registerCallback(new LoggingCallback());
}
- }
-
- @Override
- public Set<String> getBefore() {
- return before;
}
class LoggingCallback implements CachedOutputStreamCallback {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java Mon Jun 11 11:54:11 2007
@@ -34,10 +34,11 @@
*/
public class MessageSenderInterceptor extends AbstractPhaseInterceptor<Message> {
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(MessageSenderInterceptor.class);
-
+ private MessageSenderEndingInterceptor ending = new MessageSenderEndingInterceptor();
+
+
public MessageSenderInterceptor() {
- super();
- setPhase(Phase.PREPARE_SEND);
+ super(Phase.PREPARE_SEND);
}
public void handleMessage(Message message) {
@@ -48,13 +49,12 @@
}
// Add a final interceptor to close the conduit
- message.getInterceptorChain().add(new MessageSenderEndingInterceptor());
+ message.getInterceptorChain().add(ending);
}
public class MessageSenderEndingInterceptor extends AbstractPhaseInterceptor<Message> {
public MessageSenderEndingInterceptor() {
- super();
- setPhase(Phase.PREPARE_SEND_ENDING);
+ super(Phase.PREPARE_SEND_ENDING);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java Mon Jun 11 11:54:11 2007
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.interceptor;
-import java.util.List;
+import java.util.SortedSet;
import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Endpoint;
@@ -42,7 +42,7 @@
chain.add(getBus().getOutFaultInterceptors());
}
- protected List<Phase> getPhases() {
+ protected SortedSet<Phase> getPhases() {
return getBus().getExtension(PhaseManager.class).getOutPhases();
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java Mon Jun 11 11:54:11 2007
@@ -44,8 +44,7 @@
public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = Logger.getLogger(OutgoingChainInterceptor.class.getName());
public OutgoingChainInterceptor() {
- super();
- setPhase(Phase.POST_INVOKE);
+ super(Phase.POST_INVOKE);
}
public void handleMessage(Message message) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java Mon Jun 11 11:54:11 2007
@@ -40,8 +40,7 @@
public ServiceInvokerInterceptor() {
- super();
- setPhase(Phase.INVOKE);
+ super(Phase.INVOKE);
}
public void handleMessage(final Message message) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -46,8 +46,10 @@
private static Map<Object, XMLInputFactory> factories = new HashMap<Object, XMLInputFactory>();
public StaxInInterceptor() {
- super();
- setPhase(Phase.POST_STREAM);
+ super(Phase.POST_STREAM);
+ }
+ public StaxInInterceptor(String phase) {
+ super(phase);
}
public void handleMessage(Message message) {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -43,10 +43,11 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(StaxOutInterceptor.class);
private static Map<Object, XMLOutputFactory> factories = new HashMap<Object, XMLOutputFactory>();
+ private StaxOutEndingInterceptor ending = new StaxOutEndingInterceptor();
+
public StaxOutInterceptor() {
- super();
- setPhase(Phase.PRE_STREAM);
- getAfter().add(AttachmentOutInterceptor.class.getName());
+ super(Phase.PRE_STREAM);
+ addAfter(AttachmentOutInterceptor.class.getName());
}
public void handleMessage(Message message) {
@@ -78,7 +79,7 @@
message.setContent(XMLStreamWriter.class, writer);
// Add a final interceptor to write end elements
- message.getInterceptorChain().add(new StaxOutEndingInterceptor());
+ message.getInterceptorChain().add(ending);
}
public static XMLOutputFactory getXMLOutputFactory(Message m) throws Fault {
@@ -119,8 +120,7 @@
public class StaxOutEndingInterceptor extends AbstractPhaseInterceptor<Message> {
public StaxOutEndingInterceptor() {
- super();
- setPhase(Phase.PRE_STREAM_ENDING);
+ super(Phase.PRE_STREAM_ENDING);
getAfter().add(AttachmentOutInterceptor.AttachmentOutEndingInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java Mon Jun 11 11:54:11 2007
@@ -51,8 +51,7 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(URIMappingInterceptor.class);
public URIMappingInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -51,8 +51,7 @@
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(WrappedInInterceptor.class);
public WrappedInInterceptor() {
- super();
- setPhase(Phase.UNMARSHAL);
+ super(Phase.UNMARSHAL);
addAfter(URIMappingInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/WrappedOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -35,9 +35,13 @@
public class WrappedOutInterceptor extends AbstractOutDatabindingInterceptor {
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(WrappedOutInterceptor.class);
+ private WrappedOutEndingInterceptor ending = new WrappedOutEndingInterceptor();
+
public WrappedOutInterceptor() {
- super();
- setPhase(Phase.MARSHAL);
+ this(Phase.MARSHAL);
+ }
+ public WrappedOutInterceptor(String phase) {
+ super(phase);
addBefore(BareOutInterceptor.class.getName());
}
@@ -66,14 +70,13 @@
}
// Add a final interceptor to write end element
- message.getInterceptorChain().add(new WrappedOutEndingInterceptor());
+ message.getInterceptorChain().add(ending);
}
}
public class WrappedOutEndingInterceptor extends AbstractOutDatabindingInterceptor {
public WrappedOutEndingInterceptor() {
- super();
- setPhase(Phase.MARSHAL_ENDING);
+ super(Phase.MARSHAL_ENDING);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/phase/PhaseManagerImpl.java Mon Jun 11 11:54:11 2007
@@ -19,22 +19,22 @@
package org.apache.cxf.phase;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.SortedSet;
+import org.apache.cxf.common.util.SortedArraySet;
import org.apache.cxf.extension.BusExtension;
public class PhaseManagerImpl implements PhaseManager, BusExtension {
- private List<Phase> inPhases;
- private List<Phase> outPhases;
+ private SortedSet<Phase> inPhases;
+ private SortedSet<Phase> outPhases;
public PhaseManagerImpl() {
createInPhases();
createOutPhases();
}
- public PhaseManagerImpl(List<Phase> in, List<Phase> out) {
+ public PhaseManagerImpl(SortedSet<Phase> in, SortedSet<Phase> out) {
inPhases = in;
outPhases = out;
}
@@ -43,20 +43,18 @@
return PhaseManager.class;
}
- public List<Phase> getInPhases() {
+ public SortedSet<Phase> getInPhases() {
return inPhases;
}
- public List<Phase> getOutPhases() {
+ public SortedSet<Phase> getOutPhases() {
return outPhases;
}
final void createInPhases() {
-
- inPhases = new ArrayList<Phase>();
int i = 0;
- inPhases = new ArrayList<Phase>();
+ inPhases = new SortedArraySet<Phase>();
inPhases.add(new Phase(Phase.RECEIVE, ++i * 1000));
inPhases.add(new Phase(Phase.PRE_STREAM, ++i * 1000));
inPhases.add(new Phase(Phase.USER_STREAM, ++i * 1000));
@@ -76,7 +74,7 @@
final void createOutPhases() {
- outPhases = new ArrayList<Phase>();
+ outPhases = new SortedArraySet<Phase>();
int i = 0;
outPhases.add(new Phase(Phase.SETUP, ++i * 1000));
Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java Mon Jun 11 11:54:11 2007
@@ -21,6 +21,7 @@
import java.net.URL;
import java.util.List;
+import java.util.SortedSet;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -140,18 +141,14 @@
Bus bus = new SpringBusFactory().createBus();
PhaseManager cxfPM = bus.getExtension(PhaseManager.class);
PhaseManager defaultPM = new PhaseManagerImpl();
- List<Phase> cxfPhases = cxfPM.getInPhases();
- List<Phase> defaultPhases = defaultPM.getInPhases();
+ SortedSet<Phase> cxfPhases = cxfPM.getInPhases();
+ SortedSet<Phase> defaultPhases = defaultPM.getInPhases();
assertEquals(defaultPhases.size(), cxfPhases.size());
- for (int i = 0; i < cxfPhases.size(); i++) {
- assertEquals(0, cxfPhases.get(i).compareTo(defaultPhases.get(i)));
- }
+ assertTrue(cxfPhases.equals(defaultPhases));
cxfPhases = cxfPM.getOutPhases();
defaultPhases = defaultPM.getOutPhases();
assertEquals(defaultPhases.size(), cxfPhases.size());
- for (int i = 0; i < cxfPhases.size(); i++) {
- assertEquals(0, cxfPhases.get(i).compareTo(defaultPhases.get(i)));
- }
+ assertTrue(cxfPhases.equals(defaultPhases));
}
@Test
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractJAXWSHandlerInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractJAXWSHandlerInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractJAXWSHandlerInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractJAXWSHandlerInterceptor.java Mon Jun 11 11:54:11 2007
@@ -27,7 +27,8 @@
public abstract class AbstractJAXWSHandlerInterceptor<T extends Message> extends AbstractPhaseInterceptor<T> {
private Binding binding;
- protected AbstractJAXWSHandlerInterceptor(Binding b) {
+ protected AbstractJAXWSHandlerInterceptor(Binding b, String phase) {
+ super(phase);
binding = b;
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptor.java Mon Jun 11 11:54:11 2007
@@ -32,8 +32,10 @@
extends AbstractJAXWSHandlerInterceptor<T> {
protected AbstractProtocolHandlerInterceptor(Binding binding) {
- super(binding);
- setPhase(Phase.USER_PROTOCOL);
+ super(binding, Phase.USER_PROTOCOL);
+ }
+ protected AbstractProtocolHandlerInterceptor(Binding binding, String phase) {
+ super(binding, phase);
}
public void handleMessage(T message) {
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -32,8 +32,7 @@
extends AbstractJAXWSHandlerInterceptor<T> {
public LogicalHandlerFaultInInterceptor(Binding binding) {
- super(binding);
- setPhase(Phase.PRE_PROTOCOL);
+ super(binding, Phase.PRE_PROTOCOL);
addAfter(SOAPHandlerFaultInInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -47,9 +47,11 @@
public static final String ORIGINAL_WRITER = "original_writer";
+ LogicalHandlerFaultOutEndingInterceptor<T> ending;
+
public LogicalHandlerFaultOutInterceptor(Binding binding) {
- super(binding);
- setPhase(Phase.PRE_MARSHAL);
+ super(binding, Phase.PRE_MARSHAL);
+ ending = new LogicalHandlerFaultOutEndingInterceptor<T>(binding);
}
public void handleMessage(T message) throws Fault {
@@ -67,7 +69,7 @@
message.setContent(XMLStreamWriter.class, writer);
message.put(ORIGINAL_WRITER, origWriter);
- message.getInterceptorChain().add(new LogicalHandlerFaultOutEndingInterceptor<T>(getBinding()));
+ message.getInterceptorChain().add(ending);
} catch (ParserConfigurationException e) {
throw new Fault(e);
}
@@ -78,9 +80,7 @@
extends AbstractJAXWSHandlerInterceptor<X> {
public LogicalHandlerFaultOutEndingInterceptor(Binding binding) {
- super(binding);
-
- setPhase(Phase.POST_MARSHAL);
+ super(binding, Phase.POST_MARSHAL);
}
public void handleMessage(X message) throws Fault {
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -27,7 +27,6 @@
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.interceptor.OutgoingChainInterceptor;
-import org.apache.cxf.interceptor.StaxOutInterceptor;
import org.apache.cxf.jaxws.handler.AbstractJAXWSHandlerInterceptor;
import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
import org.apache.cxf.jaxws.handler.soap.SOAPHandlerInterceptor;
@@ -41,10 +40,8 @@
extends AbstractJAXWSHandlerInterceptor<T> {
public LogicalHandlerInInterceptor(Binding binding) {
- super(binding);
- setPhase(Phase.PRE_PROTOCOL);
+ super(binding, Phase.PRE_PROTOCOL);
addAfter(MustUnderstandInterceptor.class.getName());
- addAfter(StaxOutInterceptor.class.getName());
addAfter(SAAJOutInterceptor.class.getName());
addAfter(SOAPHandlerInterceptor.class.getName());
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -46,10 +46,11 @@
extends AbstractJAXWSHandlerInterceptor<T> {
public static final String ORIGINAL_WRITER = "original_writer";
+ private LogicalHandlerOutEndingInterceptor<T> ending;
public LogicalHandlerOutInterceptor(Binding binding) {
- super(binding);
- setPhase(Phase.PRE_MARSHAL);
+ super(binding, Phase.PRE_MARSHAL);
+ ending = new LogicalHandlerOutEndingInterceptor<T>(binding);
}
public void handleMessage(T message) throws Fault {
@@ -67,8 +68,7 @@
message.setContent(XMLStreamWriter.class, writer);
message.put(ORIGINAL_WRITER, origWriter);
- message.getInterceptorChain().add(new LogicalHandlerOutEndingInterceptor<T>(
- getBinding()));
+ message.getInterceptorChain().add(ending);
} catch (ParserConfigurationException e) {
throw new Fault(e);
}
@@ -79,9 +79,7 @@
extends AbstractJAXWSHandlerInterceptor<X> {
public LogicalHandlerOutEndingInterceptor(Binding binding) {
- super(binding);
-
- setPhase(Phase.POST_MARSHAL);
+ super(binding, Phase.POST_MARSHAL);
}
public void handleMessage(X message) throws Fault {
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -47,8 +47,7 @@
SoapInterceptor {
public SOAPHandlerFaultInInterceptor(Binding binding) {
- super(binding);
- setPhase(Phase.PRE_PROTOCOL);
+ super(binding, Phase.PRE_PROTOCOL);
}
public Set<URI> getRoles() {
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -54,10 +54,16 @@
AbstractProtocolHandlerInterceptor<SoapMessage> implements
SoapInterceptor {
private static final SAAJOutInterceptor SAAJ_OUT = new SAAJOutInterceptor();
+ private static final String ENDING_ID = SOAPHandlerFaultOutInterceptor.class.getName() + ".ENDING";
+
+ AbstractSoapInterceptor ending = new AbstractSoapInterceptor(ENDING_ID, Phase.USER_PROTOCOL) {
+ public void handleMessage(SoapMessage message) throws Fault {
+ handleMessageInternal(message);
+ }
+ };
public SOAPHandlerFaultOutInterceptor(Binding binding) {
- super(binding);
- setPhase(Phase.PRE_PROTOCOL);
+ super(binding, Phase.PRE_PROTOCOL);
addAfter(MustUnderstandInterceptor.class.getName());
addAfter(StaxOutInterceptor.class.getName());
addAfter(SAAJOutInterceptor.class.getName());
@@ -94,20 +100,7 @@
SAAJ_OUT.handleMessage(message);
- message.getInterceptorChain().add(new AbstractSoapInterceptor() {
- @Override
- public String getPhase() {
- return Phase.USER_PROTOCOL;
- }
- @Override
- public String getId() {
- return SOAPHandlerFaultOutInterceptor.class.getName() + ".ENDING";
- }
-
- public void handleMessage(SoapMessage message) throws Fault {
- handleMessageInternal(message);
- }
- });
+ message.getInterceptorChain().add(ending);
}
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java Mon Jun 11 11:54:11 2007
@@ -47,7 +47,6 @@
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.interceptor.OutgoingChainInterceptor;
-import org.apache.cxf.interceptor.StaxOutInterceptor;
import org.apache.cxf.jaxws.handler.AbstractProtocolHandlerInterceptor;
import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
import org.apache.cxf.jaxws.support.ContextPropertiesMapping;
@@ -62,11 +61,18 @@
SoapInterceptor {
private static final SAAJOutInterceptor SAAJ_OUT = new SAAJOutInterceptor();
+ AbstractSoapInterceptor ending = new AbstractSoapInterceptor(
+ SOAPHandlerInterceptor.class.getName() + ".ENDING",
+ Phase.USER_PROTOCOL) {
+
+ public void handleMessage(SoapMessage message) throws Fault {
+ handleMessageInternal(message);
+ }
+ };
+
public SOAPHandlerInterceptor(Binding binding) {
- super(binding);
- setPhase(Phase.PRE_PROTOCOL);
+ super(binding, Phase.PRE_PROTOCOL);
addAfter(MustUnderstandInterceptor.class.getName());
- addAfter(StaxOutInterceptor.class.getName());
addAfter(SAAJOutInterceptor.class.getName());
}
@@ -98,20 +104,7 @@
SAAJ_OUT.handleMessage(message);
- message.getInterceptorChain().add(new AbstractSoapInterceptor() {
- @Override
- public String getPhase() {
- return Phase.USER_PROTOCOL;
- }
- @Override
- public String getId() {
- return SOAPHandlerInterceptor.class.getName() + ".ENDING";
- }
-
- public void handleMessage(SoapMessage message) throws Fault {
- handleMessageInternal(message);
- }
- });
+ message.getInterceptorChain().add(ending);
} else {
handleMessageInternal(message);
SOAPMessage msg = message.getContent(SOAPMessage.class);
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -55,8 +55,7 @@
private Service.Mode mode;
public DispatchInInterceptor(Class type, Mode mode) {
- super();
- setPhase(Phase.READ);
+ super(Phase.READ);
this.type = type;
this.mode = mode;
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -54,8 +54,7 @@
private static final Logger LOG = LogUtils.getL7dLogger(DispatchOutInterceptor.class);
public DispatchOutInterceptor() {
- super();
- setPhase(Phase.WRITE);
+ super(Phase.WRITE);
}
public void handleMessage(Message message) throws Fault {
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -38,8 +38,7 @@
public static final String CLIENT_HOLDERS = "client.holders";
public HolderInInterceptor() {
- super();
- setPhase(Phase.PRE_INVOKE);
+ super(Phase.PRE_INVOKE);
}
@SuppressWarnings("unchecked")
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -41,9 +41,8 @@
private static final Logger LOG = Logger.getLogger(HolderOutInterceptor.class.getName());
public HolderOutInterceptor() {
- super();
+ super(Phase.PRE_LOGICAL);
addBefore(WrapperClassOutInterceptor.class.getName());
- setPhase(Phase.PRE_LOGICAL);
}
public void handleMessage(Message message) throws Fault {