You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2012/08/11 04:50:32 UTC

svn commit: r1371861 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/CxfEndpoint.java test/java/org/apache/camel/wsdl_first/PersonImpl12.java

Author: dkulp
Date: Sat Aug 11 02:50:32 2012
New Revision: 1371861

URL: http://svn.apache.org/viewvc?rev=1371861&view=rev
Log:
Pass some properties that will be required for next CXF version.

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1371861&r1=1371860&r2=1371861&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Sat Aug 11 02:50:32 2012
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -304,6 +305,12 @@ public class CxfEndpoint extends Default
             }
             LOG.debug("ServerFactoryBean: {} added properties: {}", sfb, getProperties());
         }
+        if (this.isSkipPayloadMessagePartCheck()) {
+            if (sfb.getProperties() == null) {
+                sfb.setProperties(new HashMap<String, Object>());                
+            }
+            sfb.getProperties().put("soap.force.doclit.bare", Boolean.TRUE);
+        }
 
         sfb.setBus(getBus());
         sfb.setStart(false);
@@ -462,6 +469,13 @@ public class CxfEndpoint extends Default
             }
             LOG.debug("ClientFactoryBean: {} added properties: {}", factoryBean, getProperties());
         }
+        
+        if (this.isSkipPayloadMessagePartCheck()) {
+            if (factoryBean.getProperties() == null) {
+                factoryBean.setProperties(new HashMap<String, Object>());                
+            }
+            factoryBean.getProperties().put("soap.force.doclit.bare", Boolean.TRUE);
+        }
 
         factoryBean.setBus(getBus());
     }

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java?rev=1371861&r1=1371860&r2=1371861&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java Sat Aug 11 02:50:32 2012
@@ -20,7 +20,8 @@ import javax.jws.WebService;
 
 @WebService(serviceName = "PersonService12",
         targetNamespace = "http://camel.apache.org/wsdl-first",
-        endpointInterface = "org.apache.camel.wsdl_first.Person")
+        endpointInterface = "org.apache.camel.wsdl_first.Person",
+        wsdlLocation = "classpath:/person.wsdl")
         
 @javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")                  
 public class PersonImpl12 extends PersonImpl {