You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/03/07 05:42:51 UTC

svn commit: r634534 - in /servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse: CxfSeEndpoint.java interceptors/WrapperOutInterceptor.java

Author: ffang
Date: Thu Mar  6 20:42:50 2008
New Revision: 634534

URL: http://svn.apache.org/viewvc?rev=634534&view=rev
Log:
[SM-1163]CXF SE missing type attribute in jbi outbound message

Removed:
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/interceptors/WrapperOutInterceptor.java
Modified:
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java

Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java?rev=634534&r1=634533&r2=634534&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java Thu Mar  6 20:42:50 2008
@@ -18,7 +18,6 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -35,7 +34,6 @@
 import javax.xml.ws.WebServiceRef;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.binding.jbi.interceptor.JBIWrapperOutInterceptor;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorProvider;
 import org.apache.cxf.jaxws.EndpointImpl;
@@ -50,7 +48,6 @@
 import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
 import org.apache.servicemix.common.endpoints.ProviderEndpoint;
 import org.apache.servicemix.cxfse.interceptors.AttachmentInInterceptor;
-import org.apache.servicemix.cxfse.interceptors.WrapperOutInterceptor;
 import org.apache.servicemix.cxfse.support.ReflectionUtils;
 import org.apache.servicemix.id.IdGenerator;
 import org.springframework.util.ReflectionUtils.FieldCallback;
@@ -159,7 +156,6 @@
         endpoint.setInFaultInterceptors(getInFaultInterceptors());
         endpoint.setOutInterceptors(getOutInterceptors());
         endpoint.setOutFaultInterceptors(getOutFaultInterceptors());
-        endpoint.getOutInterceptors().add(new WrapperOutInterceptor());
         if (isMtomEnabled()) {
             endpoint.getInInterceptors().add(new AttachmentInInterceptor());
         }
@@ -213,7 +209,6 @@
         super.start();
         address = "jbi://" + ID_GENERATOR.generateSanitizedId();
         endpoint.publish(address);
-        removeJBIWrapperInterceptor(endpoint.getServer().getEndpoint().getBinding().getOutInterceptors());
         setService(endpoint.getServer().getEndpoint().getService().getName());
         setEndpoint(endpoint.getServer().getEndpoint().getEndpointInfo()
                 .getName().getLocalPart());
@@ -243,17 +238,6 @@
         injectPojo();
     }
 
-    private void removeJBIWrapperInterceptor(List<Interceptor> outInterceptors) {
-                            
-        Iterator<Interceptor> iter = outInterceptors.iterator();
-        while (iter.hasNext()) {
-            Interceptor interceptor = iter.next();
-            if (interceptor instanceof JBIWrapperOutInterceptor) {
-                outInterceptors.remove(interceptor);
-                break;
-            }
-        }
-    }
 
     /*
      * (non-Javadoc)