Author: dkulp Date: Wed Aug 15 16:26:23 2012 New Revision: 1373512 URL: http://svn.apache.org/viewvc?rev=1373512&view=rev Log: Merged revisions 1373496 via git cherry-pick from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........ r1373496 | dkulp | 2012-08-15 12:08:57 -0400 (Wed, 15 Aug 2012) | 10 lines Merged revisions 1371861 via git cherry-pick from https://svn.apache.org/repos/asf/camel/trunk ........ r1371861 | dkulp | 2012-08-10 22:50:32 -0400 (Fri, 10 Aug 2012) | 2 lines Pass some properties that will be required for next CXF version. ........ ........ Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1373512&r1=1373511&r2=1373512&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Wed Aug 15 16:26:23 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; @@ -300,6 +301,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); @@ -455,6 +462,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/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java?rev=1373512&r1=1373511&r2=1373512&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java Wed Aug 15 16:26:23 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 {
