cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r880785 [2/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
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Mon Nov 16 15:14:59 2009
@@ -43,7 +43,6 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingConfiguration;
-import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.ClassHelper;
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
@@ -58,6 +57,7 @@
 import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
 import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -96,10 +96,14 @@
     
     private List<String> schemaLocations;
     private List<AbstractFeature> features;
-    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>>();
     private List<Handler> handlers = new ModCountCopyOnWriteArrayList<Handler>();
 
     public EndpointImpl(Object implementor) {
@@ -470,35 +474,35 @@
         return serverFactory.getDataBinding();
     }
 
-    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;
     }
     public void setHandlers(List<Handler> h) {
@@ -558,12 +562,14 @@
     
     public EndpointReference getEndpointReference(Element... referenceParameters) {
         if (!isPublished()) {
-            throw new WebServiceException(new Message("ENDPOINT_NOT_PUBLISHED", LOG).toString());
+            throw new WebServiceException(new org.apache.cxf.common.i18n.Message("ENDPOINT_NOT_PUBLISHED",
+                                                                                 LOG).toString());
         }
 
         if (getBinding() instanceof HTTPBinding) {        
-            throw new UnsupportedOperationException(new Message("GET_ENDPOINTREFERENCE_UNSUPPORTED_BINDING",
-                                                                LOG).toString());
+            throw new UnsupportedOperationException(new org.apache.cxf.common.i18n.Message(
+                                                        "GET_ENDPOINTREFERENCE_UNSUPPORTED_BINDING",
+                                                        LOG).toString());
         }        
         
         W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
@@ -585,7 +591,8 @@
         if (W3CEndpointReference.class.isAssignableFrom(clazz)) {
             return clazz.cast(getEndpointReference(referenceParameters));
         } else {
-            throw new WebServiceException(new Message("ENDPOINTREFERENCE_TYPE_NOT_SUPPORTED", LOG, clazz
+            throw new WebServiceException(new org.apache.cxf.common.i18n.Message(
+                "ENDPOINTREFERENCE_TYPE_NOT_SUPPORTED", LOG, clazz
                 .getName()).toString());
         }
     }

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java Mon Nov 16 15:14:59 2009
@@ -39,6 +39,7 @@
 import org.apache.cxf.jaxws.interceptors.WrapperClassOutInterceptor;
 import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.resource.DefaultResourceManager;
 import org.apache.cxf.resource.ResourceManager;
 import org.apache.cxf.resource.ResourceResolver;
@@ -115,8 +116,8 @@
         Object obj = super.create();
         Service service = getServiceFactory().getService();
         if (needWrapperClassInterceptor(service.getServiceInfos().get(0))) {
-            List<Interceptor> in = super.getInInterceptors();
-            List<Interceptor> out = super.getOutInterceptors();
+            List<Interceptor<? extends Message>> in = super.getInInterceptors();
+            List<Interceptor<? extends Message>> out = super.getOutInterceptors();
             in.add(new WrapperClassInInterceptor());
             in.add(new HolderInInterceptor());
             out.add(new WrapperClassOutInterceptor());

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultInInterceptor.java Mon Nov 16 15:14:59 2009
@@ -28,15 +28,15 @@
 import org.apache.cxf.phase.Phase;
 
 
-public class LogicalHandlerFaultInInterceptor<T extends Message> 
-    extends AbstractJAXWSHandlerInterceptor<T> {
+public class LogicalHandlerFaultInInterceptor 
+    extends AbstractJAXWSHandlerInterceptor<Message> {
 
     public LogicalHandlerFaultInInterceptor(Binding binding) {
         super(binding, Phase.PRE_PROTOCOL);
         addAfter(SOAPHandlerFaultInInterceptor.class.getName());       
     }
 
-    public void handleMessage(T message) {
+    public void handleMessage(Message message) {
         HandlerChainInvoker invoker = getInvoker(message);
         if (invoker.getLogicalHandlers().isEmpty()) {
             return;
@@ -60,7 +60,7 @@
         }
     }
     
-    public void handleFault(T message) {
+    public void handleFault(Message message) {
         // TODO
     }
 }

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerFaultOutInterceptor.java Mon Nov 16 15:14:59 2009
@@ -45,19 +45,19 @@
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
 
 
-public class LogicalHandlerFaultOutInterceptor<T extends Message> 
-    extends AbstractJAXWSHandlerInterceptor<T> {
+public class LogicalHandlerFaultOutInterceptor 
+    extends AbstractJAXWSHandlerInterceptor<Message> {
     
     public static final String ORIGINAL_WRITER = "original_writer";
 
-    LogicalHandlerFaultOutEndingInterceptor<T> ending;
+    LogicalHandlerFaultOutEndingInterceptor ending;
     
     public LogicalHandlerFaultOutInterceptor(Binding binding) {
         super(binding, Phase.PRE_MARSHAL);
-        ending = new LogicalHandlerFaultOutEndingInterceptor<T>(binding);
+        ending = new LogicalHandlerFaultOutEndingInterceptor(binding);
     }
     
-    public void handleMessage(T message) throws Fault {
+    public void handleMessage(Message message) throws Fault {
         HandlerChainInvoker invoker = getInvoker(message);
         if (invoker.getLogicalHandlers().isEmpty()) {
             return;
@@ -81,14 +81,14 @@
     }
     
     
-    private class LogicalHandlerFaultOutEndingInterceptor<X extends Message> 
-        extends AbstractJAXWSHandlerInterceptor<X> {
+    private class LogicalHandlerFaultOutEndingInterceptor 
+        extends AbstractJAXWSHandlerInterceptor<Message> {
     
         public LogicalHandlerFaultOutEndingInterceptor(Binding binding) {
             super(binding, Phase.POST_MARSHAL);
         }
     
-        public void handleMessage(X message) throws Fault {            
+        public void handleMessage(Message message) throws Fault {            
             W3CDOMStreamWriter domWriter = (W3CDOMStreamWriter)message.getContent(XMLStreamWriter.class);
             XMLStreamWriter origWriter = (XMLStreamWriter)message
                 .get(LogicalHandlerFaultOutInterceptor.ORIGINAL_WRITER);      

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java Mon Nov 16 15:14:59 2009
@@ -39,8 +39,8 @@
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.staxutils.W3CDOMStreamWriter;
 
-public class LogicalHandlerInInterceptor<T extends Message> 
-    extends AbstractJAXWSHandlerInterceptor<T> {
+public class LogicalHandlerInInterceptor 
+    extends AbstractJAXWSHandlerInterceptor<Message> {
 
     public LogicalHandlerInInterceptor(Binding binding) {
         super(binding, Phase.PRE_PROTOCOL);
@@ -49,7 +49,7 @@
         addAfter(SOAPHandlerInterceptor.class.getName());
     }
 
-    public void handleMessage(T message) {
+    public void handleMessage(Message message) {
         HandlerChainInvoker invoker = getInvoker(message);
         if (invoker.getLogicalHandlers().isEmpty()) {
             return;
@@ -78,7 +78,7 @@
         }
     }
 
-    private void handleAbort(T message, W3CDOMStreamWriter writer) {
+    private void handleAbort(Message message, W3CDOMStreamWriter writer) {
         message.getInterceptorChain().abort();
 
         if (!message.getExchange().isOneWay()) {
@@ -101,7 +101,7 @@
         }        
     }
     
-    public void handleFault(T message) {
+    public void handleFault(Message message) {
         // TODO
     }
     

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java Mon Nov 16 15:14:59 2009
@@ -47,19 +47,19 @@
 import org.apache.cxf.transport.MessageObserver;
 
 
-public class LogicalHandlerOutInterceptor<T extends Message> 
-    extends AbstractJAXWSHandlerInterceptor<T> {
+public class LogicalHandlerOutInterceptor 
+    extends AbstractJAXWSHandlerInterceptor<Message> {
     
     public static final String ORIGINAL_WRITER 
         = LogicalHandlerOutInterceptor.class.getName() + ".original_writer";
-    private LogicalHandlerOutEndingInterceptor<T> ending;
+    private LogicalHandlerOutEndingInterceptor ending;
     
     public LogicalHandlerOutInterceptor(Binding binding) {
         super(binding, Phase.PRE_MARSHAL);
-        ending = new LogicalHandlerOutEndingInterceptor<T>(binding);
+        ending = new LogicalHandlerOutEndingInterceptor(binding);
     }
     
-    public void handleMessage(T message) throws Fault {
+    public void handleMessage(Message message) throws Fault {
         HandlerChainInvoker invoker = getInvoker(message);
         if (invoker.getLogicalHandlers().isEmpty()) {
             return;
@@ -82,7 +82,7 @@
         }
     }
     @Override
-    public void handleFault(T message) {
+    public void handleFault(Message message) {
         super.handleFault(message);
         XMLStreamWriter os = (XMLStreamWriter)message.get(ORIGINAL_WRITER);
         if (os != null) {
@@ -90,14 +90,14 @@
         }
     }
     
-    private class LogicalHandlerOutEndingInterceptor<X extends Message> 
-        extends AbstractJAXWSHandlerInterceptor<X> {
+    private class LogicalHandlerOutEndingInterceptor 
+        extends AbstractJAXWSHandlerInterceptor<Message> {
     
         public LogicalHandlerOutEndingInterceptor(Binding binding) {
             super(binding, Phase.POST_MARSHAL);
         }
     
-        public void handleMessage(X message) throws Fault {
+        public void handleMessage(Message message) throws Fault {
             W3CDOMStreamWriter domWriter = (W3CDOMStreamWriter)message.getContent(XMLStreamWriter.class);
             XMLStreamWriter origWriter = (XMLStreamWriter)message
                 .get(LogicalHandlerOutInterceptor.ORIGINAL_WRITER);  

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java Mon Nov 16 15:14:59 2009
@@ -61,6 +61,7 @@
 import org.apache.cxf.jaxws.interceptors.SwAOutInterceptor;
 import org.apache.cxf.jaxws.interceptors.WrapperClassInInterceptor;
 import org.apache.cxf.jaxws.interceptors.WrapperClassOutInterceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -105,8 +106,8 @@
         }
         createJaxwsBinding();
         
-        List<Interceptor> in = super.getInInterceptors();       
-        List<Interceptor> out = super.getOutInterceptors();
+        List<Interceptor<? extends Message>> in = super.getInInterceptors();       
+        List<Interceptor<? extends Message>> out = super.getOutInterceptors();
 
         boolean isProvider = implInfo != null && implInfo.isWebServiceProvider();
         Class<?> clazz = implInfo != null && isProvider ? implInfo.getProviderParameterType() : null;
@@ -153,14 +154,14 @@
         }
         
         //Outbound fault chain
-        List<Interceptor> outFault = super.getOutFaultInterceptors();    
+        List<Interceptor<? extends Message>> outFault = super.getOutFaultInterceptors();    
         outFault.add(new LogicalHandlerFaultOutInterceptor(jaxwsBinding));
         if (getBinding() instanceof SoapBinding) {
             outFault.add(new SOAPHandlerFaultOutInterceptor(jaxwsBinding));
         }
 
         //Inbound fault chain
-        List<Interceptor> inFault = super.getInFaultInterceptors(); 
+        List<Interceptor<? extends Message>> inFault = super.getInFaultInterceptors(); 
         inFault.add(new LogicalHandlerFaultInInterceptor(jaxwsBinding));
         if (getBinding() instanceof SoapBinding) {
             inFault.add(new SOAPHandlerFaultInInterceptor(jaxwsBinding));

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java Mon Nov 16 15:14:59 2009
@@ -99,7 +99,7 @@
                    !Boolean.TRUE.equals(endpoint.get(Message.SCHEMA_VALIDATION_ENABLED)));
    
         // System.out.println("endpoint interceptors");
-        List<Interceptor> interceptors = endpoint.getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = endpoint.getInInterceptors();
         printInterceptors("in", interceptors);        
         assertNull("Unexpected test interceptor", findTestInterceptor(interceptors));
         interceptors = endpoint.getOutInterceptors();
@@ -183,7 +183,7 @@
         
         org.apache.cxf.service.ServiceImpl svc = (org.apache.cxf.service.ServiceImpl)endpoint.getService();
         assertEquals("Unexpected bean name.", SERVICE_NAME.toString(), svc.getBeanName());
-        List<Interceptor> interceptors = svc.getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = svc.getInInterceptors();
         assertEquals("Unexpected number of interceptors.", 1, interceptors.size());
         assertEquals("Unexpected interceptor id.", "service-in", 
                      findTestInterceptor(interceptors).getId());
@@ -232,7 +232,7 @@
         assertTrue("Unexpected value for property validating", 
                    !Boolean.TRUE.equals(endpoint.get(Message.SCHEMA_VALIDATION_ENABLED)));
    
-        List<Interceptor> interceptors = endpoint.getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = endpoint.getInInterceptors();
         assertNull("Unexpected test interceptor", findTestInterceptor(interceptors));
         interceptors = endpoint.getOutInterceptors();
         assertNull("Unexpected test interceptor", findTestInterceptor(interceptors));
@@ -289,7 +289,7 @@
         assertEquals("Unexpected bean name", PORT_NAME.toString() + ".endpoint", endpoint.getBeanName());
         assertTrue("Unexpected value for property validating", 
                    Boolean.valueOf((String) ei.getProperties().get(Message.SCHEMA_VALIDATION_ENABLED)));
-        List<Interceptor> interceptors = endpoint.getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = endpoint.getInInterceptors();
         assertEquals("Unexpected number of interceptors.", 6, interceptors.size());
         assertEquals("Unexpected interceptor id.", "endpoint-in", 
                      findTestInterceptor(interceptors).getId());
@@ -346,7 +346,7 @@
     }
       
     
-    private TestInterceptor findTestInterceptor(List<Interceptor> interceptors) {
+    private TestInterceptor findTestInterceptor(List<Interceptor<? extends Message>> interceptors) {
         for (Interceptor i : interceptors) {
             if (i instanceof TestInterceptor) {
                 return (TestInterceptor)i;
@@ -356,7 +356,7 @@
     }
     
     
-    private void printInterceptors(String type, List<Interceptor> interceptors) {
+    private void printInterceptors(String type, List<Interceptor<? extends Message>> interceptors) {
         //for (Interceptor i : interceptors) {
             //System.out.println("    " + type + ": " + i.getClass().getName());
         //}

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java Mon Nov 16 15:14:59 2009
@@ -95,7 +95,7 @@
             .andReturn(true);
 
         control.replay();
-        LogicalHandlerInInterceptor<Message> li = new LogicalHandlerInInterceptor<Message>(binding);
+        LogicalHandlerInInterceptor li = new LogicalHandlerInInterceptor(binding);
         assertEquals("unexpected phase", "pre-protocol", li.getPhase());
         li.handleMessage(message);
         control.verify();
@@ -142,7 +142,7 @@
 
         control1.replay();
 
-        LogicalHandlerInInterceptor<Message> li = new LogicalHandlerInInterceptor<Message>(binding1);
+        LogicalHandlerInInterceptor li = new LogicalHandlerInInterceptor(binding1);
         li.handleMessage(outMessage);
         control1.verify();
     }

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationFeature.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationFeature.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationFeature.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationFeature.java Mon Nov 16 15:14:59 2009
@@ -32,7 +32,7 @@
         provider.getOutInterceptors().add(new AnnotationFeatureInterceptor());
     }
     
-    public static class AnnotationFeatureInterceptor extends AbstractPhaseInterceptor {
+    public static class AnnotationFeatureInterceptor extends AbstractPhaseInterceptor<Message> {
         
         public AnnotationFeatureInterceptor() {
             super(Phase.SEND);

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java Mon Nov 16 15:14:59 2009
@@ -33,6 +33,8 @@
 import org.apache.cxf.jaxws.AbstractJaxWsTest;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.apache.cxf.jaxws.service.AnnotationFeature.AnnotationFeatureInterceptor;
+import org.apache.cxf.message.Message;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -60,11 +62,13 @@
         fb.setServiceBean(hello);
         fb.create();
         
-        List<Interceptor> interceptors = fb.getServer().getEndpoint().getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors 
+            = fb.getServer().getEndpoint().getInInterceptors();
         assertTrue(hasTestInterceptor(interceptors));
         assertFalse(hasTest2Interceptor(interceptors));
         
-        List<Interceptor> outFaultInterceptors = fb.getServer().getEndpoint().getOutFaultInterceptors();
+        List<Interceptor<? extends Message>> outFaultInterceptors
+            = fb.getServer().getEndpoint().getOutFaultInterceptors();
         assertTrue(hasTestInterceptor(outFaultInterceptors));
         assertTrue(hasTest2Interceptor(outFaultInterceptors));
     }
@@ -87,7 +91,7 @@
         fb.setServiceBean(hello);
         fb.create();
         
-        List<Interceptor> interceptors = fb.getServer().getEndpoint().getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = fb.getServer().getEndpoint().getInInterceptors();
         assertFalse(hasTestInterceptor(interceptors));
         
         List<AbstractFeature> features = fb.getFeatures();
@@ -101,7 +105,7 @@
         jfb.setServiceBean(new SayHiNoInterceptor());
         
         jfb.create();
-        List<Interceptor> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
         assertFalse(hasTestInterceptor(interceptors));
         
         List<AbstractFeature> features = fb.getFeatures();
@@ -115,10 +119,11 @@
         jfb.setServiceBean(implementor);
         
         jfb.create();
-        List<Interceptor> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
         assertTrue(hasTestInterceptor(interceptors));
         
-        List<Interceptor> inFaultInterceptors = jfb.getServer().getEndpoint().getInFaultInterceptors();
+        List<Interceptor<? extends Message>> inFaultInterceptors 
+            = jfb.getServer().getEndpoint().getInFaultInterceptors();
         assertFalse(hasTestInterceptor(inFaultInterceptors));
         assertTrue(hasTest2Interceptor(inFaultInterceptors));
         
@@ -133,10 +138,12 @@
         jfb.setServiceBean(implementor);
         
         jfb.create();
-        List<Interceptor> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors 
+            = jfb.getServer().getEndpoint().getInInterceptors();
         assertTrue(hasAnnotationFeatureInterceptor(interceptors));
         
-        List<Interceptor> outInterceptors = jfb.getServer().getEndpoint().getOutInterceptors();
+        List<Interceptor<? extends Message>> outInterceptors 
+            = jfb.getServer().getEndpoint().getOutInterceptors();
         assertTrue(hasAnnotationFeatureInterceptor(outInterceptors));
     }
     
@@ -146,7 +153,7 @@
         jfb.setServiceBean(new SayHiInterfaceImpl());
         jfb.create();
         
-        List<Interceptor> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
         assertTrue(hasTestInterceptor(interceptors));
         
         List<AbstractFeature> features = jfb.getFeatures();
@@ -159,13 +166,13 @@
         jfb.setServiceBean(new SayHiInterfaceImpl2());
         jfb.create();
         
-        List<Interceptor> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
+        List<Interceptor<? extends Message>> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
         assertFalse(hasTestInterceptor(interceptors));
         assertTrue(hasTest2Interceptor(interceptors));
     }
     
     
-    private boolean hasTestInterceptor(List<Interceptor> interceptors) {
+    private boolean hasTestInterceptor(List<Interceptor<? extends Message>> interceptors) {
         boolean flag = false;
         for (Interceptor it : interceptors) {
             if (it instanceof TestInterceptor) {
@@ -175,7 +182,7 @@
         return flag;
     }
         
-    private boolean hasTest2Interceptor(List<Interceptor> interceptors) {
+    private boolean hasTest2Interceptor(List<Interceptor<? extends Message>> interceptors) {
         boolean flag = false;
         for (Interceptor it : interceptors) {
             if (it instanceof Test2Interceptor) {
@@ -195,7 +202,7 @@
         return flag;
     }
     
-    private boolean hasAnnotationFeatureInterceptor(List<Interceptor> interceptors) {
+    private boolean hasAnnotationFeatureInterceptor(List<Interceptor<? extends Message>> interceptors) {
         boolean flag = false;
         for (Interceptor it : interceptors) {
             if (it instanceof AnnotationFeatureInterceptor) {

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java Mon Nov 16 15:14:59 2009
@@ -54,6 +54,7 @@
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.apache.cxf.jaxws.service.Hello;
 import org.apache.cxf.jaxws.spring.NamespaceHandler.SpringServerFactoryBean;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.transport.http.WSDLQueryHandler;
 import org.apache.hello_world_soap_http.Greeter;
 import org.junit.After;
@@ -185,10 +186,10 @@
         EndpointImpl ep;
         ep = (EndpointImpl) ctx.getBean("epWithInterceptors");
         assertNotNull(ep);
-        List<Interceptor> inInterceptors = ep.getInInterceptors();
+        List<Interceptor<? extends Message>> inInterceptors = ep.getInInterceptors();
         boolean saaj = false;
         boolean logging = false;
-        for (Interceptor<?> i : inInterceptors) {
+        for (Interceptor<? extends Message> i : inInterceptors) {
             if (i instanceof SAAJInInterceptor) {
                 saaj = true;
             } else if (i instanceof LoggingInInterceptor) {
@@ -316,10 +317,10 @@
         assertTrue("unexpected ConduitSelector",
                    client.getConduitSelector() instanceof NullConduitSelector);
 
-        List<Interceptor> inInterceptors = client.getInInterceptors();
+        List<Interceptor<? extends Message>> inInterceptors = client.getInInterceptors();
         boolean saaj = false;
         boolean logging = false;
-        for (Interceptor<?> i : inInterceptors) {
+        for (Interceptor<? extends Message> i : inInterceptors) {
             if (i instanceof SAAJInInterceptor) {
                 saaj = true;
             } else if (i instanceof LoggingInInterceptor) {

Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java (original)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java Mon Nov 16 15:14:59 2009
@@ -36,6 +36,7 @@
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.factory.HelloService;
 import org.apache.cxf.service.factory.HelloServiceImpl;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -103,10 +104,10 @@
         assertTrue("unexpected ConduitSelector",
                    client.getConduitSelector() instanceof NullConduitSelector);
 
-        List<Interceptor> inInterceptors = client.getInInterceptors();
+        List<Interceptor<? extends Message>> inInterceptors = client.getInInterceptors();
         boolean saaj = false;
         boolean logging = false;
-        for (Interceptor<?> i : inInterceptors) {
+        for (Interceptor<? extends Message> i : inInterceptors) {
             if (i instanceof SAAJInInterceptor) {
                 saaj = true;
             } else if (i instanceof LoggingInInterceptor) {

Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java (original)
+++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java Mon Nov 16 15:14:59 2009
@@ -31,7 +31,6 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.management.InstrumentationManager;
 import org.apache.cxf.management.interceptor.ResponseTimeMessageInInterceptor;
 import org.apache.cxf.management.interceptor.ResponseTimeMessageInvokerInterceptor;
@@ -68,9 +67,9 @@
     
     @PostConstruct
     void registerInterceptorsToBus() {
-        Interceptor in = new ResponseTimeMessageInInterceptor();
-        Interceptor invoker = new ResponseTimeMessageInvokerInterceptor();
-        Interceptor out = new ResponseTimeMessageOutInterceptor();
+        ResponseTimeMessageInInterceptor in = new ResponseTimeMessageInInterceptor();
+        ResponseTimeMessageInvokerInterceptor invoker = new ResponseTimeMessageInvokerInterceptor();
+        ResponseTimeMessageOutInterceptor out = new ResponseTimeMessageOutInterceptor();
         
         bus.getInInterceptors().add(in);
         bus.getInInterceptors().add(invoker);

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java Mon Nov 16 15:14:59 2009
@@ -25,6 +25,7 @@
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorProvider;
+import org.apache.cxf.message.Message;
 
 /**
  * This class is used to control GZIP compression of messages.
@@ -81,7 +82,7 @@
         }
     }
 
-    private void remove(List<Interceptor> outInterceptors) {
+    private void remove(List<Interceptor<? extends Message>> outInterceptors) {
         int x = outInterceptors.size();
         while (x > 0) {
             --x;

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java Mon Nov 16 15:14:59 2009
@@ -78,9 +78,9 @@
         EndpointPolicy ep = pe.getClientEndpointPolicy(ei, conduit);        
         LOG.fine("ep: " + ep);
         
-        List<Interceptor> faultInterceptors = ep.getFaultInterceptors();
+        List<Interceptor<? extends Message>> faultInterceptors = ep.getFaultInterceptors();
         LOG.fine("faultInterceptors: " + faultInterceptors);
-        for (Interceptor i : faultInterceptors) {
+        for (Interceptor<? extends Message> i : faultInterceptors) {
             msg.getInterceptorChain().add(i);
             LOG.log(Level.FINE, "Added interceptor of type {0}", i.getClass().getSimpleName());
         }

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java Mon Nov 16 15:14:59 2009
@@ -54,13 +54,13 @@
     
     protected Policy policy;     
     protected Collection<PolicyAssertion> chosenAlternative;
-    protected List<Interceptor> interceptors;
+    protected List<Interceptor<? extends org.apache.cxf.message.Message>> interceptors;
     
     public Policy getPolicy() {
         return policy;        
     }
     
-    public List<Interceptor> getInterceptors() {
+    public List<Interceptor<? extends org.apache.cxf.message.Message>> getInterceptors() {
         return interceptors;
     }
     
@@ -161,11 +161,12 @@
         if (engine.getBus() != null) {
             PolicyInterceptorProviderRegistry reg 
                 = engine.getBus().getExtension(PolicyInterceptorProviderRegistry.class);
-            Set<Interceptor> out = new LinkedHashSet<Interceptor>();
+            Set<Interceptor<? extends org.apache.cxf.message.Message>> out 
+                = new LinkedHashSet<Interceptor<? extends org.apache.cxf.message.Message>>();
             for (PolicyAssertion a : getChosenAlternative()) {
                 initialiseInterceptors(reg, engine, out, a, useIn);
             }        
-            setInterceptors(new ArrayList<Interceptor>(out));
+            setInterceptors(new ArrayList<Interceptor<? extends  org.apache.cxf.message.Message>>(out));
         }
     }
     
@@ -184,7 +185,7 @@
 
     void initialiseInterceptors(PolicyInterceptorProviderRegistry reg,
                                 PolicyEngineImpl engine,
-                                Set<Interceptor> out,
+                                Set<Interceptor<? extends org.apache.cxf.message.Message>> out,
                                 PolicyAssertion a,
                                 boolean usIn) {
         QName qn = a.getName();
@@ -210,7 +211,7 @@
         chosenAlternative = c;
     }
     
-    void setInterceptors(List<Interceptor> out) {
+    void setInterceptors(List<Interceptor<? extends org.apache.cxf.message.Message>> out) {
         interceptors = out;
     }
    

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java Mon Nov 16 15:14:59 2009
@@ -30,9 +30,9 @@
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.model.BindingFaultInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -53,8 +53,8 @@
     
     private Collection<PolicyAssertion> vocabulary;
     private Collection<PolicyAssertion> faultVocabulary;
-    private List<Interceptor> interceptors;
-    private List<Interceptor> faultInterceptors;
+    private List<Interceptor<? extends Message>> interceptors;
+    private List<Interceptor<? extends Message>> faultInterceptors;
     
     private EndpointInfo ei;
     private PolicyEngineImpl engine;
@@ -113,14 +113,14 @@
         return faultVocabulary;
     }    
     
-    public synchronized List<Interceptor> getInterceptors() {
+    public synchronized List<Interceptor<? extends Message>> getInterceptors() {
         if (interceptors == null) {
             initializeInterceptors();
         }
         return interceptors;
     }
     
-    public synchronized List<Interceptor> getFaultInterceptors() {
+    public synchronized List<Interceptor<? extends Message>> getFaultInterceptors() {
         if (interceptors == null) {
             initializeInterceptors();
         }
@@ -153,7 +153,7 @@
             alternative = getSupportedAlternatives();
         }
         if (null == alternative) {
-            throw new PolicyException(new Message("NO_ALTERNATIVE_EXC", BUNDLE));
+            throw new PolicyException(new org.apache.cxf.common.i18n.Message("NO_ALTERNATIVE_EXC", BUNDLE));
         } else {
             setChosenAlternative(alternative);
         }
@@ -251,7 +251,7 @@
     }
 
     void initializeInterceptors(PolicyInterceptorProviderRegistry reg,
-                                Set<Interceptor> out,
+                                Set<Interceptor<? extends Message>> out,
                                 PolicyAssertion a, 
                                 boolean fault) {
         QName qn = a.getName();
@@ -275,7 +275,7 @@
         PolicyInterceptorProviderRegistry reg 
             = engine.getBus().getExtension(PolicyInterceptorProviderRegistry.class);
         
-        Set<Interceptor> out = new LinkedHashSet<Interceptor>();
+        Set<Interceptor<? extends Message>> out = new LinkedHashSet<Interceptor<? extends Message>>();
         if (getChosenAlternative() != null) {
             for (PolicyAssertion a : getChosenAlternative()) {
                 initializeInterceptors(reg, out, a, false);
@@ -283,12 +283,12 @@
         }
 
         if (requestor) {
-            interceptors = new ArrayList<Interceptor>(out);
+            interceptors = new ArrayList<Interceptor<? extends Message>>(out);
             out.clear();
             for (PolicyAssertion a : getChosenAlternative()) {
                 initializeInterceptors(reg, out, a, true);
             }
-            faultInterceptors = new ArrayList<Interceptor>(out);
+            faultInterceptors = new ArrayList<Interceptor<? extends Message>>(out);
         } else if (ei != null && ei.getBinding() != null) {
             for (BindingOperationInfo boi : ei.getBinding().getOperations()) {
                 EffectivePolicy p = engine.getEffectiveServerRequestPolicy(ei, boi);
@@ -303,9 +303,9 @@
                     }
                 }
             }
-            interceptors = new ArrayList<Interceptor>(out);
+            interceptors = new ArrayList<Interceptor<? extends Message>>(out);
         } else {
-            interceptors = new ArrayList<Interceptor>(out);            
+            interceptors = new ArrayList<Interceptor<? extends Message>>(out);            
         }
     }
     
@@ -327,11 +327,11 @@
         faultVocabulary = v;
     }
     
-    void setInterceptors(List<Interceptor> in) {
+    void setInterceptors(List<Interceptor<? extends Message>> in) {
         interceptors = in;
     }
     
-    void setFaultInterceptors(List<Interceptor> inFault) {
+    void setFaultInterceptors(List<Interceptor<? extends Message>> inFault) {
         faultInterceptors = inFault;
     }
     

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java Mon Nov 16 15:14:59 2009
@@ -77,8 +77,8 @@
                 PolicyUtils.logPolicy(LOG, Level.FINEST, "Using effective policy: ", 
                                       effectivePolicy.getPolicy());
                 
-                List<Interceptor> interceptors = effectivePolicy.getInterceptors();
-                for (Interceptor i : interceptors) {            
+                List<Interceptor<? extends Message>> interceptors = effectivePolicy.getInterceptors();
+                for (Interceptor<? extends Message> i : interceptors) {            
                     msg.getInterceptorChain().add(i);
                     LOG.log(Level.FINE, "Added interceptor of type {0}", i.getClass().getSimpleName());
                 }
@@ -92,8 +92,8 @@
             
                 EndpointPolicy ep = pe.getClientEndpointPolicy(ei, conduit);
                 
-                List<Interceptor> interceptors = ep.getInterceptors();
-                for (Interceptor i : interceptors) {
+                List<Interceptor<? extends Message>> interceptors = ep.getInterceptors();
+                for (Interceptor<? extends Message> i : interceptors) {
                     msg.getInterceptorChain().add(i);
                 }
                 
@@ -110,8 +110,8 @@
                 
                 EffectivePolicy ep = pe.getEffectiveClientResponsePolicy(ei, boi);
         
-                List<Interceptor> interceptors = ep.getInterceptors();
-                for (Interceptor i : interceptors) {
+                List<Interceptor<? extends Message>> interceptors = ep.getInterceptors();
+                for (Interceptor<? extends Message> i : interceptors) {
                     msg.getInterceptorChain().add(i);
                 }
                 // insert assertions of endpoint's vocabulary into message
@@ -128,8 +128,8 @@
             
             EndpointPolicy ep = pe.getServerEndpointPolicy(ei, destination);
             
-            List<Interceptor> interceptors = ep.getInterceptors();
-            for (Interceptor i : interceptors) {
+            List<Interceptor<? extends Message>> interceptors = ep.getInterceptors();
+            for (Interceptor<? extends Message> i : interceptors) {
                 msg.getInterceptorChain().add(i);
                 LOG.log(Level.FINE, "Added interceptor of type {0}", i.getClass().getSimpleName());
             }

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java Mon Nov 16 15:14:59 2009
@@ -34,6 +34,7 @@
 import org.apache.cxf.extension.BusExtension;
 import org.apache.cxf.extension.RegistryImpl;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 
 /**
  * 
@@ -90,10 +91,10 @@
             }
         }
     }
-    public List<Interceptor> getInterceptors(Collection<PolicyAssertion> alternative, 
+    public List<Interceptor<? extends Message>> getInterceptors(Collection<PolicyAssertion> alternative, 
                                              boolean out, boolean fault) {
         loadDynamic();
-        List<Interceptor> interceptors = new ArrayList<Interceptor>();
+        List<Interceptor<? extends Message>> interceptors = new ArrayList<Interceptor<? extends Message>>();
         for (PolicyAssertion a : alternative) {
             if (a.isOptional()) {
                 continue;

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java Mon Nov 16 15:14:59 2009
@@ -80,8 +80,8 @@
             PolicyUtils.logPolicy(LOG, Level.FINEST, "Using effective policy: ", 
                                   effectivePolicy.getPolicy());
             
-            List<Interceptor> interceptors = effectivePolicy.getInterceptors();
-            for (Interceptor i : interceptors) {            
+            List<Interceptor<? extends Message>> interceptors = effectivePolicy.getInterceptors();
+            for (Interceptor<? extends Message> i : interceptors) {            
                 msg.getInterceptorChain().add(i);
                 LOG.log(Level.FINE, "Added interceptor of type {0}", i.getClass().getSimpleName());
             }
@@ -111,8 +111,8 @@
             msg.put(EffectivePolicy.class, effectivePolicy);
             PolicyUtils.logPolicy(LOG, Level.FINEST, "Using effective policy: ", effectivePolicy.getPolicy());
             
-            List<Interceptor> interceptors = effectivePolicy.getInterceptors();
-            for (Interceptor i : interceptors) {            
+            List<Interceptor<? extends Message>> interceptors = effectivePolicy.getInterceptors();
+            for (Interceptor<? extends Message> i : interceptors) {            
                 msg.getInterceptorChain().add(i);
                 LOG.log(Level.FINE, "Added interceptor of type {0}", i.getClass().getSimpleName());
             }
@@ -139,8 +139,8 @@
             EffectivePolicy effectivePolicy = pe.getEffectiveServerResponsePolicy(ei, boi, destination);
             msg.put(EffectivePolicy.class, effectivePolicy);
             
-            List<Interceptor> interceptors = effectivePolicy.getInterceptors();
-            for (Interceptor oi : interceptors) {
+            List<Interceptor<? extends Message>> interceptors = effectivePolicy.getInterceptors();
+            for (Interceptor<? extends Message> oi : interceptors) {
                 msg.getInterceptorChain().add(oi);
                 LOG.log(Level.FINE, "Added interceptor of type {0}",
                         oi.getClass().getSimpleName());           

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java Mon Nov 16 15:14:59 2009
@@ -89,8 +89,8 @@
         
         EffectivePolicy effectivePolicy = pe.getEffectiveServerFaultPolicy(ei, bfi, destination);
         
-        List<Interceptor> interceptors = effectivePolicy.getInterceptors();
-        for (Interceptor oi : interceptors) {
+        List<Interceptor<? extends Message>> interceptors = effectivePolicy.getInterceptors();
+        for (Interceptor<? extends Message> oi : interceptors) {
             msg.getInterceptorChain().add(oi);
             LOG.log(Level.FINE, "Added interceptor of type {0}", oi.getClass().getSimpleName());
         }

Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java Mon Nov 16 15:14:59 2009
@@ -29,6 +29,7 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.model.BindingFaultInfo;
 import org.apache.cxf.service.model.BindingMessageInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
@@ -55,6 +56,15 @@
         new Integer(4);
     } 
     
+    @SuppressWarnings("unchecked")
+    private List<Interceptor<? extends Message>> createMockInterceptorList() {
+        Interceptor i = control.createMock(Interceptor.class);
+        Interceptor<? extends Message> m = i;
+        List<Interceptor<? extends Message>> a = new ArrayList<Interceptor<? extends Message>>();
+        a.add(m);
+        return a;
+    }
+    
     @Test
     public void testAccessors() {
         EffectivePolicyImpl effectivePolicy = new EffectivePolicyImpl();
@@ -65,8 +75,7 @@
         Policy p = control.createMock(Policy.class);
         PolicyAssertion a = control.createMock(PolicyAssertion.class);
         List<PolicyAssertion> la = Collections.singletonList(a);
-        Interceptor i = control.createMock(Interceptor.class);
-        List<Interceptor> li = Collections.singletonList(i);
+        List<Interceptor<? extends Message>> li = createMockInterceptorList();
         control.replay();
         effectivePolicy.setPolicy(p);
         assertSame(p, effectivePolicy.getPolicy());
@@ -259,6 +268,7 @@
         control.verify();
     }
     
+    @SuppressWarnings("unchecked")
     @Test
     public void testInitialiseOutInterceptors() {
         EffectivePolicyImpl epi = new EffectivePolicyImpl();        
@@ -298,8 +308,10 @@
         EasyMock.expect(a.getName()).andReturn(qn);        
         PolicyInterceptorProvider pp = control.createMock(PolicyInterceptorProvider.class);               
         EasyMock.expect(reg.get(qn)).andReturn(pp);
-        Interceptor pi = control.createMock(Interceptor.class);
-        EasyMock.expect(pp.getOutInterceptors()).andReturn(Collections.singletonList(pi));
+        Interceptor<Message> pi = control.createMock(Interceptor.class);
+        List<Interceptor<? extends Message>> m = new ArrayList<Interceptor<? extends Message>>();
+        m.add(pi);
+        EasyMock.expect(pp.getOutInterceptors()).andReturn(m);
         control.replay();
         epi.initialiseInterceptors(engine);
         assertEquals(1, epi.getInterceptors().size());

Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java Mon Nov 16 15:14:59 2009
@@ -30,6 +30,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.neethi.All;
@@ -63,6 +64,15 @@
         control = EasyMock.createNiceControl();
     } 
     
+    @SuppressWarnings("unchecked")
+    private List<Interceptor<? extends Message>> createMockInterceptorList() {
+        Interceptor i = control.createMock(Interceptor.class);
+        Interceptor<? extends Message> m = i;
+        List<Interceptor<? extends Message>> a = new ArrayList<Interceptor<? extends Message>>();
+        a.add(m);
+        return a;
+    }
+
     @Test
     public void testAccessors() {
         EndpointPolicyImpl epi = new EndpointPolicyImpl();
@@ -74,8 +84,7 @@
         Policy p = control.createMock(Policy.class);
         PolicyAssertion a = control.createMock(PolicyAssertion.class);
         List<PolicyAssertion> la = Collections.singletonList(a);
-        Interceptor i = control.createMock(Interceptor.class);
-        List<Interceptor> li = Collections.singletonList(i);
+        List<Interceptor<? extends Message>> li = createMockInterceptorList();
         control.replay();
         epi.setPolicy(p);
         assertSame(p, epi.getPolicy());
@@ -255,12 +264,13 @@
         
         PolicyInterceptorProvider app = control.createMock(PolicyInterceptorProvider.class);               
         EasyMock.expect(reg.get(aqn)).andReturn(app).anyTimes();
-        Interceptor api = control.createMock(Interceptor.class);
+        List<Interceptor<? extends Message>> li = createMockInterceptorList();
+        Interceptor<? extends Message> api = li.get(0);
         EasyMock.expect(app.getInInterceptors())
-            .andReturn(Collections.singletonList(api)).anyTimes();
+            .andReturn(li).anyTimes();
         if (requestor) {
             EasyMock.expect(app.getInFaultInterceptors())
-                .andReturn(Collections.singletonList(api)).anyTimes();
+                .andReturn(li).anyTimes();
         }
         
         control.replay();

Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java Mon Nov 16 15:14:59 2009
@@ -33,6 +33,7 @@
 import org.apache.cxf.bus.CXFBusImpl;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.PhaseInterceptor;
 import org.apache.cxf.service.model.BindingFaultInfo;
 import org.apache.cxf.service.model.BindingMessageInfo;
@@ -370,10 +371,10 @@
         engine = new PolicyEngineImpl(enabled);
     
         Bus bus = control.createMock(Bus.class);
-        List<Interceptor> out = new ArrayList<Interceptor>();
-        List<Interceptor> in = new ArrayList<Interceptor>();
-        List<Interceptor> inFault = new ArrayList<Interceptor>();
-        List<Interceptor> outFault = new ArrayList<Interceptor>();
+        List<Interceptor<? extends Message>> out = new ArrayList<Interceptor<? extends Message>>();
+        List<Interceptor<? extends Message>> in = new ArrayList<Interceptor<? extends Message>>();
+        List<Interceptor<? extends Message>> inFault = new ArrayList<Interceptor<? extends Message>>();
+        List<Interceptor<? extends Message>> outFault = new ArrayList<Interceptor<? extends Message>>();
         if (enabled) {
             EasyMock.expect(bus.getOutInterceptors()).andReturn(out).times(1);
             EasyMock.expect(bus.getInInterceptors()).andReturn(in).times(1);
@@ -653,9 +654,9 @@
         assertSame(a, assertions.iterator().next());       
     }
         
-    private Set<String> getInterceptorIds(List<Interceptor> interceptors) {
+    private Set<String> getInterceptorIds(List<Interceptor<? extends Message>> interceptors) {
         Set<String> ids = new HashSet<String>();
-        for (Interceptor i : interceptors) {
+        for (Interceptor<? extends Message> i : interceptors) {
             ids.add(((PhaseInterceptor)i).getId());
         }
         return ids;

Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java Mon Nov 16 15:14:59 2009
@@ -20,8 +20,10 @@
 package org.apache.cxf.ws.policy;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Endpoint;
@@ -65,6 +67,15 @@
         bus = control.createMock(Bus.class);       
     } 
     
+    @SuppressWarnings("unchecked")
+    private List<Interceptor<? extends Message>> createMockInterceptorList() {
+        Interceptor i = control.createMock(Interceptor.class);
+        Interceptor<? extends Message> m = i;
+        List<Interceptor<? extends Message>> a = new ArrayList<Interceptor<? extends Message>>();
+        a.add(m);
+        return a;
+    }
+
     @Test
     public void testClientPolicyOutInterceptor() {
         PolicyOutInterceptor interceptor = new PolicyOutInterceptor();
@@ -76,12 +87,12 @@
         EffectivePolicy effectivePolicy = control.createMock(EffectivePolicy.class);
         EasyMock.expect(pe.getEffectiveClientRequestPolicy(ei, boi, conduit))
             .andReturn(effectivePolicy);
-        Interceptor i = control.createMock(Interceptor.class);
+        List<Interceptor<? extends Message>> li = createMockInterceptorList();
         EasyMock.expect(effectivePolicy.getInterceptors())
-            .andReturn(CastUtils.cast(Collections.singletonList(i), Interceptor.class));
+            .andReturn(li);
         InterceptorChain ic = control.createMock(InterceptorChain.class);
         EasyMock.expect(message.getInterceptorChain()).andReturn(ic);
-        ic.add(i);
+        ic.add(li.get(0));
         EasyMock.expectLastCall();
         Collection<PolicyAssertion> assertions = 
             CastUtils.cast(Collections.EMPTY_LIST, PolicyAssertion.class);
@@ -91,6 +102,7 @@
         control.verify();        
     }
     
+    @SuppressWarnings("unchecked")
     @Test
     public void testClientPolicyInInterceptor() {
         PolicyInInterceptor interceptor = new PolicyInInterceptor();
@@ -102,9 +114,10 @@
         EffectivePolicy effectivePolicy = control.createMock(EffectivePolicy.class);
         EasyMock.expect(pe.getEffectiveClientResponsePolicy(ei, boi)).andReturn(effectivePolicy);
         EasyMock.expect(effectivePolicy.getPolicy()).andReturn(new Policy()).times(2);
-        Interceptor i = control.createMock(Interceptor.class);
-        EasyMock.expect(effectivePolicy.getInterceptors())
-            .andReturn(CastUtils.cast(Collections.singletonList(i), Interceptor.class));
+        Interceptor<? extends Message> i = control.createMock(Interceptor.class);
+        List<Interceptor<? extends Message>> lst = new ArrayList<Interceptor<? extends Message>>();
+        lst.add(i);
+        EasyMock.expect(effectivePolicy.getInterceptors()).andReturn(lst);
         InterceptorChain ic = control.createMock(InterceptorChain.class);
         EasyMock.expect(message.getInterceptorChain()).andReturn(ic).anyTimes();
         ic.add(i);
@@ -127,12 +140,12 @@
         setupMessage(true, true, false, false, true, true);
         EndpointPolicy endpointPolicy = control.createMock(EndpointPolicy.class);
         EasyMock.expect(pe.getClientEndpointPolicy(ei, conduit)).andReturn(endpointPolicy);
-        Interceptor i = control.createMock(Interceptor.class);
+        List<Interceptor<? extends Message>> li = createMockInterceptorList();
         EasyMock.expect(endpointPolicy.getFaultInterceptors())
-            .andReturn(CastUtils.cast(Collections.singletonList(i), Interceptor.class));
+            .andReturn(li);
         InterceptorChain ic = control.createMock(InterceptorChain.class);
         EasyMock.expect(message.getInterceptorChain()).andReturn(ic);
-        ic.add(i);
+        ic.add(li.get(0));
         EasyMock.expectLastCall();
         Collection<PolicyAssertion> assertions = 
             CastUtils.cast(Collections.EMPTY_LIST, PolicyAssertion.class);
@@ -152,12 +165,12 @@
         setupMessage(false, false, false, false, true, true);
         EndpointPolicy endpointPolicy = control.createMock(EndpointPolicyImpl.class);
         EasyMock.expect(pe.getServerEndpointPolicy(ei, destination)).andReturn(endpointPolicy);
-        Interceptor i = control.createMock(Interceptor.class);
+        List<Interceptor<? extends Message>> li = createMockInterceptorList();
         EasyMock.expect(endpointPolicy.getInterceptors())
-            .andReturn(CastUtils.cast(Collections.singletonList(i), Interceptor.class));
+            .andReturn(li);
         InterceptorChain ic = control.createMock(InterceptorChain.class);
         EasyMock.expect(message.getInterceptorChain()).andReturn(ic);
-        ic.add(i);
+        ic.add(li.get(0));
         EasyMock.expectLastCall();
         Collection<PolicyAssertion> assertions = 
             CastUtils.cast(Collections.EMPTY_LIST, PolicyAssertion.class);
@@ -178,12 +191,12 @@
         EffectivePolicy effectivePolicy = control.createMock(EffectivePolicy.class);
         EasyMock.expect(pe.getEffectiveServerResponsePolicy(ei, boi, destination))
             .andReturn(effectivePolicy);
-        Interceptor i = control.createMock(Interceptor.class);        
+        List<Interceptor<? extends Message>> li = createMockInterceptorList();
         EasyMock.expect(effectivePolicy.getInterceptors())
-            .andReturn(CastUtils.cast(Collections.singletonList(i), Interceptor.class));
+            .andReturn(li);
         InterceptorChain ic = control.createMock(InterceptorChain.class);
         EasyMock.expect(message.getInterceptorChain()).andReturn(ic);
-        ic.add(i);
+        ic.add(li.get(0));
         EasyMock.expectLastCall();
         Collection<PolicyAssertion> assertions = 
             CastUtils.cast(Collections.EMPTY_LIST, PolicyAssertion.class);
@@ -221,12 +234,12 @@
         EffectivePolicy effectivePolicy = control.createMock(EffectivePolicyImpl.class);
         EasyMock.expect(pe.getEffectiveServerFaultPolicy(ei, bfi, destination))
             .andReturn(effectivePolicy);
-        Interceptor i = control.createMock(Interceptor.class);
+        List<Interceptor<? extends Message>> li = createMockInterceptorList();
         EasyMock.expect(effectivePolicy.getInterceptors())
-            .andReturn(CastUtils.cast(Collections.singletonList(i), Interceptor.class));
+            .andReturn(li);
         InterceptorChain ic = control.createMock(InterceptorChain.class);
         EasyMock.expect(message.getInterceptorChain()).andReturn(ic);
-        ic.add(i);
+        ic.add(li.get(0));
         EasyMock.expectLastCall();
         Collection<PolicyAssertion> assertions = 
             CastUtils.cast(Collections.EMPTY_LIST, PolicyAssertion.class);

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java Mon Nov 16 15:14:59 2009
@@ -42,6 +42,7 @@
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.jaxb.JAXBDataBinding;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.factory.ServiceConstructionException;
 import org.apache.cxf.service.model.BindingInfo;
@@ -612,7 +613,7 @@
     class EffectivePolicyImpl implements EffectivePolicy {
 
         private EndpointPolicy endpointPolicy;
-        private List<Interceptor> interceptors;
+        private List<Interceptor<? extends Message>> interceptors;
 
         EffectivePolicyImpl(EndpointPolicy ep, PolicyInterceptorProviderRegistry reg, boolean outbound,
                             boolean fault) {
@@ -624,7 +625,7 @@
             return endpointPolicy.getChosenAlternative();
         }
 
-        public List<Interceptor> getInterceptors() {
+        public List<Interceptor<? extends Message>> getInterceptors() {
             return interceptors;
         }
 

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java Mon Nov 16 15:14:59 2009
@@ -32,7 +32,7 @@
 /**
  * 
  */
-public class RMInInterceptor extends AbstractRMInterceptor {
+public class RMInInterceptor extends AbstractRMInterceptor<Message> {
     
     private static final Logger LOG = LogUtils.getL7dLogger(RMInInterceptor.class);
   

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java Mon Nov 16 15:14:59 2009
@@ -39,7 +39,7 @@
 /**
  * 
  */
-public class RMOutInterceptor extends AbstractRMInterceptor {
+public class RMOutInterceptor extends AbstractRMInterceptor<Message>  {
     
     private static final Logger LOG = LogUtils.getL7dLogger(RMOutInterceptor.class);
  

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionInterceptor.java Mon Nov 16 15:14:59 2009
@@ -32,7 +32,7 @@
 /**
  * 
  */
-public class RetransmissionInterceptor extends AbstractPhaseInterceptor {
+public class RetransmissionInterceptor extends AbstractPhaseInterceptor<Message> {
 
     RMManager manager;
 

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java Mon Nov 16 15:14:59 2009
@@ -29,6 +29,7 @@
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.MessageObserver;
@@ -87,19 +88,19 @@
         wrappedEndpoint.setOutFaultObserver(arg0);
     }
 
-    public List<Interceptor> getInFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getInFaultInterceptors() {
         return wrappedEndpoint.getInFaultInterceptors();
     }
 
-    public List<Interceptor> getInInterceptors() {
+    public List<Interceptor<? extends Message>> getInInterceptors() {
         return wrappedEndpoint.getInInterceptors();        
     }
 
-    public List<Interceptor> getOutFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
         return wrappedEndpoint.getOutFaultInterceptors();
     }
 
-    public List<Interceptor> getOutInterceptors() {
+    public List<Interceptor<? extends Message>> getOutInterceptors() {
         return wrappedEndpoint.getOutInterceptors();
     }
 

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedService.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedService.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedService.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedService.java Mon Nov 16 15:14:59 2009
@@ -31,6 +31,7 @@
 import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -99,19 +100,19 @@
         wrappedService.setExecutor(arg0);
     }
 
-    public List<Interceptor> getInFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getInFaultInterceptors() {
         return wrappedService.getInFaultInterceptors();
     }
 
-    public List<Interceptor> getInInterceptors() {
+    public List<Interceptor<? extends Message>> getInInterceptors() {
         return wrappedService.getInInterceptors();
     }
 
-    public List<Interceptor> getOutFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
         return wrappedService.getOutFaultInterceptors();
     }
 
-    public List<Interceptor> getOutInterceptors() {
+    public List<Interceptor<? extends Message>> getOutInterceptors() {
         return wrappedService.getOutInterceptors();
     }
 

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java Mon Nov 16 15:14:59 2009
@@ -34,6 +34,7 @@
 import org.apache.cxf.binding.soap.model.SoapBindingInfo;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
@@ -341,7 +342,7 @@
         Collection<PolicyAssertion> alt = new ArrayList<PolicyAssertion>();
         EasyMock.expect(ep.getChosenAlternative()).andReturn(alt).times(2);
         PolicyInterceptorProviderRegistry reg = control.createMock(PolicyInterceptorProviderRegistry.class);
-        List<Interceptor> li = new ArrayList<Interceptor>();
+        List<Interceptor<? extends Message>> li = new ArrayList<Interceptor<? extends Message>>();
         EasyMock.expect(reg.getInterceptors(alt, true, false)).andReturn(li);
         Policy p = control.createMock(Policy.class);
         EasyMock.expect(ep.getPolicy()).andReturn(p);

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java Mon Nov 16 15:14:59 2009
@@ -235,8 +235,8 @@
             endpoint.getEndpointInfo().setProperty(TokenStore.class.getName(), store);
         
             EndpointPolicy ep = pe.getServerEndpointPolicy(endpoint.getEndpointInfo(), destination);
-            List<Interceptor> interceptors = ep.getInterceptors();
-            for (Interceptor i : interceptors) {
+            List<Interceptor<? extends Message>> interceptors = ep.getInterceptors();
+            for (Interceptor<? extends Message> i : interceptors) {
                 message.getInterceptorChain().add(i);
             }
             

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Mon Nov 16 15:14:59 2009
@@ -50,7 +50,7 @@
 import org.apache.cxf.binding.soap.SoapBindingConstants;
 import org.apache.cxf.binding.soap.model.SoapOperationInfo;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
-import org.apache.cxf.common.i18n.Message;
+//import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
 import org.apache.cxf.common.util.StringUtils;
@@ -68,6 +68,7 @@
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorProvider;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.resource.ResourceManager;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingInfo;
@@ -142,10 +143,14 @@
 
     Map<String, Object> ctx = new HashMap<String, Object>();
     
-    List<Interceptor> in = new ModCountCopyOnWriteArrayList<Interceptor>();
-    List<Interceptor> out = new ModCountCopyOnWriteArrayList<Interceptor>();
-    List<Interceptor> outFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
-    List<Interceptor> inFault  = new ModCountCopyOnWriteArrayList<Interceptor>();
+    List<Interceptor<? extends Message>> in 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    List<Interceptor<? extends Message>> out 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    List<Interceptor<? extends Message>> outFault  
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+    List<Interceptor<? extends Message>> inFault 
+        = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
     List<AbstractFeature> features;
 
     public STSClient(Bus b) {
@@ -721,7 +726,7 @@
         Element rstDec = rst;
         String id = findID(rar, rur, rstDec);
         if (StringUtils.isEmpty(id)) {
-            throw new TrustException(new Message("NO_ID", LOG));
+            throw new TrustException("NO_ID", LOG);
         }
         SecurityToken token = new SecurityToken(id, rstDec, lte);
         token.setAttachedReference(rar);
@@ -747,7 +752,7 @@
 
                     secret = processor.getDecryptedBytes();
                 } catch (IOException e) {
-                    throw new TrustException(new Message("ENCRYPTED_KEY_ERROR", LOG), e);
+                    throw new TrustException("ENCRYPTED_KEY_ERROR", LOG, e);
                 }
             } else if (childQname.equals(new QName(namespace, "ComputedKey"))) {
                 // Handle the computed key
@@ -767,11 +772,11 @@
                     try {
                         secret = psha1.createKey(requestorEntropy, serviceEntr, 0, length / 8);
                     } catch (ConversationException e) {
-                        throw new TrustException(new Message("DERIVED_KEY_ERROR", LOG), e);
+                        throw new TrustException("DERIVED_KEY_ERROR", LOG, e);
                     }
                 } else {
                     // Service entropy missing
-                    throw new TrustException(new Message("NO_ENTROPY", LOG));
+                    throw new TrustException("NO_ENTROPY", LOG);
                 }
             }
         } else if (requestorEntropy != null) {
@@ -890,47 +895,47 @@
         template = rstTemplate;
     }
     
-    public List<Interceptor> getOutFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
         if (client != null) {
             return client.getOutFaultInterceptors();
         }
         return outFault;
     }
 
-    public List<Interceptor> getInFaultInterceptors() {
+    public List<Interceptor<? extends Message>> getInFaultInterceptors() {
         if (client != null) {
             return client.getInFaultInterceptors();
         }
         return inFault;
     }
 
-    public List<Interceptor> getInInterceptors() {
+    public List<Interceptor<? extends Message>> getInInterceptors() {
         if (client != null) {
             return client.getInInterceptors();
         }
         return in;
     }
 
-    public List<Interceptor> getOutInterceptors() {
+    public List<Interceptor<? extends Message>> getOutInterceptors() {
         if (client != null) {
             return client.getOutInterceptors();
         }
         return out;
     }
 
-    public void setInInterceptors(List<Interceptor> interceptors) {
+    public void setInInterceptors(List<Interceptor<? extends Message>> interceptors) {
         getInInterceptors().addAll(interceptors);
     }
 
-    public void setInFaultInterceptors(List<Interceptor> interceptors) {
+    public void setInFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
         getInFaultInterceptors().addAll(interceptors);
     }
 
-    public void setOutInterceptors(List<Interceptor> interceptors) {
+    public void setOutInterceptors(List<Interceptor<? extends Message>> interceptors) {
         getOutInterceptors().addAll(interceptors);
     }
 
-    public void setOutFaultInterceptors(List<Interceptor> interceptors) {
+    public void setOutFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
         getOutFaultInterceptors().addAll(interceptors);
     }
     

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

Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java (original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java Mon Nov 16 15:14:59 2009
@@ -47,6 +47,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.Phase;
 import org.apache.cxf.phase.PhaseInterceptor;
@@ -74,7 +75,7 @@
         SortedSet<Phase> phases = new TreeSet<Phase>();
         phases.add(new Phase(Phase.PRE_PROTOCOL, 1));
         
-        List<Interceptor> lst = new ArrayList<Interceptor>();
+        List<Interceptor<? extends Message>> lst = new ArrayList<Interceptor<? extends Message>>();
         lst.add(new MustUnderstandInterceptor());
         lst.add(new WSS4JInInterceptor());
         lst.add(new SAAJInInterceptor());

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java Mon Nov 16 15:14:59 2009
@@ -27,6 +27,7 @@
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 import org.apache.cxf.jaxrs.provider.BinaryDataProvider;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
     
 public class BookServer extends AbstractBusTestServerBase {
@@ -46,10 +47,10 @@
         providers.add(new GenericHandlerWriter());
         providers.add(new FaultyRequestHandler());
         sf.setProviders(providers);
-        List<Interceptor> outInts = new ArrayList<Interceptor>();
+        List<Interceptor<? extends Message>> outInts = new ArrayList<Interceptor<? extends Message>>();
         outInts.add(new CustomOutInterceptor());
         sf.setOutInterceptors(outInts);
-        List<Interceptor> outFaultInts = new ArrayList<Interceptor>();
+        List<Interceptor<? extends Message>> outFaultInts = new ArrayList<Interceptor<? extends Message>>();
         outFaultInts.add(new CustomOutFaultInterceptor());
         sf.setOutFaultInterceptors(outFaultInts);
         sf.setResourceProvider(BookStore.class,



Mime
View raw message