Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f64562ba Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f64562ba Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f64562ba Branch: refs/heads/camel-2.17.x Commit: f64562ba18a601a14f906f229c0041d9af6c8ef8 Parents: 63f64c7 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Apr 28 20:00:26 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Apr 28 20:00:26 2016 +0200 ---------------------------------------------------------------------- components/camel-aws/src/main/docs/aws-s3.adoc | 4 +++- .../CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java | 6 ++++-- .../apache/camel/spring/boot/mockendpoints/AdviceWithTest.java | 6 +++--- .../camel/spring/boot/mockendpoints/MockEndpointsTest.java | 6 +++--- .../org/apache/camel/spring/boot/mockendpoints/MyRoute.java | 6 +++--- 5 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f64562ba/components/camel-aws/src/main/docs/aws-s3.adoc ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/docs/aws-s3.adoc b/components/camel-aws/src/main/docs/aws-s3.adoc index dd207a6..dbaba40 100644 --- a/components/camel-aws/src/main/docs/aws-s3.adoc +++ b/components/camel-aws/src/main/docs/aws-s3.adoc @@ -30,6 +30,7 @@ The bucket will be created if it don't already exists. + URI Options ^^^^^^^^^^^ + // endpoint options: START The AWS S3 Storage Service component supports 38 endpoint options which are listed below: @@ -45,7 +46,7 @@ The AWS S3 Storage Service component supports 38 endpoint options which are list | proxyPort | common | | Integer | Camel 2.16: Specify a proxy port to be used inside the client definition. | secretKey | common | | String | Amazon AWS Secret Key | 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/ERROR level and ignored. -| deleteAfterRead | consumer | true | boolean | Delete objects from S3 after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs the object is not deleted. +| deleteAfterRead | consumer | true | boolean | Delete objects from S3 after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs the object is not deleted. If this option is false then the same objects will be retrieve over and over again on the polls. Therefore you need to use the Idempotent Consumer EIP in the route to filter out duplicates. You can filter using the link S3ConstantsBUCKET_NAME and link S3ConstantsKEY headers or only the link S3ConstantsKEY header. | fileName | consumer | | String | To get the object from the bucket with the given file name | includeBody | consumer | true | boolean | Camel 2.17: If it is true the exchange body will be set to a stream to the contents of the file. If false the headers will be set with the S3 object metadata but the body will be null. | maxMessagesPerPoll | consumer | 10 | int | Gets the maximum number of messages as a limit to poll at each polling. Is default unlimited but use 0 or negative number to disable it as unlimited. @@ -78,6 +79,7 @@ The AWS S3 Storage Service component supports 38 endpoint options which are list // endpoint options: END + |======================================================================= Required S3 component options http://git-wip-us.apache.org/repos/asf/camel/blob/f64562ba/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java index 3e258c8..351c349 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerDuplicateNamespaceStreamCacheTest.java @@ -24,8 +24,10 @@ public class CxfPayloadConsumerDuplicateNamespaceStreamCacheTest extends CxfPayl * payload. If this is set another time from the envelope, the result will * be an invalid XML. */ - protected static final String REQUEST_MESSAGE = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"; xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";>" - + "<soap:Body><ns2:getToken xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"; xmlns:ns2=\"http://camel.apache.org/cxf/namespace\";><arg0 xsi:type=\"xs:string\">Send</arg0></ns2:getToken></soap:Body></soap:Envelope>"; + protected static final String REQUEST_MESSAGE = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""; + + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";>" + + "<soap:Body><ns2:getToken xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"; xmlns:ns2=\"http://camel.apache.org/cxf/namespace\";>" + + "<arg0 xsi:type=\"xs:string\">Send</arg0></ns2:getToken></soap:Body></soap:Envelope>"; @Test public void testInvokeRouter() { http://git-wip-us.apache.org/repos/asf/camel/blob/f64562ba/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java index c1fca38..80e8beb 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. http://git-wip-us.apache.org/repos/asf/camel/blob/f64562ba/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java index e3bdb16..9c0547e 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. http://git-wip-us.apache.org/repos/asf/camel/blob/f64562ba/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java index 8f59520..1abb466 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
