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/15 18:08:57 UTC
svn commit: r1373496 - in
/camel/branches/camel-2.10.x/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: Wed Aug 15 16:08:57 2012
New Revision: 1373496
URL: http://svn.apache.org/viewvc?rev=1373496&view=rev
Log:
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.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1373496&r1=1373495&r2=1373496&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Wed Aug 15 16:08:57 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/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java?rev=1373496&r1=1373495&r2=1373496&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java Wed Aug 15 16:08:57 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 {