cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r546222 [3/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...
Date Mon, 11 Jun 2007 18:54:17 GMT
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ProviderInDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ProviderInDatabindingInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ProviderInDatabindingInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ProviderInDatabindingInterceptor.java Mon Jun 11 11:54:11 2007
@@ -43,8 +43,7 @@
     Class type;
     
     public ProviderInDatabindingInterceptor(Class type) {
-        super();
-        setPhase(Phase.UNMARSHAL);
+        super(Phase.UNMARSHAL);
         addAfter(URIMappingInterceptor.class.getName());
         this.type = type;
     }

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ProviderOutDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ProviderOutDatabindingInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ProviderOutDatabindingInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ProviderOutDatabindingInterceptor.java Mon Jun 11 11:54:11 2007
@@ -33,8 +33,10 @@
 public class ProviderOutDatabindingInterceptor extends AbstractInDatabindingInterceptor {
 
     public ProviderOutDatabindingInterceptor() {
-        super();
-        setPhase(Phase.MARSHAL);
+        super(Phase.MARSHAL);
+    }
+    public ProviderOutDatabindingInterceptor(String phase) {
+        super(phase);
     }
 
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -39,8 +39,7 @@
 public class SwAInInterceptor extends AbstractSoapInterceptor {
 
     public SwAInInterceptor() {
-        super();
-        setPhase(Phase.PRE_INVOKE);
+        super(Phase.PRE_INVOKE);
         getBefore().add(HolderInInterceptor.class.getName());
     }
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -73,11 +73,12 @@
 public class SwAOutInterceptor extends AbstractSoapInterceptor {
     private static final Logger LOG = LogUtils.getL7dLogger(SwAOutInterceptor.class);
     
+    AttachmentOutInterceptor attachOut = new AttachmentOutInterceptor();
+    
     public SwAOutInterceptor() {
-        super();
+        super(Phase.PRE_LOGICAL);
         addAfter(HolderOutInterceptor.class.getName());
         addBefore(WrapperClassOutInterceptor.class.getName());
-        setPhase(Phase.PRE_LOGICAL);
     }
 
     public void handleMessage(SoapMessage message) throws Fault {
@@ -272,7 +273,7 @@
     
     private Collection<Attachment> setupAttachmentOutput(SoapMessage message) {
         // We have attachments, so add the interceptor
-        message.getInterceptorChain().add(new AttachmentOutInterceptor());
+        message.getInterceptorChain().add(attachOut);
         // We should probably come up with another property for this
         message.put(AttachmentOutInterceptor.WRITE_ATTACHMENTS, Boolean.TRUE);
         

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -45,8 +45,7 @@
     private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JaxWsServiceConfiguration.class);
 
     public WebFaultOutInterceptor() {
-        super();
-        setPhase(Phase.PRE_PROTOCOL);
+        super(Phase.PRE_PROTOCOL);
     }
 
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -40,8 +40,7 @@
     private static final Logger LOG = Logger.getLogger(WrapperClassInInterceptor.class.getName());
     
     public WrapperClassInInterceptor() {
-        super();
-        setPhase(Phase.POST_LOGICAL);
+        super(Phase.POST_LOGICAL);
     }
 
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -36,8 +36,7 @@
 
 public class WrapperClassOutInterceptor extends AbstractPhaseInterceptor<Message> {
     public WrapperClassOutInterceptor() {
-        super();
-        setPhase(Phase.PRE_LOGICAL);
+        super(Phase.PRE_LOGICAL);
     }
 
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Mon Jun 11 11:54:11 2007
@@ -126,8 +126,8 @@
             if (type.equals(SOAPMessage.class)) {
                 getService().getInInterceptors().add(new ProviderInDatabindingInterceptor(type));
                 // hack to get the SOAPMessage set before the SOAPHandlerInterceptor
-                ProviderOutDatabindingInterceptor out = new ProviderOutDatabindingInterceptor();
-                out.setPhase(Phase.PRE_PROTOCOL);
+                ProviderOutDatabindingInterceptor out 
+                    = new ProviderOutDatabindingInterceptor(Phase.PRE_PROTOCOL);
                 out.addBefore(SOAPHandlerInterceptor.class.getName());
                 getService().getOutInterceptors().add(out);
                 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java Mon Jun 11 11:54:11 2007
@@ -346,7 +346,7 @@
     }
       
     
-    private AbstractPhaseInterceptor findTestInterceptor(List<Interceptor> interceptors) {
+    private TestInterceptor findTestInterceptor(List<Interceptor> interceptors) {
         for (Interceptor i : interceptors) {
             if (i instanceof TestInterceptor) {
                 return (TestInterceptor)i;
@@ -364,14 +364,12 @@
     
     
     static final class TestInterceptor extends AbstractPhaseInterceptor {
+        public TestInterceptor(String name) {
+            super(name, "");
+        }
     
         public void handleMessage(Message message) throws Fault {
             // TODO Auto-generated method stub
         }
-        
-        public void setName(String n) {
-            setId(n);
-        }
-        
     }
 }

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java Mon Jun 11 11:54:11 2007
@@ -165,8 +165,7 @@
     public static class NestedFaultThrower extends AbstractPhaseInterceptor<Message> {
         
         public NestedFaultThrower() {
-            super();
-            setPhase(Phase.PRE_LOGICAL);
+            super(Phase.PRE_LOGICAL);
             addBefore(FaultThrower.class.getName());
         }
 
@@ -183,8 +182,7 @@
     public static class FaultThrower extends AbstractPhaseInterceptor<Message> {
         
         public FaultThrower() {
-            super();
-            setPhase(Phase.PRE_LOGICAL);
+            super(Phase.PRE_LOGICAL);
         }
 
         public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java Mon Jun 11 11:54:11 2007
@@ -97,7 +97,7 @@
 
     public class FaultThrowingInterceptor extends AbstractSoapInterceptor {
         public FaultThrowingInterceptor() {
-            setPhase(Phase.USER_LOGICAL);
+            super(Phase.USER_LOGICAL);
         }
 
         public void handleMessage(SoapMessage message) throws Fault {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/configured-endpoints.xml Mon Jun 11 11:54:11 2007
@@ -31,7 +31,7 @@
 			<list>
 				<bean
 					class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
-					<property name="name" value="service-in" />
+					<constructor-arg value="service-in" />
 				</bean>
 			</list>
 		</property>
@@ -39,7 +39,7 @@
 			<list>
 				<bean
 					class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
-					<property name="name" value="service-in-fault" />
+					<constructor-arg value="service-in-fault" />
 				</bean>
 			</list>
 		</property>
@@ -47,7 +47,7 @@
 			<list>
 				<bean
 					class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
-					<property name="name" value="service-out" />
+					<constructor-arg value="service-out" />
 				</bean>
 			</list>
 		</property>
@@ -55,7 +55,7 @@
 			<list>
 				<bean
 					class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
-					<property name="name" value="service-out-fault" />
+					<constructor-arg value="service-out-fault" />
 				</bean>
 			</list>
 		</property>
@@ -65,22 +65,22 @@
 		createdFromAPI="true">
 		<jaxws:inInterceptors>
 			<bean class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
-				<property name="name" value="endpoint-in" />
+				<constructor-arg value="endpoint-in" />
 			</bean>
 		</jaxws:inInterceptors>
 		<jaxws:inFaultInterceptors>
 			<bean class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
-				<property name="name" value="endpoint-in-fault" />
+				<constructor-arg value="endpoint-in-fault" />
 			</bean>
 		</jaxws:inFaultInterceptors>
 		<jaxws:outInterceptors>
 			<bean class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
-				<property name="name" value="endpoint-out" />
+				<constructor-arg value="endpoint-out" />
 			</bean>
 		</jaxws:outInterceptors>		
 		<jaxws:outFaultInterceptors>
 			<bean class="org.apache.cxf.jaxws.ConfiguredEndpointTest$TestInterceptor">
-				<property name="name" value="endpoint-out-fault" />
+				<constructor-arg value="endpoint-out-fault" />
 			</bean>
 		</jaxws:outFaultInterceptors>
 		<jaxws:properties>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java Mon Jun 11 11:54:11 2007
@@ -128,12 +128,7 @@
 
         InterceptorChain chain = new PhaseInterceptorChain((new PhaseManagerImpl()).getOutPhases());
         //Interceptors after SOAPHandlerInterceptor DOMXMLStreamWriter to write
-        chain.add(new AbstractProtocolHandlerInterceptor<SoapMessage>(binding) {
-            
-            @Override
-            public String getPhase() {
-                return Phase.MARSHAL;
-            }
+        chain.add(new AbstractProtocolHandlerInterceptor<SoapMessage>(binding, Phase.MARSHAL) {
 
             public void handleMessage(SoapMessage message) throws Fault {
                 try {
@@ -328,12 +323,7 @@
 
         InterceptorChain chain = new PhaseInterceptorChain((new PhaseManagerImpl()).getOutPhases());
         //Interceptors after SOAPHandlerInterceptor DOMXMLStreamWriter to write
-        chain.add(new AbstractProtocolHandlerInterceptor<SoapMessage>(binding) {
-
-            @Override
-            public String getPhase() {
-                return Phase.MARSHAL;
-            }
+        chain.add(new AbstractProtocolHandlerInterceptor<SoapMessage>(binding, Phase.MARSHAL) {
 
             public void handleMessage(SoapMessage message) throws Fault {
                 try {

Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java Mon Jun 11 11:54:11 2007
@@ -33,6 +33,7 @@
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.transport.MultipleEndpointObserver;
 import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class SoapBindingSelectionTest extends AbstractSimpleFrontendTest {
@@ -41,18 +42,14 @@
     boolean service2Invoked;
     
     @Test
+    @Ignore
     public void testMultipleSoapBindings() throws Exception {
         ServerFactoryBean svrBean1 = new ServerFactoryBean();
         svrBean1.setAddress("http://localhost/Hello");
         svrBean1.setServiceClass(HelloService.class);
         svrBean1.setServiceBean(new HelloServiceImpl());
         svrBean1.setBus(getBus());
-        svrBean1.getInInterceptors().add(new AbstractPhaseInterceptor<Message>() {
-            @Override
-            public String getPhase() {
-                return Phase.USER_LOGICAL;
-            }
-
+        svrBean1.getInInterceptors().add(new AbstractPhaseInterceptor<Message>(Phase.USER_LOGICAL) {
             public void handleMessage(Message message) throws Fault {
                 service1Invoked = true;
             }
@@ -64,12 +61,7 @@
         svrBean2.setServiceClass(HelloService.class);
         svrBean2.setServiceBean(new HelloServiceImpl());
         svrBean2.setBus(getBus());
-        svrBean2.getInInterceptors().add(new AbstractPhaseInterceptor<Message>() {
-            @Override
-            public String getPhase() {
-                return Phase.USER_LOGICAL;
-            }
-
+        svrBean2.getInInterceptors().add(new AbstractPhaseInterceptor<Message>(Phase.USER_LOGICAL) {
             public void handleMessage(Message message) throws Fault {
                 service2Invoked = true;
             }

Modified: incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java (original)
+++ incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Mon Jun 11 11:54:11 2007
@@ -41,8 +41,8 @@
 public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPhaseInterceptor<Message> {
     private static final Logger LOG = LogUtils.getL7dLogger(AbstractMessageResponseTimeInterceptor.class);
     
-    AbstractMessageResponseTimeInterceptor() {
-        super();
+    AbstractMessageResponseTimeInterceptor(String phase) {
+        super(phase);
     }
     
     protected boolean isClient(Message msg) {

Modified: incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -27,8 +27,7 @@
 public class ResponseTimeMessageInInterceptor extends AbstractMessageResponseTimeInterceptor {
     
     public ResponseTimeMessageInInterceptor() {
-        super();
-        setPhase(Phase.RECEIVE);
+        super(Phase.RECEIVE);
     }
     
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java (original)
+++ incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java Mon Jun 11 11:54:11 2007
@@ -19,9 +19,6 @@
 
 package org.apache.cxf.management.interceptor;
 
-import java.util.Collections;
-import java.util.Set;
-
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.ServiceInvokerInterceptor;
 import org.apache.cxf.message.Exchange;
@@ -34,14 +31,11 @@
  * */ 
 public class ResponseTimeMessageInvokerInterceptor 
     extends AbstractMessageResponseTimeInterceptor {
-    //this interceptor should be add after the serviceInvokerInterceptor
-    private Set<String> before = Collections.singleton(ServiceInvokerInterceptor.class.getName());
       
     public ResponseTimeMessageInvokerInterceptor() {
-        super();
-        setPhase(Phase.INVOKE);
-        
-        
+        super(Phase.INVOKE);
+        //this interceptor should be add before the serviceInvokerInterceptor
+        addBefore(ServiceInvokerInterceptor.class.getName());
     }
 
     public void handleMessage(Message message) throws Fault {
@@ -50,9 +44,5 @@
             setOneWayMessage(ex); 
         }
     }
-    
-    @Override
-    public Set<String> getBefore() {
-        return before;
-    }
+
 }

Modified: incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -26,8 +26,7 @@
 public class ResponseTimeMessageOutInterceptor extends AbstractMessageResponseTimeInterceptor {
     
     public ResponseTimeMessageOutInterceptor() {
-        super();
-        setPhase(Phase.SEND);
+        super(Phase.SEND);
     }
     
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Mon Jun 11 11:54:11 2007
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.security.GeneralSecurityException;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.apache.cxf.Bus;
@@ -179,13 +180,13 @@
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                LOG.log(Level.SEVERE, e.getMessage(), e);
                 //problem starting server
                 try {                    
                     server.stop();
                     server.destroy();
                 } catch (Exception ex) {
-                    ex.printStackTrace();
+                    LOG.log(Level.SEVERE, ex.getMessage(), ex);
                 }    
             }
         }
@@ -200,7 +201,7 @@
             try {                
                 context.start();
             } catch (Exception ex) {
-                ex.printStackTrace();
+                LOG.log(Level.WARNING, ex.getMessage(), ex);
             }
         }
         

Modified: incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java Mon Jun 11 11:54:11 2007
@@ -78,8 +78,7 @@
      * Constructor.
      */
     public MAPAggregator() {
-        super();
-        setPhase(Phase.PRE_LOGICAL);
+        super(Phase.PRE_LOGICAL);
     }
     
     /**

Modified: incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Mon Jun 11 11:54:11 2007
@@ -88,8 +88,7 @@
      * Constructor.
      */
     public MAPCodec() {
-        super();
-        setPhase(Phase.PRE_PROTOCOL);
+        super(Phase.PRE_PROTOCOL);
         addBefore("org.apache.cxf.jaxws.handler.soap.SOAPHandlerInterceptor");
         transformer = new VersionTransformer(this);
     } 

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java Mon Jun 11 11:54:11 2007
@@ -36,6 +36,13 @@
     
     protected Bus bus;
     
+    public AbstractPolicyInterceptor(String phase) {
+        super(phase);
+    }
+    public AbstractPolicyInterceptor(String id, String phase) {
+        super(id, phase);
+    }
+    
     public void setBus(Bus b) {
         bus = b;
     }

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java Mon Jun 11 11:54:11 2007
@@ -43,8 +43,7 @@
     private static final Logger LOG = LogUtils.getL7dLogger(ClientPolicyInFaultInterceptor.class);
     
     public ClientPolicyInFaultInterceptor() {
-        setId(PolicyConstants.CLIENT_POLICY_IN_FAULT_INTERCEPTOR_ID);
-        setPhase(Phase.RECEIVE);
+        super(PolicyConstants.CLIENT_POLICY_IN_FAULT_INTERCEPTOR_ID, Phase.RECEIVE);
     }
     
     protected void handle(Message msg) {        

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -43,8 +43,7 @@
     private static final Logger LOG = LogUtils.getL7dLogger(ClientPolicyInInterceptor.class);
     
     public ClientPolicyInInterceptor() {
-        setId(PolicyConstants.CLIENT_POLICY_IN_INTERCEPTOR_ID);
-        setPhase(Phase.RECEIVE);
+        super(PolicyConstants.CLIENT_POLICY_IN_INTERCEPTOR_ID, Phase.RECEIVE);
     }
     
     protected void handle(Message msg) {        

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -44,8 +44,7 @@
     private static final Logger LOG = LogUtils.getL7dLogger(ClientPolicyOutInterceptor.class);
     
     public ClientPolicyOutInterceptor() {
-        setId(PolicyConstants.CLIENT_POLICY_OUT_INTERCEPTOR_ID);
-        setPhase(Phase.SETUP);
+        super(PolicyConstants.CLIENT_POLICY_OUT_INTERCEPTOR_ID, Phase.SETUP);
     }
     
     protected void handle(Message msg) {

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptor.java Mon Jun 11 11:54:11 2007
@@ -40,7 +40,7 @@
         = LogUtils.getL7dLogger(PolicyVerificationInFaultInterceptor.class);
 
     public PolicyVerificationInFaultInterceptor() {
-        setPhase(Phase.PRE_INVOKE);
+        super(Phase.PRE_INVOKE);
     }
 
     /** 

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -38,7 +38,7 @@
     private static final Logger LOG = LogUtils.getL7dLogger(PolicyVerificationInInterceptor.class);
 
     public PolicyVerificationInInterceptor() {
-        setPhase(Phase.PRE_INVOKE);
+        super(Phase.PRE_INVOKE);
     }
 
     /** 

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -34,7 +34,7 @@
     private static final Logger LOG 
         = LogUtils.getL7dLogger(PolicyVerificationOutInterceptor.class);
     public PolicyVerificationOutInterceptor() {
-        setPhase(Phase.POST_STREAM);
+        super(Phase.POST_STREAM);
     }
 
     /** 

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -43,8 +43,7 @@
     private static final Logger LOG = LogUtils.getL7dLogger(ServerPolicyInInterceptor.class);
     
     public ServerPolicyInInterceptor() {
-        setId(PolicyConstants.SERVER_POLICY_IN_INTERCEPTOR_ID);
-        setPhase(Phase.RECEIVE);
+        super(PolicyConstants.SERVER_POLICY_IN_INTERCEPTOR_ID, Phase.RECEIVE);
     }
     
     protected void handle(Message msg) {        

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java Mon Jun 11 11:54:11 2007
@@ -45,8 +45,7 @@
     private static final Logger LOG = LogUtils.getL7dLogger(ServerPolicyOutFaultInterceptor.class);
     
     public ServerPolicyOutFaultInterceptor() {
-        setId(PolicyConstants.SERVER_POLICY_OUT_FAULT_INTERCEPTOR_ID);
-        setPhase(Phase.SETUP);
+        super(PolicyConstants.SERVER_POLICY_OUT_FAULT_INTERCEPTOR_ID, Phase.SETUP);
     }
        
     protected void handle(Message msg) {        

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -44,8 +44,7 @@
     private static final Logger LOG = LogUtils.getL7dLogger(ServerPolicyOutInterceptor.class);
     
     public ServerPolicyOutInterceptor() {
-        setId(PolicyConstants.SERVER_POLICY_OUT_INTERCEPTOR_ID);
-        setPhase(Phase.SETUP);
+        super(PolicyConstants.SERVER_POLICY_OUT_INTERCEPTOR_ID, Phase.SETUP);
     }
     
     protected void handle(Message msg) {        

Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptor.java Mon Jun 11 11:54:11 2007
@@ -30,7 +30,7 @@
 
 public class MTOMPolicyInterceptor extends AbstractPhaseInterceptor<Message> {
     public MTOMPolicyInterceptor() {
-        setPhase(Phase.POST_LOGICAL);
+        super(Phase.POST_LOGICAL);
     }
 
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractRMInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractRMInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractRMInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractRMInterceptor.java Mon Jun 11 11:54:11 2007
@@ -48,7 +48,7 @@
     private Bus bus;
     
     protected AbstractRMInterceptor() {
-        setPhase(Phase.PRE_LOGICAL);
+        super(Phase.PRE_LOGICAL);
     }
      
     public RMManager getManager() {

Modified: incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionInterceptor.java Mon Jun 11 11:54:11 2007
@@ -34,6 +34,10 @@
  
     RMManager manager;
       
+    public RetransmissionInterceptor() {
+        super(Phase.PRE_PROTOCOL);
+    }
+    
     public RMManager getManager() {
         return manager;
     }
@@ -42,10 +46,6 @@
         this.manager = manager;
     }
 
-    @Override
-    public String getPhase() {
-        return Phase.PRE_PROTOCOL;
-    }
 
     public void handleMessage(Message message) throws Fault {
         handle(message, false);
@@ -56,10 +56,6 @@
         handle(message, true);
     }
 
-    public String getId() {
-        return RetransmissionInterceptor.class.getName();
-    }
-    
     void handle(Message message, boolean isFault) {
         
         if (null == getManager().getRetransmissionQueue()) {

Modified: incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java Mon Jun 11 11:54:11 2007
@@ -22,7 +22,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
@@ -53,7 +52,6 @@
 import org.apache.cxf.common.util.PackageUtils;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.headers.Header;
-import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.interceptor.BareInInterceptor;
 import org.apache.cxf.interceptor.Fault;
@@ -99,32 +97,15 @@
     private static final String WS_RM_PACKAGE = 
         PackageUtils.getPackageName(SequenceType.class);
     
-    private Set<String> after = Collections.singleton(MAPCodec.class.getName());
-
     /**
      * Constructor.
      */
     public RMSoapInterceptor() {
+        super(Phase.PRE_PROTOCOL);
+        
+        addAfter(MAPCodec.class.getName());
     } 
     
-    // PhaseInterceptor interface
-
-    public Set<String> getBefore() {
-        return CastUtils.cast(Collections.EMPTY_SET);        
-    }
-
-    public Set<String> getAfter() {
-        return after;
-    }
-
-    public String getId() {
-        return RMSoapInterceptor.class.getName();
-    }
-
-    public String getPhase() {
-        return Phase.PRE_PROTOCOL;
-    }
-      
     // AbstractSoapInterceptor interface 
     
     /**

Modified: incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java Mon Jun 11 11:54:11 2007
@@ -22,8 +22,9 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
@@ -65,8 +66,10 @@
     public void testOrdering() {
         control.replay();
         Phase p = new Phase(Phase.PRE_LOGICAL, 1);
+        SortedSet<Phase> phases = new TreeSet<Phase>();
+        phases.add(p);
         PhaseInterceptorChain chain = 
-            new PhaseInterceptorChain(Collections.singletonList(p));
+            new PhaseInterceptorChain(phases);
         MAPAggregator map = new MAPAggregator();
         RMInInterceptor rmi = new RMInInterceptor();        
         chain.add(rmi);

Modified: incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java Mon Jun 11 11:54:11 2007
@@ -21,8 +21,9 @@
 
 import java.lang.reflect.Method;
 import java.math.BigInteger;
-import java.util.Collections;
 import java.util.Iterator;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import org.apache.cxf.interceptor.InterceptorChain;
 import org.apache.cxf.message.Exchange;
@@ -53,12 +54,15 @@
     @Test
     public void testOrdering() {
         Phase p = new Phase(Phase.PRE_LOGICAL, 1);
+        SortedSet<Phase> phases = new TreeSet<Phase>();
+        phases.add(p);
         PhaseInterceptorChain chain = 
-            new PhaseInterceptorChain(Collections.singletonList(p));
+            new PhaseInterceptorChain(phases);
         MAPAggregator map = new MAPAggregator();
         RMOutInterceptor rmi = new RMOutInterceptor();        
         chain.add(rmi);
         chain.add(map);
+        System.out.println(chain);
         Iterator it = chain.iterator();
         assertSame("Unexpected order.", map, it.next());
         assertSame("Unexpected order.", rmi, it.next());                      

Modified: incubator/cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/pom.xml?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/security/pom.xml Mon Jun 11 11:54:11 2007
@@ -128,57 +128,4 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/ws/security</developerConnection>
       <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-rt-ws-security</url>
   </scm>
-    <build>
-        <plugins>
-            <!--			<plugin>-->
-            <!--				<groupId>org.apache.cxf</groupId>-->
-            <!--				<artifactId>cxf-common-xsd</artifactId>-->
-            <!--				<version>${project.version}</version>-->
-            <!--				<executions>-->
-            <!--					<execution>-->
-            <!--						<id>generate-sources</id>-->
-            <!--						<phase>generate-sources</phase>-->
-            <!--						<configuration>-->
-            <!--							<sourceRoot>-->
-            <!--								${basedir}/target/generated/src/main/java-->
-            <!--							</sourceRoot>-->
-            <!--							<xsdOptions>-->
-            <!--								<xsdOption>-->
-            <!--									<xsd>-->
-            <!--										${basedir}/src/main/resources/schemas/ws-security-policy.xsd-->
-            <!--									</xsd>-->
-            <!--									<bindingFile>-->
-            <!--										${basedir}/src/main/resources/schemas/ws-security-policy.xjb-->
-            <!--									</bindingFile>-->
-            <!--									<catalog>-->
-            <!--										${basedir}/src/main/resources/schemas/catalog.cat-->
-            <!--									</catalog>-->
-            <!--									<deleteDirs>-->
-            <!--										<deleteDir>-->
-            <!--											${basedir}/target/generated/src/main/java/org/apache/cxf/ws/security/policy-->
-            <!--										</deleteDir>-->
-            <!--									</deleteDirs>-->
-            <!--								</xsdOption>-->
-            <!--							</xsdOptions>-->
-            <!--						</configuration>-->
-            <!--						<goals>-->
-            <!--							<goal>xsdtojava</goal>-->
-            <!--						</goals>-->
-            <!--					</execution>-->
-            <!--				</executions>-->
-            <!--				<dependencies>-->
-            <!--					<dependency>-->
-            <!--						<groupId>org.apache.cxf</groupId>-->
-            <!--						<artifactId>cxf-tools-xjc-dv</artifactId>-->
-            <!--						<version>${project.version}</version>-->
-            <!--					</dependency>-->
-            <!--					<dependency>-->
-            <!--						<groupId>org.apache.cxf</groupId>-->
-            <!--						<artifactId>cxf-common-utilities</artifactId>-->
-            <!--						<version>${project.version}</version>-->
-            <!--					</dependency>-->
-            <!--				</dependencies>-->
-            <!--			</plugin>-->
-        </plugins>
-    </build>
 </project>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/ThrowFaultInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/ThrowFaultInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/ThrowFaultInterceptor.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/ThrowFaultInterceptor.java Mon Jun 11 11:54:11 2007
@@ -28,8 +28,7 @@
 
 public class ThrowFaultInterceptor extends AbstractPhaseInterceptor<Message> {
     public ThrowFaultInterceptor() {
-        super();
-        setPhase(Phase.PREPARE_SEND);
+        super(Phase.PREPARE_SEND);
     }
 
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/PushBack401.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/PushBack401.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/PushBack401.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/PushBack401.java Mon Jun 11 11:54:11 2007
@@ -48,8 +48,7 @@
 public class PushBack401 extends AbstractPhaseInterceptor {
     
     PushBack401() {
-        super();
-        setPhase(Phase.RECEIVE);
+        super(Phase.RECEIVE);
     }
     
     /**

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/FaultHandlingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/FaultHandlingInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/FaultHandlingInterceptor.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/FaultHandlingInterceptor.java Mon Jun 11 11:54:11 2007
@@ -34,7 +34,7 @@
 public class FaultHandlingInterceptor extends AbstractPhaseInterceptor {
     
     public FaultHandlingInterceptor() {
-        super.setPhase(Phase.USER_LOGICAL);
+        super(Phase.USER_LOGICAL);
     }
     
     public synchronized void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestAttachmentOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestAttachmentOutInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestAttachmentOutInterceptor.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestAttachmentOutInterceptor.java Mon Jun 11 11:54:11 2007
@@ -31,8 +31,7 @@
 
     
     public TestAttachmentOutInterceptor() {
-        super();
-        setPhase(Phase.SEND);
+        super(Phase.SEND);
     }
 
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestMultipartMessageInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestMultipartMessageInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestMultipartMessageInterceptor.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestMultipartMessageInterceptor.java Mon Jun 11 11:54:11 2007
@@ -29,8 +29,7 @@
 public class TestMultipartMessageInterceptor extends AbstractPhaseInterceptor<Message> {
 
     public TestMultipartMessageInterceptor() {
-        super();
-        setPhase(Phase.INVOKE);
+        super(Phase.INVOKE);
     }
 
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/versioning/MediatorInInterceptor.java Mon Jun 11 11:54:11 2007
@@ -35,8 +35,7 @@
 public class MediatorInInterceptor extends AbstractEndpointSelectionInterceptor {
 
     public MediatorInInterceptor() {
-        super();
-        setPhase(Phase.POST_STREAM);
+        super(Phase.POST_STREAM);
         addBefore(StaxInInterceptor.class.getName());
     }
 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java Mon Jun 11 11:54:11 2007
@@ -61,8 +61,7 @@
     String currentNamespaceURI;
     
     public HeaderVerifier() {
-        super();
-        setPhase(Phase.POST_PROTOCOL);
+        super(Phase.POST_PROTOCOL);
     }
     
     public Set<QName> getUnderstoodHeaders() {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java Mon Jun 11 11:54:11 2007
@@ -45,8 +45,7 @@
     private Map<String, Object> mapProperties;
 
     public MAPVerifier() {
-        super();
-        setPhase(Phase.POST_LOGICAL);
+        super(Phase.POST_LOGICAL);
         mapProperties = new HashMap<String, Object>();
         mapProperties.put(MAPTest.INBOUND_KEY, CLIENT_ADDRESSING_PROPERTIES_INBOUND);
         mapProperties.put(MAPTest.OUTBOUND_KEY, CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyLoggingInterceptor.java Mon Jun 11 11:54:11 2007
@@ -43,19 +43,10 @@
 
     private static final Logger LOG = Logger.getLogger(PolicyLoggingInterceptor.class.getName());
     
-    private boolean outbound;
     private Bus bus;
     
     PolicyLoggingInterceptor(boolean o) {
-        outbound = o;
-        // setPhase(Phase.PRE_LOGICAL);
-        if (outbound) {
-            setPhase(Phase.POST_STREAM);
-            // addBefore(PolicyVerificationOutInterceptor.class.getName());
-        } else {
-            setPhase(Phase.POST_INVOKE);
-            // addBefore(PolicyVerificationInInterceptor.class.getName());
-        }
+        super(o ? Phase.POST_STREAM : Phase.POST_INVOKE);
     }
     
     public void setBus(Bus b) {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java Mon Jun 11 11:54:11 2007
@@ -47,8 +47,7 @@
     private int appMessageCount; 
     
     public MessageLossSimulator() {
-        super();
-        setPhase(Phase.PREPARE_SEND);
+        super(Phase.PREPARE_SEND);
         addBefore(MessageSenderInterceptor.class.getName());
     }
 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Mon Jun 11 11:54:11 2007
@@ -634,7 +634,7 @@
         
         class MessageNumberInterceptor extends AbstractPhaseInterceptor {
             public MessageNumberInterceptor() {
-                setPhase(Phase.USER_LOGICAL);
+                super(Phase.USER_LOGICAL);
             }
             
             public void handleMessage(Message m) {
@@ -703,7 +703,7 @@
         
         class SequenceIdInterceptor extends AbstractPhaseInterceptor {
             public SequenceIdInterceptor() {
-                setPhase(Phase.USER_LOGICAL);
+                super(Phase.USER_LOGICAL);
             }
             
             public void handleMessage(Message m) {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/InMessageRecorder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/InMessageRecorder.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/InMessageRecorder.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/InMessageRecorder.java Mon Jun 11 11:54:11 2007
@@ -38,8 +38,8 @@
     private List<byte[]> inbound;
 
     public InMessageRecorder() {
+        super(Phase.RECEIVE);
         inbound = new ArrayList<byte[]>();
-        setPhase(Phase.RECEIVE);
     }
 
     public void handleMessage(Message message) throws Fault {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java Mon Jun 11 11:54:11 2007
@@ -22,9 +22,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -44,11 +42,11 @@
     
     private static final Logger LOG = Logger.getLogger(OutMessageRecorder.class.getName());
     private List<byte[]> outbound;
-    private Set<String> before = Collections.singleton(StaxOutInterceptor.class.getName());
 
     public OutMessageRecorder() {
+        super(Phase.PRE_PROTOCOL);
         outbound = new ArrayList<byte[]>();
-        setPhase(Phase.PRE_PROTOCOL);
+        addBefore(StaxOutInterceptor.class.getName());
     }
     
     public void handleMessage(Message message) throws Fault {
@@ -64,12 +62,6 @@
         }
     }
    
-    @Override
-    public Set<String> getBefore() {
-        return before;
-    }
-
-
     public List<byte[]> getOutboundMessages() {
         return outbound;
     } 

Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java?view=diff&rev=546222&r1=546221&r2=546222
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java Mon Jun 11 11:54:11 2007
@@ -38,12 +38,12 @@
     private static final Logger LOG = Logger.getLogger(FaultThrowingInterceptor.class.getName());
     
     public FaultThrowingInterceptor() {
-        super.setPhase(Phase.USER_LOGICAL);
+        super(Phase.USER_LOGICAL);
     }
     
     
     public FaultThrowingInterceptor(String phase) {
-        super.setPhase(phase);
+        super(phase);
     }
 
     public synchronized void handleMessage(Message message) throws Fault {



Mime
View raw message