You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/05/28 08:11:20 UTC
svn commit: r1128561 - in /camel/trunk/components/camel-cxf/src:
main/java/org/apache/camel/component/cxf/
test/java/org/apache/camel/component/cxf/
test/java/org/apache/camel/component/cxf/mtom/
Author: ningjiang
Date: Sat May 28 06:11:20 2011
New Revision: 1128561
URL: http://svn.apache.org/viewvc?rev=1128561&view=rev
Log:
CAMEL-4023 Properties to Cxf ClientProxyFactory can be set on endpoint uri or CxfEndpoint bean.
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
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/component/cxf/CxfJavaOnlyPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java?rev=1128561&r1=1128560&r2=1128561&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java Sat May 28 06:11:20 2011
@@ -88,6 +88,8 @@ public class CxfComponent extends Header
Map<String, Object> properties = IntrospectionSupport.extractProperties(parameters, "properties.");
if (properties != null) {
result.setProperties(properties);
+ // set the properties of MTOM
+ result.setMtomEnabled(Boolean.valueOf((String)properties.get(Message.MTOM_ENABLED)));
}
return result;
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=1128561&r1=1128560&r2=1128561&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 May 28 06:11:20 2011
@@ -188,12 +188,12 @@ public class CxfEndpoint extends Default
}
// any optional properties
- if (properties != null) {
+ if (getProperties() != null) {
if (sfb.getProperties() != null) {
// add to existing properties
- sfb.getProperties().putAll(properties);
+ sfb.getProperties().putAll(getProperties());
} else {
- sfb.setProperties(properties);
+ sfb.setProperties(getProperties());
}
LOG.debug("ServerFactoryBean: {} added properties: {}", sfb, properties);
}
@@ -299,6 +299,17 @@ public class CxfEndpoint extends Default
factoryBean.getServiceFactory().setWrapped(getWrappedStyle());
}
+ // set the properties on CxfProxyFactoryBean
+ if (getProperties() != null) {
+ if (factoryBean.getProperties() != null) {
+ // add to existing properties
+ factoryBean.getProperties().putAll(getProperties());
+ } else {
+ factoryBean.setProperties(getProperties());
+ }
+ LOG.debug("ClientProxyFactoryBean: {} added properties: {}", factoryBean, properties);
+ }
+
factoryBean.setBus(getBus());
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java?rev=1128561&r1=1128560&r2=1128561&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java Sat May 28 06:11:20 2011
@@ -36,7 +36,8 @@ public class CxfJavaOnlyPayloadModeTest
+ "?wsdlURL=classpath:person.wsdl"
+ "&serviceName={http://camel.apache.org/wsdl-first}PersonService"
+ "&portName={http://camel.apache.org/wsdl-first}soap"
- + "&dataFormat=PAYLOAD";
+ + "&dataFormat=PAYLOAD"
+ + "&properties.exceptionMessageCauseEnabled=true&properties.faultStackTraceEnabled=true";
@Test
public void testCxfJavaOnly() throws Exception {
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java?rev=1128561&r1=1128560&r2=1128561&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java Sat May 28 06:11:20 2011
@@ -40,7 +40,7 @@ import org.junit.Test;
public class CxfMtomConsumerTest extends CamelTestSupport {
protected static final String MTOM_ENDPOINT_ADDRESS = "http://localhost:9091/jaxws-mtom/hello";
protected static final String MTOM_ENDPOINT_URI = "cxf://" + MTOM_ENDPOINT_ADDRESS
- + "?serviceClass=org.apache.camel.component.cxf.HelloImpl";
+ + "?serviceClass=org.apache.camel.cxf.mtom_feature.Hello";
private final QName serviceName = new QName("http://apache.org/camel/cxf/mtom_feature", "HelloService");
@@ -83,12 +83,12 @@ public class CxfMtomConsumerTest extends
return service.getHelloPort();
}
- private Image getImage(String name) throws Exception {
+ protected Image getImage(String name) throws Exception {
return ImageIO.read(getClass().getResource(name));
}
@Test
- public void testInvokingServiceFromCXFClient() throws Exception {
+ public void testInvokingService() throws Exception {
if (Boolean.getBoolean("java.awt.headless")
|| System.getProperty("os.name").startsWith("Mac OS") && System.getProperty("user.name").equals("cruise")) {