Repository: camel Updated Branches: refs/heads/master c8b835e6f -> 15256c88a
CAMEL-10679 Sorry, in the last, i forgot to add the component.adoc and i renamed the test method. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59728694 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59728694 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59728694 Branch: refs/heads/master Commit: 597286948f3a243749d1818d5a1dba491c4f917f Parents: 1c4d173 Author: marcusmesserkewill <marcus.mes...@kewill.com> Authored: Mon Jan 9 12:16:37 2017 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Mon Jan 9 12:55:41 2017 +0100 ---------------------------------------------------------------------- .../camel-spring-ws/src/main/docs/spring-ws-component.adoc | 7 ++----- .../camel/component/spring/ws/SoapResponseAttachmentTest.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/59728694/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc index 20b6f64..5d153bd 100644 --- a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc +++ b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc @@ -93,7 +93,7 @@ The Spring WebService component has no options. // endpoint options: START -The Spring WebService component supports 24 endpoint options which are listed below: +The Spring WebService component supports 21 endpoint options which are listed below: {% raw %} [width="100%",cols="2,1,1m,1m,5",options="header"] @@ -103,12 +103,10 @@ The Spring WebService component supports 24 endpoint options which are listed be | lookupKey | consumer | | String | Endpoint mapping key if endpoint mapping is used | webServiceEndpointUri | producer | | String | The default Web Service endpoint uri to use for the producer. | messageFilter | common | | MessageFilter | Option to provide a custom MessageFilter. For example when you want to process your headers or attachments by your own. -| bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN or ERROR level and ignored. | endpointDispatcher | consumer | | CamelEndpointDispatcher | Spring org.springframework.ws.server.endpoint.MessageEndpoint for dispatching messages received by Spring-WS to a Camel endpoint to integrate with existing (legacy) endpoint mappings like PayloadRootQNameEndpointMapping SoapActionEndpointMapping etc. | endpointMapping | consumer | | CamelSpringWSEndpointMapping | Reference to an instance of org.apache.camel.component.spring.ws.bean.CamelEndpointMapping in the Registry/ApplicationContext. Only one bean is required in the registry to serve all Camel/Spring-WS endpoints. This bean is auto-discovered by the MessageDispatcher and used to map requests to Camel endpoints based on characteristics specified on the endpoint (like root QName SOAP action etc) | expression | consumer | | String | The XPath expression to use when option type=xpathresult. Then this option is required to be configured. -| exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN or ERROR level and ignored. -| exchangePattern | consumer (advanced) | | ExchangePattern | Sets the exchange pattern when the consumer creates an exchange. +| allowResponseAttachmentOverride | producer | false | boolean | Option to override soap response attachments in in/out exchange with attachments from the actual service layer. If the invoked service appends or rewrites the soap attachments this option when set to true allows the modified soap attachments to be overwritten in in/out message attachments | allowResponseHeaderOverride | producer | false | boolean | Option to override soap response header in in/out exchange with header info from the actual service layer. If the invoked service appends or rewrites the soap header this option when set to true allows the modified soap header to be overwritten in in/out message headers | faultAction | producer | | URI | Signifies the value for the faultAction response WS-Addressing Fault Action header that is provided by the method. | faultTo | producer | | URI | Signifies the value for the faultAction response WS-Addressing FaultTo header that is provided by the method. @@ -121,7 +119,6 @@ The Spring WebService component supports 24 endpoint options which are listed be | timeout | producer | | int | Sets the socket read timeout (in milliseconds) while invoking a webservice using the producer see URLConnection.setReadTimeout() and CommonsHttpMessageSender.setReadTimeout(). This option works when using the built-in message sender implementations: CommonsHttpMessageSender and HttpUrlConnectionMessageSender. One of these implementations will be used by default for HTTP based services unless you customize the Spring WS configuration options supplied to the component. If you are using a non-standard sender it is assumed that you will handle your own timeout configuration. The built-in message sender HttpComponentsMessageSender is considered instead of CommonsHttpMessageSender which has been deprecated see HttpComponentsMessageSender.setReadTimeout(). | webServiceTemplate | producer | | WebServiceTemplate | Option to provide a custom WebServiceTemplate. This allows for full control over client-side web services handling; like adding a custom interceptor or specifying a fault resolver message sender or message factory. | wsAddressingAction | producer | | URI | WS-Addressing 1.0 action header to include when accessing web services. The To header is set to the address of the web service as specified in the endpoint URI (default Spring-WS behavior). -| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | sslContextParameters | security | | SSLContextParameters | To configure security using SSLContextParameters |======================================================================= {% endraw %} http://git-wip-us.apache.org/repos/asf/camel/blob/59728694/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java index 9d84085..168de75 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java @@ -46,7 +46,7 @@ public class SoapResponseAttachmentTest extends AbstractJUnit4SpringContextTests * @throws Exception */ @Test() - public void consumeStockQuoteWebserviceWithSoapHeader() throws Exception { + public void consumeStockQuoteWebserviceWithSoapResponseAttachment() throws Exception { Exchange result = template.request("direct:stockQuoteWebservice", new Processor() { @Override
