cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r880785 [1/3] - in /cxf/trunk: api/src/main/java/org/apache/cxf/interceptor/ api/src/main/java/org/apache/cxf/phase/ api/src/main/java/org/apache/cxf/ws/policy/ rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ rt/bindings/coloc...
Date Mon, 16 Nov 2009 15:15:02 GMT
Author: dkulp
Date: Mon Nov 16 15:14:59 2009
New Revision: 880785

URL: http://svn.apache.org/viewvc?rev=880785&view=rev
Log:
[CXF-2016] Update use of generics for InterceptorProvider and chains

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
    cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java
    cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
    cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java
    cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
    cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
    cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java
    cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java
    cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java
    cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java
    cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java
    cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java
    cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
    cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
    cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
    cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
    cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
    cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ServiceConstructionException.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
    cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
    cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
    cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationFeature.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
    cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
    cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
    cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
    cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
    cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
    cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionInterceptor.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedService.java
    cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/TrustException.java
    cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureTest.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java
    cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
    cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java Mon Nov 16 15:14:59 2009
@@ -23,44 +23,50 @@
 import java.util.List;
 
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
+import org.apache.cxf.message.Message;
 
 public abstract class AbstractAttributedInterceptorProvider extends HashMap<String, Object>
     implements InterceptorProvider {
 
-    private List<Interceptor> in = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> out = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> outFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> inFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
+    private List<Interceptor<? extends Message>> in 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> out 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> outFault  
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> inFault 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+
     
-    public List<Interceptor> getOutFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
         return outFault;
     }
 
-    public List<Interceptor> getInFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getInFaultInterceptors() {
         return inFault;
     }
 
-    public List<Interceptor> getInInterceptors() {
+    public List<Interceptor<? extends Message>> getInInterceptors() {
         return in;
     }
 
-    public List<Interceptor> getOutInterceptors() {
+    public List<Interceptor<? extends Message>> getOutInterceptors() {
         return out;
     }
 
-    public void setInInterceptors(List<Interceptor> interceptors) {
+    public void setInInterceptors(List<Interceptor<? extends Message>> interceptors) {
         in = interceptors;
     }
 
-    public void setInFaultInterceptors(List<Interceptor> interceptors) {
+    public void setInFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
         inFault = interceptors;
     }
 
-    public void setOutInterceptors(List<Interceptor> interceptors) {
+    public void setOutInterceptors(List<Interceptor<? extends Message>> interceptors) {
         out = interceptors;
     }
 
-    public void setOutFaultInterceptors(List<Interceptor> interceptors) {
+    public void setOutFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
         outFault = interceptors;
     }
 

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java Mon Nov 16 15:14:59 2009
@@ -22,43 +22,48 @@
 import java.util.List;
 
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
+import org.apache.cxf.message.Message;
 
 public abstract class AbstractBasicInterceptorProvider  implements InterceptorProvider {
 
-    private List<Interceptor> in = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> out = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> outFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> inFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
+    private List<Interceptor<? extends Message>> in 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> out 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> outFault  
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> inFault 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
     
-    public List<Interceptor> getOutFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
         return outFault;
     }
 
-    public List<Interceptor> getInFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getInFaultInterceptors() {
         return inFault;
     }
 
-    public List<Interceptor> getInInterceptors() {
+    public List<Interceptor<? extends Message>> getInInterceptors() {
         return in;
     }
 
-    public List<Interceptor> getOutInterceptors() {
+    public List<Interceptor<? extends Message>> getOutInterceptors() {
         return out;
     }
 
-    public void setInInterceptors(List<Interceptor> interceptors) {
+    public void setInInterceptors(List<Interceptor<? extends Message>> interceptors) {
         in = interceptors;
     }
 
-    public void setInFaultInterceptors(List<Interceptor> interceptors) {
+    public void setInFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
         inFault = interceptors;
     }
 
-    public void setOutInterceptors(List<Interceptor> interceptors) {
+    public void setOutInterceptors(List<Interceptor<? extends Message>> interceptors) {
         out = interceptors;
     }
 
-    public void setOutFaultInterceptors(List<Interceptor> interceptors) {
+    public void setOutFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
         outFault = interceptors;
     }
     

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java Mon Nov 16 15:14:59 2009
@@ -50,15 +50,15 @@
      * 
      * @param i the interceptor to add
      */
-    void add(Interceptor i);
+    void add(Interceptor<? extends Message> i);
     
     /**
      * Adds multiple interceptors to the interceptor chain. 
      * @param i the interceptors to add to the chain
      */
-    void add(Collection<Interceptor> i);
+    void add(Collection<Interceptor<? extends Message>> i);
     
-    void remove(Interceptor i);
+    void remove(Interceptor<? extends Message> i);
     
     boolean doIntercept(Message message);
     

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java Mon Nov 16 15:14:59 2009
@@ -21,6 +21,8 @@
 
 import java.util.List;
 
+import org.apache.cxf.message.Message;
+
 /**
  * The <code>InterceptorProvider</code> interface is implemented by objects 
  * that have interceptor chains associated with them. The methods in this 
@@ -34,27 +36,27 @@
      * chain of the object.
      * @return <code>List<Interceptor></code> incoming interceptor chain
      */
-    List<Interceptor> getInInterceptors();
+    List<Interceptor<? extends Message>> getInInterceptors();
     
     /**
      * Returns the list of interceptors attached to the outgoing interceptor
      * chain of the object.
      * @return <code>List<Interceptor></code> outgoing interceptor chain
      */
-    List<Interceptor> getOutInterceptors();
+    List<Interceptor<? extends Message>> getOutInterceptors();
     
     /**
      * Returns the list of interceptors attached to the incoming fault interceptor
      * chain of the object.
      * @return <code>List<Interceptor></code> incoming fault interceptor chain
      */
-    List<Interceptor> getInFaultInterceptors();
+    List<Interceptor<? extends Message>> getInFaultInterceptors();
 
     /**
      * Returns the list of interceptors attached to the outgoing fault interceptor
      * chain of the object.
      * @return <code>List<Interceptor></code> outgoing fault interceptor chain
      */
-    List<Interceptor> getOutFaultInterceptors();
+    List<Interceptor<? extends Message>> getOutFaultInterceptors();
     
 }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java Mon Nov 16 15:14:59 2009
@@ -27,6 +27,7 @@
 
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 
 /**
  * The PhaseChainCache provides default interceptor chains for SOAP requests
@@ -41,52 +42,54 @@
     
     @SuppressWarnings("unchecked")
     public PhaseInterceptorChain get(SortedSet<Phase> phaseList,
-                                     List<Interceptor> p1) {
+                                     List<Interceptor<? extends Message>> p1) {
         return getChain(phaseList, p1);
     }
 
     @SuppressWarnings("unchecked")
     public PhaseInterceptorChain get(SortedSet<Phase> phaseList,
-                                     List<Interceptor> p1,
-                                     List<Interceptor> p2) {
+                                     List<Interceptor<? extends Message>> p1,
+                                     List<Interceptor<? extends Message>> p2) {
         return getChain(phaseList, p1, p2);
     }
     @SuppressWarnings("unchecked")
     public PhaseInterceptorChain get(SortedSet<Phase> phaseList,
-                                     List<Interceptor> p1,
-                                     List<Interceptor> p2,
-                                     List<Interceptor> p3) {
+                                     List<Interceptor<? extends Message>> p1,
+                                     List<Interceptor<? extends Message>> p2,
+                                     List<Interceptor<? extends Message>> p3) {
         return getChain(phaseList, p1, p2, p3);
     }
     @SuppressWarnings("unchecked")
     public PhaseInterceptorChain get(SortedSet<Phase> phaseList,
-                                     List<Interceptor> p1,
-                                     List<Interceptor> p2,
-                                     List<Interceptor> p3,
-                                     List<Interceptor> p4) {
+                                     List<Interceptor<? extends Message>> p1,
+                                     List<Interceptor<? extends Message>> p2,
+                                     List<Interceptor<? extends Message>> p3,
+                                     List<Interceptor<? extends Message>> p4) {
         return getChain(phaseList, p1, p2, p3, p4);
     }
     @SuppressWarnings("unchecked")
     public PhaseInterceptorChain get(SortedSet<Phase> phaseList,
-                                     List<Interceptor> p1,
-                                     List<Interceptor> p2,
-                                     List<Interceptor> p3,
-                                     List<Interceptor> p4,
-                                     List<Interceptor> p5) {
+                                     List<Interceptor<? extends Message>> p1,
+                                     List<Interceptor<? extends Message>> p2,
+                                     List<Interceptor<? extends Message>> p3,
+                                     List<Interceptor<? extends Message>> p4,
+                                     List<Interceptor<? extends Message>> p5) {
         return getChain(phaseList, p1, p2, p3, p4, p5);
     }
     
-    private PhaseInterceptorChain getChain(SortedSet<Phase> phaseList, List<Interceptor> ... providers) {
+    private PhaseInterceptorChain getChain(SortedSet<Phase> phaseList,
+                                           List<Interceptor<? extends Message>> ... providers) {
         ChainHolder last = lastData.get();
         
         if (last == null 
             || !last.matches(providers)) {
             
             PhaseInterceptorChain chain = new PhaseInterceptorChain(phaseList);
-            List<ModCountCopyOnWriteArrayList<Interceptor>> copy 
-                = new ArrayList<ModCountCopyOnWriteArrayList<Interceptor>>(providers.length);
-            for (List<Interceptor> p : providers) {
-                copy.add(new ModCountCopyOnWriteArrayList<Interceptor>(p));
+            List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> copy 
+                = new ArrayList<ModCountCopyOnWriteArrayList<
+                    Interceptor<? extends Message>>>(providers.length);
+            for (List<Interceptor<? extends Message>> p : providers) {
+                copy.add(new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(p));
                 chain.add(p);
             }
             last = new ChainHolder(chain, copy);
@@ -98,15 +101,16 @@
     }
     
     private static class ChainHolder {
-        List<ModCountCopyOnWriteArrayList<Interceptor>> lists;
+        List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> lists;
         PhaseInterceptorChain chain;
         
-        ChainHolder(PhaseInterceptorChain c, List<ModCountCopyOnWriteArrayList<Interceptor>> l) {
+        ChainHolder(PhaseInterceptorChain c, 
+                    List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> l) {
             lists = l;
             chain = c;
         }
         
-        boolean matches(List<Interceptor> ... providers) {
+        boolean matches(List<Interceptor<? extends Message>> ... providers) {
             if (lists.size() == providers.length) {
                 for (int x = 0; x < providers.length; x++) {
                     if (lists.get(x).size() != providers[x].size()) {
@@ -119,8 +123,8 @@
                             return false;
                         }
                     } else {
-                        ListIterator<Interceptor> i1 = lists.get(x).listIterator();
-                        ListIterator<Interceptor> i2 = providers[x].listIterator();
+                        ListIterator<Interceptor<? extends Message>> i1 = lists.get(x).listIterator();
+                        ListIterator<Interceptor<? extends Message>> i2 = providers[x].listIterator();
                         
                         while (i1.hasNext()) {
                             if (i1.next() != i2.next()) {

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Mon Nov 16 15:14:59 2009
@@ -162,11 +162,11 @@
         }
     }
     
-    public void add(Collection<Interceptor> newhandlers) {
+    public void add(Collection<Interceptor<? extends Message>> newhandlers) {
         add(newhandlers, false);
     }
 
-    public void add(Collection<Interceptor> newhandlers, boolean force) {
+    public void add(Collection<Interceptor<? extends Message>> newhandlers, boolean force) {
         if (newhandlers == null) {
             return;
         }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java Mon Nov 16 15:14:59 2009
@@ -49,19 +49,19 @@
         return assertionTypes;
     }
 
-    public List<Interceptor> provideInFaultInterceptors(Message m) {
+    public List<Interceptor<? extends Message>> provideInFaultInterceptors(Message m) {
         return getInFaultInterceptors();
     }
 
-    public List<Interceptor> provideInInterceptors(Message m) {
+    public List<Interceptor<? extends Message>> provideInInterceptors(Message m) {
         return getInInterceptors();
     }
 
-    public List<Interceptor> provideOutFaultInterceptors(Message m) {
+    public List<Interceptor<? extends Message>> provideOutFaultInterceptors(Message m) {
         return getOutFaultInterceptors();
     }
 
-    public List<Interceptor> provideOutInterceptors(Message m) {
+    public List<Interceptor<? extends Message>> provideOutInterceptors(Message m) {
         return getOutInterceptors();
     } 
     

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java Mon Nov 16 15:14:59 2009
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.apache.neethi.Policy;
 
 /**
@@ -34,5 +35,5 @@
     
     Collection<PolicyAssertion> getChosenAlternative();
     
-    List<Interceptor> getInterceptors();
+    List<Interceptor<? extends Message>> getInterceptors();
 }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java Mon Nov 16 15:14:59 2009
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.apache.neethi.Policy;
 
 /**
@@ -42,7 +43,7 @@
     
     Collection<PolicyAssertion> getFaultVocabulary();
     
-    List<Interceptor> getInterceptors();
+    List<Interceptor<? extends Message>> getInterceptors();
     
-    List<Interceptor> getFaultInterceptors();
+    List<Interceptor<? extends Message>> getFaultInterceptors();
 }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java Mon Nov 16 15:14:59 2009
@@ -40,12 +40,12 @@
      */
     Collection<QName> getAssertionTypes();
     
-    List<Interceptor> provideInInterceptors(Message m);
+    List<Interceptor<? extends Message>> provideInInterceptors(Message m);
     
-    List<Interceptor> provideOutInterceptors(Message m);
+    List<Interceptor<? extends Message>> provideOutInterceptors(Message m);
     
-    List<Interceptor> provideOutFaultInterceptors(Message m);
+    List<Interceptor<? extends Message>> provideOutFaultInterceptors(Message m);
     
-    List<Interceptor> provideInFaultInterceptors(Message m);
+    List<Interceptor<? extends Message>> provideInFaultInterceptors(Message m);
     
 }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java Mon Nov 16 15:14:59 2009
@@ -26,6 +26,7 @@
 
 import org.apache.cxf.extension.Registry;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 
 
 /**
@@ -42,6 +43,7 @@
      */
     void register(PolicyInterceptorProvider provider);
     
-    List<Interceptor> getInterceptors(Collection<PolicyAssertion> alterative, boolean out, boolean fault);
+    List<Interceptor<? extends Message>> getInterceptors(Collection<PolicyAssertion> alterative, 
+                                                         boolean out, boolean fault);
 
 }

Modified: cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java (original)
+++ cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java Mon Nov 16 15:14:59 2009
@@ -129,8 +129,8 @@
         exchange.put(OperationInfo.class, boi.getOperationInfo());
     }
     
-    protected List<Interceptor> addColocInterceptors() {
-        List<Interceptor> list = new ArrayList<Interceptor>();
+    protected List<Interceptor<? extends Message>> addColocInterceptors() {
+        List<Interceptor<? extends Message>> list = new ArrayList<Interceptor<? extends Message>>();
         list.add(new ColocInInterceptor());
         return list;
     }

Modified: cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java (original)
+++ cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java Mon Nov 16 15:14:59 2009
@@ -71,7 +71,7 @@
         PhaseInterceptorChain chain = new PhaseInterceptorChain(phases);
         
         Endpoint ep = ex.get(Endpoint.class);
-        List<Interceptor> il = ep.getOutInterceptors();
+        List<Interceptor<? extends Message>> il = ep.getOutInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by endpoint: " + il);
         }
@@ -104,7 +104,7 @@
         PhaseInterceptorChain chain = new PhaseInterceptorChain(phases);
         
         Endpoint ep = ex.get(Endpoint.class);
-        List<Interceptor> il = ep.getInInterceptors();
+        List<Interceptor<? extends Message>> il = ep.getInInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by endpoint: " + il);
         }
@@ -151,7 +151,8 @@
             }
         }
         String key = in ? Message.IN_INTERCEPTORS : Message.OUT_INTERCEPTORS;
-        Collection<Interceptor> is = CastUtils.cast((Collection<?>)m.get(key));
+        Collection<Interceptor<? extends Message>> is 
+            = CastUtils.cast((Collection<?>)m.get(key));
         if (is != null) {
             chain.add(is);
         }

Modified: cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java (original)
+++ cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java Mon Nov 16 15:14:59 2009
@@ -128,9 +128,9 @@
         EasyMock.expect(
             bus.getExtension(PhaseManager.class)).andReturn(
                                       new PhaseManagerImpl()).times(2);
-        EasyMock.expect(bus.getInInterceptors()).andReturn(new ArrayList<Interceptor>());
-        EasyMock.expect(ep.getInInterceptors()).andReturn(new ArrayList<Interceptor>());
-        EasyMock.expect(srv.getInInterceptors()).andReturn(new ArrayList<Interceptor>());
+        EasyMock.expect(bus.getInInterceptors()).andReturn(new ArrayList<Interceptor<? extends Message>>());
+        EasyMock.expect(ep.getInInterceptors()).andReturn(new ArrayList<Interceptor<? extends Message>>());
+        EasyMock.expect(srv.getInInterceptors()).andReturn(new ArrayList<Interceptor<? extends Message>>());
 
         control.replay();
         observer.onMessage(msg);
@@ -163,8 +163,8 @@
             exchange.put(OperationInfo.class, oi);
         }
         
-        protected List<Interceptor> addColocInterceptors() {
-            return new ArrayList<Interceptor>();
+        protected List<Interceptor<? extends Message>> addColocInterceptors() {
+            return new ArrayList<Interceptor<? extends Message>>();
         }
     }
 }

Modified: cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java (original)
+++ cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java Mon Nov 16 15:14:59 2009
@@ -237,10 +237,13 @@
         
         EasyMock.expect(ep.getBinding()).andReturn(bd);
         EasyMock.expect(bd.createMessage()).andReturn(new MessageImpl());
-        EasyMock.expect(ep.getInInterceptors()).andReturn(new ArrayList<Interceptor>()).atLeastOnce();
+        EasyMock.expect(ep.getInInterceptors())
+            .andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
         EasyMock.expect(ep.getService()).andReturn(srv).atLeastOnce();
-        EasyMock.expect(srv.getInInterceptors()).andReturn(new ArrayList<Interceptor>()).atLeastOnce();
-        EasyMock.expect(bus.getInInterceptors()).andReturn(new ArrayList<Interceptor>()).atLeastOnce();
+        EasyMock.expect(srv.getInInterceptors())
+            .andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
+        EasyMock.expect(bus.getInInterceptors())
+            .andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
         
         control.replay();
         colocOut.invokeInboundChain(ex, ep);

Modified: cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java (original)
+++ cxf/trunk/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java Mon Nov 16 15:14:59 2009
@@ -118,10 +118,13 @@
         ex.put(Endpoint.class, ep);
         ex.put(Service.class, srv);
         
-        EasyMock.expect(ep.getOutInterceptors()).andReturn(new ArrayList<Interceptor>()).atLeastOnce();
+        EasyMock.expect(ep.getOutInterceptors())
+            .andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
         EasyMock.expect(ep.getService()).andReturn(srv).atLeastOnce();
-        EasyMock.expect(srv.getOutInterceptors()).andReturn(new ArrayList<Interceptor>()).atLeastOnce();
-        EasyMock.expect(bus.getOutInterceptors()).andReturn(new ArrayList<Interceptor>()).atLeastOnce();
+        EasyMock.expect(srv.getOutInterceptors())
+            .andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
+        EasyMock.expect(bus.getOutInterceptors())
+            .andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
         
         control.replay();
         InterceptorChain chain = ColocUtil.getOutInterceptorChain(ex, list);
@@ -148,10 +151,13 @@
         ex.put(Service.class, srv);
         
         EasyMock.expect(bus.getExtension(PhaseManager.class)).andReturn(phaseMgr);
-        EasyMock.expect(ep.getInInterceptors()).andReturn(new ArrayList<Interceptor>()).atLeastOnce();
+        EasyMock.expect(ep.getInInterceptors())
+            .andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
         EasyMock.expect(ep.getService()).andReturn(srv).atLeastOnce();
-        EasyMock.expect(srv.getInInterceptors()).andReturn(new ArrayList<Interceptor>()).atLeastOnce();
-        EasyMock.expect(bus.getInInterceptors()).andReturn(new ArrayList<Interceptor>()).atLeastOnce();
+        EasyMock.expect(srv.getInInterceptors())
+            .andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
+        EasyMock.expect(bus.getInInterceptors())
+            .andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
         
         control.replay();
         InterceptorChain chain = ColocUtil.getInInterceptorChain(ex, list);

Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java Mon Nov 16 15:14:59 2009
@@ -53,11 +53,11 @@
         return new CorbaMessage(m);
     }
 
-    public List<Interceptor> getFaultInInterceptors() {
+    public List<Interceptor<? extends Message>> getFaultInInterceptors() {
         return this.getInFaultInterceptors();
     }
     
-    public List<Interceptor> getFaultOutInterceptors() {
+    public List<Interceptor<? extends Message>> getFaultOutInterceptors() {
         return this.getOutFaultInterceptors();
     }
 

Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java Mon Nov 16 15:14:59 2009
@@ -89,9 +89,9 @@
         CorbaBinding binding = (CorbaBinding)factory.createBinding(bindingInfo);
         assertNotNull(binding);
         assertTrue(CorbaBinding.class.isInstance(binding));        
-        List<Interceptor> inInterceptors = binding.getInInterceptors();
+        List<Interceptor<? extends Message>> inInterceptors = binding.getInInterceptors();
         assertNotNull(inInterceptors);
-        List<Interceptor> outInterceptors = binding.getOutInterceptors();
+        List<Interceptor<? extends Message>> outInterceptors = binding.getOutInterceptors();
         assertNotNull(outInterceptors);
         assertEquals(2, inInterceptors.size());
         assertEquals(2, outInterceptors.size());        

Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java Mon Nov 16 15:14:59 2009
@@ -57,13 +57,13 @@
     @Test
     public void testCorbaBinding() {
         CorbaBinding binding = new CorbaBinding();
-        List<Interceptor> in = binding.getInInterceptors();
+        List<Interceptor<? extends Message>> in = binding.getInInterceptors();
         assertNotNull(in);
-        List<Interceptor> out = binding.getOutInterceptors();
+        List<Interceptor<? extends Message>> out = binding.getOutInterceptors();
         assertNotNull(out);
-        List<Interceptor> infault = binding.getFaultInInterceptors();
+        List<Interceptor<? extends Message>> infault = binding.getInFaultInterceptors();
         assertNotNull(infault);
-        List<Interceptor> outfault = binding.getFaultOutInterceptors();
+        List<Interceptor<? extends Message>> outfault = binding.getFaultOutInterceptors();
         assertNotNull(outfault);
         Message message = binding.createMessage();
         message.put(ORB.class, orb);

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java Mon Nov 16 15:14:59 2009
@@ -34,6 +34,7 @@
 import org.apache.cxf.configuration.spring.BusWiringType;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -102,35 +103,35 @@
             }
         }
         
-        public List<Interceptor> getOutFaultInterceptors() {
+        public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
             return bus.getOutFaultInterceptors();
         }
 
-        public List<Interceptor> getInFaultInterceptors() {
+        public List<Interceptor<? extends Message>> getInFaultInterceptors() {
             return bus.getInFaultInterceptors();
         }
 
-        public List<Interceptor> getInInterceptors() {
+        public List<Interceptor<? extends Message>> getInInterceptors() {
             return bus.getInInterceptors();
         }
 
-        public List<Interceptor> getOutInterceptors() {
+        public List<Interceptor<? extends Message>> getOutInterceptors() {
             return bus.getOutInterceptors();
         }
 
-        public void setInInterceptors(List<Interceptor> interceptors) {
+        public void setInInterceptors(List<Interceptor<? extends Message>> interceptors) {
             bus.setInInterceptors(interceptors);
         }
 
-        public void setInFaultInterceptors(List<Interceptor> interceptors) {
+        public void setInFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
             bus.setInFaultInterceptors(interceptors);
         }
 
-        public void setOutInterceptors(List<Interceptor> interceptors) {
+        public void setOutInterceptors(List<Interceptor<? extends Message>> interceptors) {
             bus.setOutInterceptors(interceptors);
         }
 
-        public void setOutFaultInterceptors(List<Interceptor> interceptors) {
+        public void setOutFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
             bus.setOutFaultInterceptors(interceptors);
         }
         

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java Mon Nov 16 15:14:59 2009
@@ -28,6 +28,7 @@
 import org.apache.cxf.interceptor.DocLiteralInInterceptor;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.WrappedInInterceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.PhaseInterceptor;
 
 public class StaxDataBindingFeature extends AbstractFeature {
@@ -43,7 +44,7 @@
         removeDatabindingInterceptor(server.getEndpoint().getBinding().getInInterceptors());
     }
 
-    private void removeDatabindingInterceptor(List<Interceptor> inInterceptors) {
+    private void removeDatabindingInterceptor(List<Interceptor<? extends Message>> inInterceptors) {
         removeInterceptor(inInterceptors, DocLiteralInInterceptor.class.getName());
         removeInterceptor(inInterceptors, BareInInterceptor.class.getName());
         removeInterceptor(inInterceptors, WrappedInInterceptor.class.getName());
@@ -52,7 +53,7 @@
         inInterceptors.add(new StaxDataBindingInterceptor());
     }
 
-    private void removeInterceptor(List<Interceptor> inInterceptors, String name) {
+    private void removeInterceptor(List<Interceptor<? extends Message>> inInterceptors, String name) {
 
         for (Interceptor i : inInterceptors) {
             if (i instanceof PhaseInterceptor) {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Mon Nov 16 15:14:59 2009
@@ -610,19 +610,19 @@
         message.put(Message.INBOUND_MESSAGE, Boolean.TRUE);
         PhaseManager pm = bus.getExtension(PhaseManager.class);
 
-        List<Interceptor> i1 = bus.getInInterceptors();
+        List<Interceptor<? extends Message>> i1 = bus.getInInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by bus: " + i1);
         }
-        List<Interceptor> i2 = getInInterceptors();
+        List<Interceptor<? extends Message>> i2 = getInInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by client: " + i2);
         }
-        List<Interceptor> i3 = endpoint.getInInterceptors();
+        List<Interceptor<? extends Message>> i3 = endpoint.getInInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by endpoint: " + i2);
         }
-        List<Interceptor> i4 = endpoint.getBinding().getInInterceptors();
+        List<Interceptor<? extends Message>> i4 = endpoint.getBinding().getInInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by binding: " + i4);
         }
@@ -790,23 +790,23 @@
 
         PhaseManager pm = bus.getExtension(PhaseManager.class);
 
-        List<Interceptor> i1 = bus.getOutInterceptors();
+        List<Interceptor<? extends Message>> i1 = bus.getOutInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by bus: " + i1);
         }
-        List<Interceptor> i2 = getOutInterceptors();
+        List<Interceptor<? extends Message>> i2 = getOutInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by client: " + i2);
         }
-        List<Interceptor> i3 = endpoint.getOutInterceptors();
+        List<Interceptor<? extends Message>> i3 = endpoint.getOutInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by endpoint: " + i3);
         }
-        List<Interceptor> i4 = endpoint.getBinding().getOutInterceptors();
+        List<Interceptor<? extends Message>> i4 = endpoint.getBinding().getOutInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by binding: " + i4);
         }
-        List<Interceptor> i5 = null;
+        List<Interceptor<? extends Message>> i5 = null;
         if (endpoint.getService().getDataBinding() instanceof InterceptorProvider) {
             i5 = ((InterceptorProvider)endpoint.getService().getDataBinding()).getOutInterceptors();
             if (LOG.isLoggable(Level.FINE)) {
@@ -835,7 +835,8 @@
             }
         }
         String key = in ? Message.IN_INTERCEPTORS : Message.OUT_INTERCEPTORS;
-        Collection<Interceptor> is = CastUtils.cast((Collection<?>)ctx.get(key));
+        Collection<Interceptor<? extends Message>> is 
+            = CastUtils.cast((Collection<?>)ctx.get(key));
         if (is != null) {
             chain.add(is);
         }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java Mon Nov 16 15:14:59 2009
@@ -26,9 +26,9 @@
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.feature.Features;
+import org.apache.cxf.message.Message;
 
 public class AnnotationInterceptors {
     
@@ -39,11 +39,7 @@
     public AnnotationInterceptors(Class<?> ... clz) {
         clazzes = clz;
     }
-    
-    public List<Interceptor> getInFaultInterceptors() {
-        return getAnnotationObject(InFaultInterceptors.class, Interceptor.class);
-    }
-    
+        
     private <T> List<T> getAnnotationObject(Class<? extends Annotation> annotationClazz, Class<T> type) {
         
         for (Class<?> cls : clazzes) {
@@ -80,34 +76,54 @@
                     object = ClassLoaderUtils.loadClass(annObjectName, this.getClass()).newInstance();
                     theAnnotationObjects.add(type.cast(object));
                 } catch (ClassNotFoundException e) {
-                    throw new Fault(new Message("COULD_NOT_CREATE_ANNOTATION_OBJECT", 
+                    throw new Fault(new org.apache.cxf.common.i18n.Message(
+                                                    "COULD_NOT_CREATE_ANNOTATION_OBJECT", 
                                                     BUNDLE, annObjectName), e);
                 } catch (InstantiationException ie) {
-                    throw new Fault(new Message("COULD_NOT_CREATE_ANNOTATION_OBJECT", 
+                    throw new Fault(new org.apache.cxf.common.i18n.Message(
+                                                    "COULD_NOT_CREATE_ANNOTATION_OBJECT", 
                                                     BUNDLE, annObjectName), ie);
                 } catch (IllegalAccessException iae) {
-                    throw new Fault(new Message("COULD_NOT_CREATE_ANNOTATION_OBJECT", 
+                    throw new Fault(new org.apache.cxf.common.i18n.Message(
+                                                    "COULD_NOT_CREATE_ANNOTATION_OBJECT", 
                                                     BUNDLE, annObjectName), iae);
                 } catch (ClassCastException ex) {
-                    throw new Fault(new Message("COULD_NOT_CREATE_ANNOTATION_OBJECT", 
+                    throw new Fault(new org.apache.cxf.common.i18n.Message(
+                                                "COULD_NOT_CREATE_ANNOTATION_OBJECT", 
                                                 BUNDLE, annObjectName), ex);
                 }
             }
         }
         return theAnnotationObjects;
     }
+    
+    @SuppressWarnings("unchecked")
+    private List<Interceptor<? extends Message>> getAnnotationInterceptorList(Class<? extends Annotation> t) {
+        List<Interceptor> i = getAnnotationObject(t, Interceptor.class);
+        if (i == null) {
+            return null;
+        }
+        List<Interceptor<? extends Message>> m = new ArrayList<Interceptor<? extends Message>>();
+        for (Interceptor i2 : i) {
+            m.add(i2);
+        }
+        return m;
+    }
 
+    public List<Interceptor<? extends Message>> getInFaultInterceptors() {
+        return getAnnotationInterceptorList(InFaultInterceptors.class);
+    }
 
-    public List<Interceptor> getInInterceptors() {
-        return getAnnotationObject(InInterceptors.class, Interceptor.class);
+    public List<Interceptor<? extends Message>> getInInterceptors() {
+        return getAnnotationInterceptorList(InInterceptors.class);
     }
 
-    public List<Interceptor> getOutFaultInterceptors() {
-        return getAnnotationObject(OutFaultInterceptors.class, Interceptor.class);
+    public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
+        return getAnnotationInterceptorList(OutFaultInterceptors.class);
     }
 
-    public List<Interceptor> getOutInterceptors() {
-        return getAnnotationObject(OutInterceptors.class, Interceptor.class);
+    public List<Interceptor<? extends Message>> getOutInterceptors() {
+        return getAnnotationInterceptorList(OutInterceptors.class);
     }
         
     public List<AbstractFeature> getFeatures() {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java Mon Nov 16 15:14:59 2009
@@ -66,7 +66,8 @@
                 chain.add(p.getInFaultInterceptors());
             }
         }
-        Collection<Interceptor> is = CastUtils.cast((Collection<?>)m.get(Message.FAULT_IN_INTERCEPTORS));
+        Collection<Interceptor<? extends Message>> is 
+            = CastUtils.cast((Collection<?>)m.get(Message.FAULT_IN_INTERCEPTORS));
         if (is != null) {
             chain.add(is);
         }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java Mon Nov 16 15:14:59 2009
@@ -63,7 +63,8 @@
                 chain.add(p.getOutFaultInterceptors());
             }
         }
-        Collection<Interceptor> is = CastUtils.cast((Collection<?>)m.get(Message.FAULT_OUT_INTERCEPTORS));
+        Collection<Interceptor<? extends Message>> is 
+            = CastUtils.cast((Collection<?>)m.get(Message.FAULT_OUT_INTERCEPTORS));
         if (is != null) {
             chain.add(is);
         }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java Mon Nov 16 15:14:59 2009
@@ -103,7 +103,7 @@
         PhaseInterceptorChain chain = new PhaseInterceptorChain(pm.getOutPhases());
         
         Endpoint ep = ex.get(Endpoint.class);
-        List<Interceptor> il = ep.getOutInterceptors();
+        List<Interceptor<? extends Message>> il = ep.getOutInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by endpoint: " + il);
         }
@@ -144,7 +144,8 @@
                 chain.add(p.getOutInterceptors());
             }
         }
-        Collection<Interceptor> is = CastUtils.cast((Collection<?>)m.get(Message.OUT_INTERCEPTORS));
+        Collection<Interceptor<? extends Message>> is 
+            = CastUtils.cast((Collection<?>)m.get(Message.OUT_INTERCEPTORS));
         if (is != null) {
             chain.add(is);
         }
@@ -158,26 +159,26 @@
         
         Endpoint ep = ex.get(Endpoint.class);
         
-        List<Interceptor> i1 = bus.getOutInterceptors();
+        List<Interceptor<? extends Message>> i1 = bus.getOutInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by bus: " + i1);
         }
-        List<Interceptor> i2 = ep.getService().getOutInterceptors();
+        List<Interceptor<? extends Message>> i2 = ep.getService().getOutInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by service: " + i2);
         }
-        List<Interceptor> i3 = ep.getOutInterceptors();
+        List<Interceptor<? extends Message>> i3 = ep.getOutInterceptors();
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Interceptors contributed by endpoint: " + i3);
         }
-        List<Interceptor> i4 = null;
+        List<Interceptor<? extends Message>> i4 = null;
         if (binding != null) {
             i4 = binding.getOutInterceptors();
             if (LOG.isLoggable(Level.FINE)) {
                 LOG.fine("Interceptors contributed by binding: " + i4);
             }
         }
-        List<Interceptor> i5 = null;
+        List<Interceptor<? extends Message>> i5 = null;
         if (ep.getService().getDataBinding() instanceof InterceptorProvider) {
             i5 = ((InterceptorProvider)ep.getService().getDataBinding()).getOutInterceptors();
             if (LOG.isLoggable(Level.FINE)) {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ServiceConstructionException.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ServiceConstructionException.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ServiceConstructionException.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ServiceConstructionException.java Mon Nov 16 15:14:59 2009
@@ -19,6 +19,8 @@
 
 package org.apache.cxf.service.factory;
 
+import java.util.logging.Logger;
+
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.i18n.UncheckedException;
 
@@ -35,5 +37,11 @@
     public ServiceConstructionException(Throwable cause) {
         super(cause);
     }
+    public ServiceConstructionException(String msg, Logger log) {
+        super(new Message(msg, log));
+    }
+    public ServiceConstructionException(String msg, Logger log, Throwable cause) {
+        super(new Message(msg, log), cause);
+    }
 
 }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java Mon Nov 16 15:14:59 2009
@@ -119,7 +119,8 @@
                 chain.add(p.getInInterceptors());
             }
         }
-        Collection<Interceptor> is = CastUtils.cast((Collection<?>)m.get(Message.IN_INTERCEPTORS));
+        Collection<Interceptor<? extends Message>> is 
+            = CastUtils.cast((Collection<?>)m.get(Message.IN_INTERCEPTORS));
         if (is != null) {
             chain.add(is);
         }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java Mon Nov 16 15:14:59 2009
@@ -45,8 +45,10 @@
     public static final String ENDPOINTS = "multipleEndpointObserver.endpoints";
     
     protected Bus bus;
-    protected List<Interceptor> bindingInterceptors = new CopyOnWriteArrayList<Interceptor>();
-    protected List<Interceptor> routingInterceptors = new CopyOnWriteArrayList<Interceptor>();
+    protected List<Interceptor<? extends Message>> bindingInterceptors
+        = new CopyOnWriteArrayList<Interceptor<? extends Message>>();
+    protected List<Interceptor<? extends Message>> routingInterceptors
+        = new CopyOnWriteArrayList<Interceptor<? extends Message>>();
     private Set<Endpoint> endpoints = new CopyOnWriteArraySet<Endpoint>();
     
     public MultipleEndpointObserver(Bus bus) {
@@ -109,11 +111,11 @@
         }
     }
 
-    public List<Interceptor> getBindingInterceptors() {
+    public List<Interceptor<? extends Message>> getBindingInterceptors() {
         return bindingInterceptors;
     }
 
-    public List<Interceptor> getRoutingInterceptors() {
+    public List<Interceptor<? extends Message>> getRoutingInterceptors() {
         return routingInterceptors;
     }
 

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java Mon Nov 16 15:14:59 2009
@@ -29,6 +29,8 @@
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.message.Message;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -39,7 +41,7 @@
         String cfgFile = "org/apache/cxf/bus/spring/bus.xml";
         Bus bus = new SpringBusFactory().createBus(cfgFile, true);
         
-        List<Interceptor> in = bus.getInInterceptors();
+        List<Interceptor<? extends Message>> in = bus.getInInterceptors();
         boolean found = false;
         for (Interceptor i : in) {
             if (i instanceof LoggingInInterceptor) {

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java Mon Nov 16 15:14:59 2009
@@ -115,7 +115,7 @@
     
     private void checkCustomerConfiguration(Bus bus) {
         assertNotNull(bus);
-        List<Interceptor> interceptors = bus.getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = bus.getInInterceptors();
         assertEquals("Unexpected number of interceptors", 2, interceptors.size());
         assertEquals("Unexpected interceptor", "in-a", interceptors.get(0).toString());
         assertEquals("Unexpected interceptor", "in-b", interceptors.get(1).toString());

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java Mon Nov 16 15:14:59 2009
@@ -27,6 +27,7 @@
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseManager;
@@ -54,7 +55,7 @@
     private BindingMessageInfo bmInfo;
     private MessageInfo mInfo;
     private List<Phase> phases;
-    private List<Interceptor> empty;
+    private List<Interceptor<? extends Message>> empty;
     private Binding binding;
 
     @Before
@@ -64,7 +65,7 @@
 
         phases = new ArrayList<Phase>();
         phases.add(new Phase(Phase.SEND, 1000));
-        empty = new ArrayList<Interceptor>();
+        empty = new ArrayList<Interceptor<? extends Message>>();
 
         bus = control.createMock(Bus.class);
         PhaseManager pm = new PhaseManagerImpl();

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Mon Nov 16 15:14:59 2009
@@ -59,7 +59,6 @@
 
 import org.xml.sax.SAXException;
 
-import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.CacheMap;
 import org.apache.cxf.common.util.CachedClass;
@@ -79,6 +78,7 @@
 import org.apache.cxf.jaxb.attachment.JAXBAttachmentSchemaValidationHack;
 import org.apache.cxf.jaxb.io.DataReaderImpl;
 import org.apache.cxf.jaxb.io.DataWriterImpl;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.resource.URIResolver;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.factory.ServiceConstructionException;
@@ -226,10 +226,14 @@
     private boolean qualifiedSchemas;
     private Service service;
     
-    private List<Interceptor> in = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> out = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> outFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> inFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
+    private List<Interceptor<? extends Message>> in 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> out
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> outFault 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> inFault 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
 
     public JAXBDataBinding() {
     }
@@ -396,7 +400,7 @@
                     //will cause it to load automatically and we'll skip them later
                     schemas.addAll(bi);
                 } catch (IOException e) {
-                    throw new ServiceConstructionException(new Message("SCHEMA_GEN_EXC", LOG), e);
+                    throw new ServiceConstructionException("SCHEMA_GEN_EXC", LOG, e);
                 }
             }
             for (DOMSource r : schemas) {
@@ -906,19 +910,19 @@
         return null;
     }   
     
-    public List<Interceptor> getOutFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
         return outFault;
     }
 
-    public List<Interceptor> getInFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getInFaultInterceptors() {
         return inFault;
     }
 
-    public List<Interceptor> getInInterceptors() {
+    public List<Interceptor<? extends Message>> getInInterceptors() {
         return in;
     }
 
-    public List<Interceptor> getOutInterceptors() {
+    public List<Interceptor<? extends Message>> getOutInterceptors() {
         return out;
     }
 

Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java Mon Nov 16 15:14:59 2009
@@ -86,8 +86,10 @@
         BindingFactory bf = control.createMock(BindingFactory.class);
         Binding binding = control.createMock(Binding.class);
         expect(bf.createBinding(null)).andStubReturn(binding);
-        expect(binding.getInFaultInterceptors()).andStubReturn(new ArrayList<Interceptor>());
-        expect(binding.getOutFaultInterceptors()).andStubReturn(new ArrayList<Interceptor>());
+        expect(binding.getInFaultInterceptors())
+            .andStubReturn(new ArrayList<Interceptor<? extends Message>>());
+        expect(binding.getOutFaultInterceptors())
+            .andStubReturn(new ArrayList<Interceptor<? extends Message>>());
         
         bfm.registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", bf);      
     

Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java Mon Nov 16 15:14:59 2009
@@ -82,8 +82,10 @@
         BindingFactory bf = control.createMock(BindingFactory.class);
         Binding binding = control.createMock(Binding.class);
         expect(bf.createBinding(null)).andStubReturn(binding);
-        expect(binding.getInFaultInterceptors()).andStubReturn(new ArrayList<Interceptor>());
-        expect(binding.getOutFaultInterceptors()).andStubReturn(new ArrayList<Interceptor>());
+        expect(binding.getInFaultInterceptors())
+            .andStubReturn(new ArrayList<Interceptor<? extends Message>>());
+        expect(binding.getOutFaultInterceptors())
+            .andStubReturn(new ArrayList<Interceptor<? extends Message>>());
 
         bfm.registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", bf);
     }

Modified: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java Mon Nov 16 15:14:59 2009
@@ -40,6 +40,7 @@
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.phase.PhaseInterceptorChain;
 import org.apache.cxf.service.Service;
@@ -81,8 +82,10 @@
         BindingFactory bf = control.createMock(BindingFactory.class);
         Binding binding = control.createMock(Binding.class);
         expect(bf.createBinding(null)).andStubReturn(binding);
-        expect(binding.getInFaultInterceptors()).andStubReturn(new ArrayList<Interceptor>());
-        expect(binding.getOutFaultInterceptors()).andStubReturn(new ArrayList<Interceptor>());
+        expect(binding.getInFaultInterceptors())
+            .andStubReturn(new ArrayList<Interceptor<? extends Message>>());
+        expect(binding.getOutFaultInterceptors())
+            .andStubReturn(new ArrayList<Interceptor<? extends Message>>());
         
         bfm.registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", bf);
 

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java Mon Nov 16 15:14:59 2009
@@ -515,17 +515,17 @@
     
     protected static PhaseInterceptorChain setupOutInterceptorChain(ClientConfiguration cfg) { 
         PhaseManager pm = cfg.getBus().getExtension(PhaseManager.class);
-        List<Interceptor> i1 = cfg.getBus().getOutInterceptors();
-        List<Interceptor> i2 = cfg.getOutInterceptors();
-        List<Interceptor> i3 = cfg.getConduitSelector().getEndpoint().getOutInterceptors();
+        List<Interceptor<? extends Message>> i1 = cfg.getBus().getOutInterceptors();
+        List<Interceptor<? extends Message>> i2 = cfg.getOutInterceptors();
+        List<Interceptor<? extends Message>> i3 = cfg.getConduitSelector().getEndpoint().getOutInterceptors();
         return new PhaseChainCache().get(pm.getOutPhases(), i1, i2, i3);
     }
     
     protected static PhaseInterceptorChain setupInInterceptorChain(ClientConfiguration cfg) { 
         PhaseManager pm = cfg.getBus().getExtension(PhaseManager.class);
-        List<Interceptor> i1 = cfg.getBus().getInInterceptors();
-        List<Interceptor> i2 = cfg.getInInterceptors();
-        List<Interceptor> i3 = cfg.getConduitSelector().getEndpoint().getInInterceptors();
+        List<Interceptor<? extends Message>> i1 = cfg.getBus().getInInterceptors();
+        List<Interceptor<? extends Message>> i2 = cfg.getInInterceptors();
+        List<Interceptor<? extends Message>> i3 = cfg.getConduitSelector().getEndpoint().getInInterceptors();
         
         return new PhaseChainCache().get(pm.getInPhases(), i1, i2, i3);
     }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java Mon Nov 16 15:14:59 2009
@@ -37,10 +37,14 @@
 
 public class ClientConfiguration implements InterceptorProvider {
 
-    private List<Interceptor> inInterceptors = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> outInterceptors = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> outFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
-    private List<Interceptor> inFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
+    private List<Interceptor<? extends Message>> inInterceptors 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> outInterceptors 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> outFault 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    private List<Interceptor<? extends Message>> inFault 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
     private ConduitSelector conduitSelector;
     private Bus bus;
     private Map<String, Object> requestContext = new HashMap<String, Object>();
@@ -63,35 +67,35 @@
         return bus;
     }
     
-    public List<Interceptor> getInFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getInFaultInterceptors() {
         return inFault;
     }
 
-    public List<Interceptor> getInInterceptors() {
+    public List<Interceptor<? extends Message>> getInInterceptors() {
         return inInterceptors;
     }
 
-    public List<Interceptor> getOutFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
         return outFault;
     }
 
-    public List<Interceptor> getOutInterceptors() {
+    public List<Interceptor<? extends Message>> getOutInterceptors() {
         return outInterceptors;
     }
 
-    public void setInInterceptors(List<Interceptor> interceptors) {
+    public void setInInterceptors(List<Interceptor<? extends Message>> interceptors) {
         inInterceptors = interceptors;
     }
 
-    public void setOutInterceptors(List<Interceptor> interceptors) {
+    public void setOutInterceptors(List<Interceptor<? extends Message>> interceptors) {
         outInterceptors = interceptors;
     }
     
-    public void setInFaultInterceptors(List<Interceptor> interceptors) {
+    public void setInFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
         inFault = interceptors;
     }
 
-    public void setOutFaultInterceptors(List<Interceptor> interceptors) {
+    public void setOutFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
         outFault = interceptors;
     }
     

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java Mon Nov 16 15:14:59 2009
@@ -44,6 +44,7 @@
 import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
 
 public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
@@ -121,6 +122,7 @@
         }
     }
     
+    @SuppressWarnings("unchecked")
     protected void setInterceptors(JAXRSServerFactoryBean bean, ServletConfig servletConfig,
                                    String paramName) {
         String value  = servletConfig.getInitParameter(paramName);
@@ -128,14 +130,14 @@
             return;
         }
         String[] values = value.split(" ");
-        List<Interceptor> list = new ArrayList<Interceptor>();
+        List<Interceptor<? extends Message>> list = new ArrayList<Interceptor<? extends Message>>();
         for (String interceptorVal : values) {
             String theValue = interceptorVal.trim();
             if (theValue.length() != 0) {
                 try {
                     Class<?> intClass = ClassLoaderUtils.loadClass(theValue,
                                                                    CXFNonSpringJaxrsServlet.class);
-                    list.add((Interceptor)intClass.newInstance());
+                    list.add((Interceptor<? extends Message>)intClass.newInstance());
                 } catch (ClassNotFoundException ex) {
                     LOG.warning("Interceptor class " + theValue + " can not be found");
                 } catch (InstantiationException ex) {



Mime
View raw message