Updated Branches: refs/heads/master 6c27433e2 -> 3d82bea54
CAMEL-6347: Replace the usage of CommonsHttpMessageSender with HttpComponentsMessageSender on the Producer side. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d82bea5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d82bea5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d82bea5 Branch: refs/heads/master Commit: 3d82bea54b61534c542891d719129e739efe9c58 Parents: 6c27433 Author: Babak Vahdat <bvah...@apache.org> Authored: Thu May 9 19:13:10 2013 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Thu May 9 19:13:10 2013 +0200 ---------------------------------------------------------------------- .../spring/ws/SpringWebserviceProducer.java | 12 ++++++------ .../ws/ProducerRemoteRouteTimeOutTest-context.xml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3d82bea5/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java index bec4b2c..93bd595 100644 --- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java +++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java @@ -47,7 +47,7 @@ import org.springframework.ws.soap.client.core.SoapActionCallback; import org.springframework.ws.transport.WebServiceConnection; import org.springframework.ws.transport.WebServiceMessageSender; import org.springframework.ws.transport.http.AbstractHttpWebServiceMessageSender; -import org.springframework.ws.transport.http.CommonsHttpMessageSender; +import org.springframework.ws.transport.http.HttpComponentsMessageSender; import org.springframework.ws.transport.http.HttpUrlConnection; import org.springframework.ws.transport.http.HttpUrlConnectionMessageSender; @@ -109,18 +109,18 @@ public class SpringWebserviceProducer extends DefaultProducer { for (int i = 0; i < messageSenders.length; i++) { WebServiceMessageSender messageSender = messageSenders[i]; - if (messageSender instanceof CommonsHttpMessageSender) { + if (messageSender instanceof HttpComponentsMessageSender) { if (configuration.getSslContextParameters() != null) { - LOG.warn("Not applying SSLContextParameters based configuration to CommonsHttpMessageSender. " + LOG.warn("Not applying SSLContextParameters based configuration to HttpComponentsMessageSender. " + "If you are using this MessageSender, which you are not by default, you will need " + "to configure SSL using the Commons HTTP 3.x Protocol registry."); } if (configuration.getTimeout() > -1) { - if (messageSender.getClass().equals(CommonsHttpMessageSender.class)) { - ((CommonsHttpMessageSender) messageSender).setReadTimeout(configuration.getTimeout()); + if (messageSender.getClass().equals(HttpComponentsMessageSender.class)) { + ((HttpComponentsMessageSender) messageSender).setReadTimeout(configuration.getTimeout()); } else { - LOG.warn("Not applying timeout configuration to CommonsHttpMessageSender based implementation. " + LOG.warn("Not applying timeout configuration to HttpComponentsMessageSender based implementation. " + "You are using what appears to be a custom MessageSender, which you are not doing by default. " + "You will need configure timeout on your own."); } http://git-wip-us.apache.org/repos/asf/camel/blob/3d82bea5/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest-context.xml b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest-context.xml index fc4ce39..6e58716 100644 --- a/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest-context.xml +++ b/components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ProducerRemoteRouteTimeOutTest-context.xml @@ -27,7 +27,7 @@ <constructor-arg ref="messageFactory" /> <property name="messageSender"> <bean - class="org.springframework.ws.transport.http.CommonsHttpMessageSender" /> + class="org.springframework.ws.transport.http.HttpComponentsMessageSender" /> </property> </bean> @@ -35,7 +35,7 @@ <constructor-arg ref="messageFactory" /> <property name="messageSender"> <bean - class="org.springframework.ws.transport.http.CommonsHttpMessageSender" /> + class="org.springframework.ws.transport.http.HttpComponentsMessageSender" /> </property> </bean>
