svn commit: r470919 - in /incubator/cxf/trunk/rt: core/src/main/java/org/apache/cxf/endpoint/ core/src/main/java/org/apache/cxf/service/factory/ frontend/jaxws/src/main/java/org/apache/cxf/jaxws/

[an...@apache.org]

Author: andreasmyth
Date: Fri Nov  3 09:32:45 2006
New Revision: 470919

URL: http://svn.apache.org/viewvc?view=rev&rev=470919
Log:
MessageSenderInterceptor added to outInterceptors, outFaultInterceptors in one place only.

Modified:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?view=diff&rev=470919&r1=470918&r2=470919
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Fri Nov  3 09:32:45 2006
@@ -35,7 +35,6 @@
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorChain;
-import org.apache.cxf.interceptor.MessageSenderInterceptor;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
@@ -70,7 +69,6 @@
     public ClientImpl(Bus b, Endpoint e) {
         bus = b;
         endpoint = e;
-        getOutInterceptors().add(new MessageSenderInterceptor());
         outFaultObserver = new ClientOutFaultObserver(bus);
     }
 

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java?view=diff&rev=470919&r1=470918&r2=470919
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java Fri Nov  3 09:32:45 2006
@@ -36,6 +36,7 @@
 import org.apache.cxf.interceptor.AbstractAttributedInterceptorProvider;
 import org.apache.cxf.interceptor.AbstractFaultChainIntiatorObserver;
 import org.apache.cxf.interceptor.InFaultChainInitiatorObserver;
+import org.apache.cxf.interceptor.MessageSenderInterceptor;
 import org.apache.cxf.interceptor.OutFaultChainInitiatorObserver;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingInfo;
@@ -74,6 +75,9 @@
         
         inFaultObserver = new InFaultChainInitiatorObserver(bus);
         outFaultObserver = new OutFaultChainInitiatorObserver(bus);
+
+        getOutInterceptors().add(new MessageSenderInterceptor());
+        getOutFaultInterceptors().add(new MessageSenderInterceptor());
     }
     
     public String getBeanName() {

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java?view=diff&rev=470919&r1=470918&r2=470919
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java Fri Nov  3 09:32:45 2006
@@ -21,7 +21,6 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.databinding.DataBinding;
-import org.apache.cxf.interceptor.MessageSenderInterceptor;
 import org.apache.cxf.interceptor.OutgoingChainInterceptor;
 import org.apache.cxf.interceptor.OutgoingChainSetupInterceptor;
 import org.apache.cxf.interceptor.ServiceInvokerInterceptor;
@@ -38,9 +37,7 @@
         service.getInInterceptors().add(new ServiceInvokerInterceptor());
         service.getInInterceptors().add(new OutgoingChainSetupInterceptor());
         service.getInInterceptors().add(new OutgoingChainInterceptor());
-        service.getOutInterceptors().add(new MessageSenderInterceptor());
         service.getOutFaultInterceptors().add(new OutgoingChainSetupInterceptor());
-        service.getOutFaultInterceptors().add(new MessageSenderInterceptor());
     }
     
     protected void initializeDataBindings() {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java?view=diff&rev=470919&r1=470918&r2=470919
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java Fri Nov  3 09:32:45 2006
@@ -42,7 +42,6 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.Interceptor;
-import org.apache.cxf.interceptor.MessageSenderInterceptor;
 import org.apache.cxf.jaxws.interceptors.DispatchInInterceptor;
 import org.apache.cxf.jaxws.interceptors.DispatchOutInterceptor;
 import org.apache.cxf.jaxws.support.ContextPropertiesMapping;
@@ -197,7 +196,6 @@
         chain.add(il);
 
         List<Interceptor> outInterceptors = new ArrayList<Interceptor>();
-        outInterceptors.add(new MessageSenderInterceptor());
         outInterceptors.add(new DispatchOutInterceptor());
 
         chain.add(outInterceptors);