This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 3d99f1a Regen 3d99f1a is described below commit 3d99f1af537b4e3992bc53ee5fb76d0966610a93 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Jun 4 05:20:28 2019 +0200 Regen --- .../modules/ROOT/pages/ahc-component.adoc | 20 ++----- .../modules/ROOT/pages/ahc-ws-component.adoc | 2 +- .../modules/ROOT/pages/amqp-component.adoc | 32 ++--------- .../modules/ROOT/pages/apns-component.adoc | 4 +- .../modules/ROOT/pages/asterisk-component.adoc | 2 +- .../modules/ROOT/pages/atmos-component.adoc | 2 +- .../ROOT/pages/atmosphere-websocket-component.adoc | 2 +- .../modules/ROOT/pages/atom-component.adoc | 2 +- .../modules/ROOT/pages/atomix-map-component.adoc | 2 +- .../ROOT/pages/atomix-messaging-component.adoc | 2 +- .../ROOT/pages/atomix-multimap-component.adoc | 2 +- .../modules/ROOT/pages/atomix-queue-component.adoc | 2 +- .../modules/ROOT/pages/atomix-set-component.adoc | 2 +- .../modules/ROOT/pages/atomix-value-component.adoc | 2 +- .../modules/ROOT/pages/aws-cw-component.adoc | 11 ++-- .../modules/ROOT/pages/aws-ddb-component.adoc | 18 +++--- .../ROOT/pages/aws-ddbstream-component.adoc | 5 +- .../modules/ROOT/pages/aws-ec2-component.adoc | 5 +- .../modules/ROOT/pages/aws-ecs-component.adoc | 5 +- .../modules/ROOT/pages/aws-eks-component.adoc | 5 +- .../modules/ROOT/pages/aws-iam-component.adoc | 5 +- .../modules/ROOT/pages/aws-kinesis-component.adoc | 5 +- .../ROOT/pages/aws-kinesis-firehose-component.adoc | 5 +- .../modules/ROOT/pages/aws-kms-component.adoc | 5 +- .../modules/ROOT/pages/aws-lambda-component.adoc | 5 +- .../modules/ROOT/pages/aws-mq-component.adoc | 5 +- .../modules/ROOT/pages/aws-msk-component.adoc | 5 +- .../modules/ROOT/pages/aws-s3-component.adoc | 33 ++++++----- .../modules/ROOT/pages/aws-sdb-component.adoc | 3 +- .../modules/ROOT/pages/aws-ses-component.adoc | 7 +-- .../modules/ROOT/pages/aws-sns-component.adoc | 5 +- .../modules/ROOT/pages/aws-sqs-component.adoc | 27 +++++---- .../modules/ROOT/pages/aws-swf-component.adoc | 5 +- .../modules/ROOT/pages/azure-blob-component.adoc | 3 +- .../modules/ROOT/pages/azure-queue-component.adoc | 3 +- docs/components/modules/ROOT/pages/azure.adoc | 8 +-- .../modules/ROOT/pages/zookeeper-component.adoc | 67 ---------------------- 37 files changed, 101 insertions(+), 222 deletions(-) diff --git a/docs/components/modules/ROOT/pages/ahc-component.adoc b/docs/components/modules/ROOT/pages/ahc-component.adoc index 9e647b2..f4aa425 100644 --- a/docs/components/modules/ROOT/pages/ahc-component.adoc +++ b/docs/components/modules/ROOT/pages/ahc-component.adoc @@ -3,11 +3,11 @@ *Available as of Camel version 2.8* -The ahc: component provides HTTP based endpoints +The AHC component provides HTTP based endpoints for consuming external HTTP resources (as a client to call external -servers using HTTP). -The component uses the -https://github.com/AsyncHttpClient/async-http-client[Async Http Client] +servers using HTTP). +The component uses the +https://github.com/AsyncHttpClient/async-http-client[Async Http Client] library. Maven users will need to add the following dependency to their `pom.xml` @@ -387,24 +387,16 @@ the client. See the documentation at + http://github.com/sonatype/async-http-client[Async Http Client] for more details. -In Camel *2.8*, configuration is limited to using the builder pattern -provided by `AsyncHttpClientConfig.Builder`. In Camel 2.8, the -`AsyncHttpClientConfig` doesn't support getters/setters so its not easy -to create/configure using a Spring bean style (eg the <bean> tag in the -XML file). - The example below shows how to use a builder to create the `AsyncHttpClientConfig` which we configure on the `AhcComponent`. -In Camel *2.9*, the AHC component uses Async HTTP library 1.6.4. This -newer version provides added support for plain bean style configuration. The `AsyncHttpClientConfigBean` class provides getters and setters for the configuration options available in `AsyncHttpClientConfig`. An instance of `AsyncHttpClientConfigBean` may be passed directly to the AHC component or referenced in an endpoint URI using the `clientConfig` URI parameter. -Also available in Camel *2.9* is the ability to set configuration +There is the ability to set configuration options directly in the URI. URI parameters starting with "clientConfig." can be used to set the various configurable properties of `AsyncHttpClientConfig`. The properties specified in the endpoint URI @@ -427,7 +419,7 @@ from("direct:start") [[AHC-UsingtheJSSEConfigurationUtility]] Using the JSSE Configuration Utility -As of Camel 2.9, the AHC component supports SSL/TLS configuration +The AHC component supports SSL/TLS configuration through the link:camel-configuration-utilities.html[Camel JSSE Configuration Utility]. This utility greatly decreases the amount of component specific code you need to write and is configurable at the diff --git a/docs/components/modules/ROOT/pages/ahc-ws-component.adoc b/docs/components/modules/ROOT/pages/ahc-ws-component.adoc index ad3f0cb..338f06e 100644 --- a/docs/components/modules/ROOT/pages/ahc-ws-component.adoc +++ b/docs/components/modules/ROOT/pages/ahc-ws-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.14* -The *ahc-ws* component provides Websocket +The AHC-WS component provides Websocket based endpoints for a client communicating with external servers over Websocket (as a client opening a websocket connection to an external server). + diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc b/docs/components/modules/ROOT/pages/amqp-component.adoc index 9b39743..afdc0eb 100644 --- a/docs/components/modules/ROOT/pages/amqp-component.adoc +++ b/docs/components/modules/ROOT/pages/amqp-component.adoc @@ -3,15 +3,10 @@ *Available as of Camel version 1.2* -The amqp: component supports the -http://www.amqp.org/[AMQP 1.0 protocol] +The AMQP component supports the +http://www.amqp.org/[AMQP 1.0 protocol] using the JMS Client API of the http://qpid.apache.org/[Qpid] -project. In case you want to use AMQP 0.9 (in particular RabbitMQ) you -might also be interested in the -<<rabbitmq-component,Camel RabbitMQ>> -component. Please keep in mind that prior to the Camel 2.17.0 AMQP -component supported AMQP 0.9 and above, however since Camel 2.17.0 it -supports only AMQP 1.0. +project. Maven users will need to add the following dependency to their `pom.xml` for this component: @@ -390,22 +385,6 @@ from(...). ### Configuring AMQP component -Starting from the Camel 2.16.1 you can also use the -`AMQPComponent#amqp10Component(String connectionURI)` factory method to -return the AMQP 1.0 component with the pre-configured topic prefix: - -*Creating AMQP 1.0 component* - -[source,java] ----- - AMQPComponent amqp = AMQPComponent.amqp10Component("amqp://guest:guest@localhost:5672"); ----- - -Keep in mind that starting from the -Camel 2.17 the `AMQPComponent#amqp10Component(String connectionURI)` factory -method has been deprecated on the behalf of the -`AMQPComponent#amqpComponent(String connectionURI)`: - *Creating AMQP 1.0 component* [source,java] @@ -415,10 +394,9 @@ AMQPComponent amqp = AMQPComponent.amqpComponent("amqp://localhost:5672"); AMQPComponent authorizedAmqp = AMQPComponent.amqpComponent("amqp://localhost:5672", "user", "password"); ---- -Starting from Camel 2.17, in order to automatically configure the AMQP -component, you can also add an instance +You can also add an instance of `org.apache.camel.component.amqp.AMQPConnectionDetails` to the -registry. For example for Spring Boot you just have to define bean: +registry in order to automatically configure the AMQP component. For example for Spring Boot you just have to define bean: *AMQP connection details auto-configuration* diff --git a/docs/components/modules/ROOT/pages/apns-component.adoc b/docs/components/modules/ROOT/pages/apns-component.adoc index 92e97c0..f03dbd6 100644 --- a/docs/components/modules/ROOT/pages/apns-component.adoc +++ b/docs/components/modules/ROOT/pages/apns-component.adoc @@ -3,8 +3,8 @@ *Available as of Camel version 2.8* -The *apns* component is used for sending notifications to iOS devices. -The apns components use https://github.com/notnoop/java-apns[javapns] +The APNS component is used for sending notifications to iOS devices. +The APNS components use https://github.com/notnoop/java-apns[javapns] library. + The component supports sending notifications to Apple Push Notification Servers (APNS) and consuming feedback from the servers. diff --git a/docs/components/modules/ROOT/pages/asterisk-component.adoc b/docs/components/modules/ROOT/pages/asterisk-component.adoc index e655c3b..1d665ea 100644 --- a/docs/components/modules/ROOT/pages/asterisk-component.adoc +++ b/docs/components/modules/ROOT/pages/asterisk-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.18* -The *asterisk:* component allows you to work easily with an Asterisk PBX Server http://www.asterisk.org/ using https://asterisk-java.org/[asterisk-java] +The Asterisk component allows you to work easily with an Asterisk PBX Server http://www.asterisk.org/ using https://asterisk-java.org/[asterisk-java] This component help to interface with http://www.voip-info.org/wiki-Asterisk+manager+API[Asterisk Manager Interface] diff --git a/docs/components/modules/ROOT/pages/atmos-component.adoc b/docs/components/modules/ROOT/pages/atmos-component.adoc index eb321ca..8a641b8 100644 --- a/docs/components/modules/ROOT/pages/atmos-component.adoc +++ b/docs/components/modules/ROOT/pages/atmos-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.15* -*Camel-Atmos* is an http://camel.apache.org/[Apache Camel] component that +Camel-Atmos is an http://camel.apache.org/[Apache Camel] component that allows you to work with ViPR object data services using the https://github.com/emcvipr/dataservices-sdk-java[Atmos Client]. diff --git a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc index fca7bbf..05294db 100644 --- a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc +++ b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.14* -The *atmosphere-websocket:* component provides Websocket +The Atmosphere-Websocket component provides Websocket based endpoints for a servlet communicating with external clients over Websocket (as a servlet accepting websocket connections from external clients). + diff --git a/docs/components/modules/ROOT/pages/atom-component.adoc b/docs/components/modules/ROOT/pages/atom-component.adoc index 8eb7b4c..faf91ae 100644 --- a/docs/components/modules/ROOT/pages/atom-component.adoc +++ b/docs/components/modules/ROOT/pages/atom-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 1.2* -The *atom:* component is used for polling Atom feeds. +The Atom component is used for polling Atom feeds. Camel will poll the feed every 60 seconds by default. + *Note:* The component currently only supports polling (consuming) diff --git a/docs/components/modules/ROOT/pages/atomix-map-component.adoc b/docs/components/modules/ROOT/pages/atomix-map-component.adoc index d3d8c34..58030cb 100644 --- a/docs/components/modules/ROOT/pages/atomix-map-component.adoc +++ b/docs/components/modules/ROOT/pages/atomix-map-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.20* -The camel atomix-map component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedMap/[Distributed Map] collection. +The camel Atomix-Map component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedMap/[Distributed Map] collection. Maven users will need to add the following dependency to their pom.xml for this component: diff --git a/docs/components/modules/ROOT/pages/atomix-messaging-component.adoc b/docs/components/modules/ROOT/pages/atomix-messaging-component.adoc index b4827ff..a2f11e8 100644 --- a/docs/components/modules/ROOT/pages/atomix-messaging-component.adoc +++ b/docs/components/modules/ROOT/pages/atomix-messaging-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.20* -The camel atomix-messaging component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/cluster-communication/direct-messaging[Group Messaging]. +The camel Atomix-Messaging component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/cluster-communication/direct-messaging[Group Messaging]. Maven users will need to add the following dependency to their pom.xml for this component: diff --git a/docs/components/modules/ROOT/pages/atomix-multimap-component.adoc b/docs/components/modules/ROOT/pages/atomix-multimap-component.adoc index 02be5da..7c97c8b 100644 --- a/docs/components/modules/ROOT/pages/atomix-multimap-component.adoc +++ b/docs/components/modules/ROOT/pages/atomix-multimap-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.20* -The camel atomix-multimap component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedMultimap/[Distributed MultiMap] collection. +The camel Atomix-Multimap component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedMultimap/[Distributed MultiMap] collection. Maven users will need to add the following dependency to their pom.xml for this component: diff --git a/docs/components/modules/ROOT/pages/atomix-queue-component.adoc b/docs/components/modules/ROOT/pages/atomix-queue-component.adoc index 1c96a53..4933997 100644 --- a/docs/components/modules/ROOT/pages/atomix-queue-component.adoc +++ b/docs/components/modules/ROOT/pages/atomix-queue-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.20* -The camel atomix-queue component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedQueue/[Distributed Queue] collection. +The camel Atomix-Queue component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedQueue/[Distributed Queue] collection. Maven users will need to add the following dependency to their pom.xml for this component: diff --git a/docs/components/modules/ROOT/pages/atomix-set-component.adoc b/docs/components/modules/ROOT/pages/atomix-set-component.adoc index b217646..f8199ab 100644 --- a/docs/components/modules/ROOT/pages/atomix-set-component.adoc +++ b/docs/components/modules/ROOT/pages/atomix-set-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.20* -The camel atomix-set component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedSet/[Distributed Set] collection. +The camel Atomix-Set component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedSet/[Distributed Set] collection. Maven users will need to add the following dependency to their pom.xml for this component: diff --git a/docs/components/modules/ROOT/pages/atomix-value-component.adoc b/docs/components/modules/ROOT/pages/atomix-value-component.adoc index 587db17..c5c5e75 100644 --- a/docs/components/modules/ROOT/pages/atomix-value-component.adoc +++ b/docs/components/modules/ROOT/pages/atomix-value-component.adoc @@ -3,7 +3,7 @@ *Available as of Camel version 2.20* -The camel atomix-value component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedValue/[Distributed Value]. +The camel Atomix-Value component allows you to work with http://atomix.io[Atomix's] https://atomix.io/docs/latest/user-manual/primitives/DistributedValue/[Distributed Value]. Maven users will need to add the following dependency to their pom.xml for this component: diff --git a/docs/components/modules/ROOT/pages/aws-cw-component.adoc b/docs/components/modules/ROOT/pages/aws-cw-component.adoc index 6776d39..2fd2a3f 100644 --- a/docs/components/modules/ROOT/pages/aws-cw-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-cw-component.adoc @@ -157,11 +157,11 @@ the https://aws.amazon.com/cloudwatch/[Amazon's CloudWatch]. |`CamelAwsCwMetricTimestamp` |`Date` |The Amazon CW metric timestamp. -|`CamelAwsCwMetricDimensionName` |`String` |*Camel 2.12:* The Amazon CW metric dimension name. +|`CamelAwsCwMetricDimensionName` |`String` |The Amazon CW metric dimension name. -|`CamelAwsCwMetricDimensionValue` |`String` |*Camel 2.12:* The Amazon CW metric dimension value. +|`CamelAwsCwMetricDimensionValue` |`String` |The Amazon CW metric dimension value. -|`CamelAwsCwMetricDimensions` |`Map<String, String>` |*Camel 2.12:* A map of dimension names and dimension values. +|`CamelAwsCwMetricDimensions` |`Map<String, String>` |A map of dimension names and dimension values. |======================================================================= #### Advanced AmazonCloudWatch configuration @@ -195,7 +195,7 @@ registry.bind("client", client); ### Automatic detection of AmazonCloudWatch client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonCloudWatch bean into the registry. +The component is capable of detecting the presence of an AmazonCloudWatch bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -214,8 +214,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version`} must be replaced by the actual version of Camel -(2.10 or higher). +where `${camel-version`} must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-ddb-component.adoc b/docs/components/modules/ROOT/pages/aws-ddb-component.adoc index 497745a..143a145 100644 --- a/docs/components/modules/ROOT/pages/aws-ddb-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ddb-component.adoc @@ -152,8 +152,7 @@ the https://aws.amazon.com/dynamodb[Amazon's DynamoDB]. |`CamelAwsDdbTableName` |`String` |Table Name for this operation. -|`CamelAwsDdbKey` |`Key` |The primary key that uniquely identifies each item in a table. *From Camel 2.16.0 the type of this header is Map<String, -AttributeValue> and not Key* +|`CamelAwsDdbKey` |`Key` |The primary key that uniquely identifies each item in a table. |`CamelAwsDdbReturnValues` |`String` |Use this parameter if you want to get the attribute name-value pairs before or after they are modified(NONE, ALL_OLD, UPDATED_OLD, ALL_NEW, @@ -174,21 +173,20 @@ values that define the item. |`CamelAwsDdbExactCount` |`Boolean` |If set to true, Amazon DynamoDB returns a total number of items that match the query parameters, instead of a list of the matching items and -their attributes. *From Camel 2.16.0 this header doesn't exist anymore.* +their attributes. -|`CamelAwsDdbKeyConditions` |`Map<String, Condition>` |*From Camel 2.16.0*. This header specify the selection criteria for the +|`CamelAwsDdbKeyConditions` |`Map<String, Condition>` |This header specify the selection criteria for the query, and merge together the two old headers *CamelAwsDdbHashKeyValue* and *CamelAwsDdbScanRangeKeyCondition* |`CamelAwsDdbStartKey` |`Key` |Primary key of the item from which to continue an earlier query. |`CamelAwsDdbHashKeyValue` |`AttributeValue` |Value of the hash component of the composite primary key. -*From Camel 2.16.0 this header doesn't exist anymore.* |`CamelAwsDdbLimit` |`Integer` |The maximum number of items to return. |`CamelAwsDdbScanRangeKeyCondition` |`Condition` |A container for the attribute values and comparison operators to use for -the query.*From Camel 2.16.0 this header doesn't exist anymore.* +the query. |`CamelAwsDdbScanIndexForward` |`Boolean` |Specifies forward or backward traversal of the index. @@ -255,8 +253,7 @@ processed with the current response. |`CamelAwsDdbTableItemCount` |`Long` |Item count for this table. |`CamelAwsDdbKeySchema` |{{KeySchema}} |The KeySchema that identifies the primary key for this table. -*From Camel 2.16.0 the type of this header is List<KeySchemaElement> and -not KeySchema* + |`CamelAwsDdbTableName` |`String` |The table name. @@ -366,7 +363,7 @@ registry.bind("client", client); ### Automatic detection of AmazonDynamoDB client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonDynamoDB bean into the registry. +The component is capable of detecting the presence of an AmazonDynamoDB bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -385,8 +382,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.10 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc index e514ec0..10fa9df 100644 --- a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc @@ -221,7 +221,7 @@ missed change events no matter what mitigations are in place. ### Automatic detection of AmazonDynamoDBStreams client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonDynamoDBStreams bean into the registry. +The component is capable of detecting the presence of an AmazonDynamoDBStreams bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -240,8 +240,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.7 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-ec2-component.adoc b/docs/components/modules/ROOT/pages/aws-ec2-component.adoc index 35dab5e..2467a75 100644 --- a/docs/components/modules/ROOT/pages/aws-ec2-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ec2-component.adoc @@ -161,7 +161,7 @@ terminate operations on. ### Automatic detection of AmazonEC2 client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonEC2 bean into the registry. +The component is capable of detecting the presence of an AmazonEC2 bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -180,8 +180,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.16 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-ecs-component.adoc b/docs/components/modules/ROOT/pages/aws-ecs-component.adoc index e61be1b..cb22f9d 100644 --- a/docs/components/modules/ROOT/pages/aws-ecs-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ecs-component.adoc @@ -155,7 +155,7 @@ Camel-AWS ECS component provides the following operation on the producer side: ### Automatic detection of AmazonECS client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonECS bean into the registry. +The component is capable of detecting the presence of an AmazonECS bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -174,8 +174,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(3.0.0 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-eks-component.adoc b/docs/components/modules/ROOT/pages/aws-eks-component.adoc index 40c4028..fec2aff 100644 --- a/docs/components/modules/ROOT/pages/aws-eks-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-eks-component.adoc @@ -161,7 +161,7 @@ Camel-AWS EKS component provides the following operation on the producer side: ### Automatic detection of AmazonEKS client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonEKS bean into the registry. +The component is capable of detecting the presence of an AmazonEKS bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -180,8 +180,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(3.0.0 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-iam-component.adoc b/docs/components/modules/ROOT/pages/aws-iam-component.adoc index 5d94fc9..172b5d8 100644 --- a/docs/components/modules/ROOT/pages/aws-iam-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-iam-component.adoc @@ -170,7 +170,7 @@ Camel-AWS IAM component provides the following operation on the producer side: ### Automatic detection of AmazonIdentityManagement client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonIdentityManagement bean into the registry. +The component is capable of detecting the presence of an AmazonIdentityManagement bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -189,8 +189,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.16 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc index 6edba8f..429e35a 100644 --- a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc @@ -250,7 +250,7 @@ http://docs.aws.amazon.com/kinesis/latest/APIReference/API_PutRecord.html#API_Pu ### Automatic detection of AmazonKinesis client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonKinesis bean into the registry. +The component is capable of detecting the presence of an AmazonKinesis bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -269,8 +269,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.17 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc b/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc index 5f57f12..62009a4 100644 --- a/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc @@ -186,7 +186,7 @@ http://docs.aws.amazon.com/firehose/latest/APIReference/API_PutRecord.html#API_P ### Automatic detection of AmazonKinesisFirehose client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonKinesisFirehose bean into the registry. +The component is capable of detecting the presence of an AmazonKinesisFirehose bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -205,8 +205,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.19 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-kms-component.adoc b/docs/components/modules/ROOT/pages/aws-kms-component.adoc index 41ba9a2..1ccef2e 100644 --- a/docs/components/modules/ROOT/pages/aws-kms-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-kms-component.adoc @@ -159,7 +159,7 @@ Camel-AWS KMS component provides the following operation on the producer side: ### Automatic detection of AWSKMS client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AWSKMS bean into the registry. +The component is capable of detecting the presence of an AWSKMS bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -178,8 +178,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.16 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-lambda-component.adoc b/docs/components/modules/ROOT/pages/aws-lambda-component.adoc index 72d57a6..09aafb3 100644 --- a/docs/components/modules/ROOT/pages/aws-lambda-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-lambda-component.adoc @@ -220,7 +220,7 @@ To have a full understanding of how the component works, you may have a look at ### Automatic detection of AmazonLambda client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonLambda bean into the registry. +The component is capable of detecting the presence of an AmazonLambda bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -240,8 +240,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.16 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-mq-component.adoc b/docs/components/modules/ROOT/pages/aws-mq-component.adoc index 934503c..20d82b9 100644 --- a/docs/components/modules/ROOT/pages/aws-mq-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-mq-component.adoc @@ -160,7 +160,7 @@ the https://aws.amazon.com/mq/[Amazon MQ] service. ### Automatic detection of AmazonMQ client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonMQ bean into the registry. +The component is capable of detecting the presence of an AmazonMQ bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -179,8 +179,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.16 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-msk-component.adoc b/docs/components/modules/ROOT/pages/aws-msk-component.adoc index 41fcb7a..57303fc 100644 --- a/docs/components/modules/ROOT/pages/aws-msk-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-msk-component.adoc @@ -163,7 +163,7 @@ Camel-AWS KMS component provides the following operation on the producer side: ### Automatic detection of AWSKafka client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AWSKafka bean into the registry. +The component is capable of detecting the presence of an AWSKafka bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -182,8 +182,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.16 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc b/docs/components/modules/ROOT/pages/aws-s3-component.adoc index dc540dd..f32b267 100644 --- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc @@ -239,40 +239,40 @@ aggregate this number of messages. |`CamelAwsS3BucketName` |`String` |The bucket Name which this object will be stored or which will be used for the current operation -|`CamelAwsS3BucketDestinationName` |`String` |*Camel 2.18*: The bucket Destination Name which will be used for the current operation +|`CamelAwsS3BucketDestinationName` |`String` |The bucket Destination Name which will be used for the current operation |`CamelAwsS3ContentLength` |`Long` |The content length of this object. |`CamelAwsS3ContentType` |`String` |The content type of this object. -|`CamelAwsS3ContentControl` |`String` |*Camel 2.8.2:* The content control of this object. +|`CamelAwsS3ContentControl` |`String` |The content control of this object. -|`CamelAwsS3ContentDisposition` |`String` |*Camel 2.8.2:* The content disposition of this object. +|`CamelAwsS3ContentDisposition` |`String` |The content disposition of this object. -|`CamelAwsS3ContentEncoding` |`String` |*Camel 2.8.2:* The content encoding of this object. +|`CamelAwsS3ContentEncoding` |`String` |The content encoding of this object. -|`CamelAwsS3ContentMD5` |`String` |*Camel 2.8.2:* The md5 checksum of this object. +|`CamelAwsS3ContentMD5` |`String` |The md5 checksum of this object. -|`CamelAwsS3DestinationKey` |`String` |*Camel 2.18*:The Destination key which will be used for the current operation +|`CamelAwsS3DestinationKey` |`String` |The Destination key which will be used for the current operation |`CamelAwsS3Key` |`String` |The key under which this object will be stored or which will be used for the current operation -|`CamelAwsS3LastModified` |`java.util.Date` |*Camel 2.8.2:* The last modified timestamp of this object. +|`CamelAwsS3LastModified` |`java.util.Date` |The last modified timestamp of this object. -|`CamelAwsS3Operation` |`String` |*Camel 2.18*: The operation to perform. Permitted values are copyObject, deleteObject, listBuckets, deleteBucket, downloadLink, listObjects +|`CamelAwsS3Operation` |`String` |The operation to perform. Permitted values are copyObject, deleteObject, listBuckets, deleteBucket, downloadLink, listObjects -|`CamelAwsS3StorageClass` |`String` |*Camel 2.8.4:* The storage class of this object. +|`CamelAwsS3StorageClass` |`String` |The storage class of this object. -|`CamelAwsS3CannedAcl` |`String` |*Camel 2.11.0:* The canned acl that will be applied to the object. see +|`CamelAwsS3CannedAcl` |`String` |The canned acl that will be applied to the object. see `com.amazonaws.services.s3.model.CannedAccessControlList` for allowed values. -|`CamelAwsS3Acl` |`com.amazonaws.services.s3.model.AccessControlList` |*Camel 2.11.0:* a well constructed Amazon S3 Access Control List object. +|`CamelAwsS3Acl` |`com.amazonaws.services.s3.model.AccessControlList` |A well constructed Amazon S3 Access Control List object. see `com.amazonaws.services.s3.model.AccessControlList` for more details -|`CamelAwsS3Headers` |`Map<String,String>` |*Camel 2.15.0*: support to get or set custom objectMetadata headers. +|`CamelAwsS3Headers` |`Map<String,String>` |Support to get or set custom objectMetadata headers. -|`CamelAwsS3ServerSideEncryption` |String |*Camel 2.16:* Sets the server-side encryption algorithm when encrypting +|`CamelAwsS3ServerSideEncryption` |String |Sets the server-side encryption algorithm when encrypting the object using AWS-managed keys. For example use AES256. |`CamelAwsS3VersionId` |`String` |The version Id of the object to be stored or returned from the current operation @@ -336,7 +336,7 @@ object to be saved as. |`CamelAwsS3ContentControl` |`String` |The *optional* Cache-Control HTTP header which allows the user to specify caching behavior along the HTTP request/reply chain. -|`CamelAwsS3ServerSideEncryption` |String |*Camel 2.16:* The server-side encryption algorithm when encrypting the +|`CamelAwsS3ServerSideEncryption` |String |The server-side encryption algorithm when encrypting the object using AWS-managed keys. |======================================================================= @@ -514,7 +514,7 @@ If set to false any operation on a not-existent bucket in AWS won't be successfu ### Automatic detection of AmazonS3 client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonS3 bean into the registry. +The component is capable of detecting the presence of an AmazonS3 bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter, like the example above. This may be really useful for smarter configuration of the endpoint. @@ -533,8 +533,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.8 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-sdb-component.adoc b/docs/components/modules/ROOT/pages/aws-sdb-component.adoc index 7079603..8535e0f 100644 --- a/docs/components/modules/ROOT/pages/aws-sdb-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-sdb-component.adoc @@ -254,8 +254,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.8.4 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-ses-component.adoc b/docs/components/modules/ROOT/pages/aws-ses-component.adoc index 14a561a..b9aceb7 100644 --- a/docs/components/modules/ROOT/pages/aws-ses-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-ses-component.adoc @@ -154,7 +154,7 @@ the https://aws.amazon.com/ses[Amazon's SES]. |`CamelAwsSesReturnPath` |`String` |The email address to which bounce notifications are to be forwarded. -|`CamelAwsSesHtmlEmail` |`Boolean` |*Since Camel 2.12.3* The flag to show if email content is HTML. +|`CamelAwsSesHtmlEmail` |`Boolean` |The flag to show if email content is HTML. |======================================================================= #### Message headers set by the SES producer @@ -200,7 +200,7 @@ Maven users will need to add the following dependency to their pom.xml. ### Automatic detection of AmazonSimpleEmailService client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonSimpleEmailService bean into the registry. +The component is capable of detecting the presence of an AmazonSimpleEmailService bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -215,8 +215,7 @@ This may be really useful for smarter configuration of the endpoint. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.8.4 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-sns-component.adoc b/docs/components/modules/ROOT/pages/aws-sns-component.adoc index b8b295e..a0711ab 100644 --- a/docs/components/modules/ROOT/pages/aws-sns-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-sns-component.adoc @@ -231,7 +231,7 @@ If set to false any operation on a not-existent topic in AWS won't be successful ### Automatic detection of AmazonSNS client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonSNS bean into the registry. +The component is capable of detecting the presence of an AmazonSNS bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -250,8 +250,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.8 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc index b9a7016..ef7843b 100644 --- a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc @@ -229,7 +229,7 @@ aggregate this number of messages. |`CamelAwsSqsMessageId` |`String` |The Amazon SQS message ID. -|`CamelAwsSqsDelaySeconds` |`Integer` |Since *Camel 2.11*, the delay seconds that the Amazon SQS message can be +|`CamelAwsSqsDelaySeconds` |`Integer` |The delay seconds that the Amazon SQS message can be see by others. |======================================================================= @@ -292,7 +292,7 @@ SQS configuration. If it's already up on AWS, the SQS configuration options will #### DelayQueue VS Delay for Single message -From 2.23.0 the component has a new option: delayQueue. When the option is set to true, the SQS Queue will be a DelayQueue with the +When the option delayQueue is set to true, the SQS Queue will be a DelayQueue with the DelaySeconds option as delay. For more information about DelayQueue you can read the https://docs.aws.amazon.com/en_us/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-delay-queues.html[AWS SQS documentation]. One important information to take into account is the following: @@ -304,7 +304,7 @@ to true, if you need to add a fixed delay to all messages enqueued. #### Server Side Encryption -From 2.24.0 we introduce the Server Side Encryption attributes for a queue. The related option are serverSideEncryptionEnabled, keyMasterKeyId and kmsDataKeyReusePeriod. +There is a set of Server Side Encryption attributes for a queue. The related option are serverSideEncryptionEnabled, keyMasterKeyId and kmsDataKeyReusePeriod. The SSE is disabled by default. You need to explicitly set the option to true and set the related parameters as queue attributes. ### Dependencies @@ -322,8 +322,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.6 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### JMS-style Selectors @@ -346,18 +345,18 @@ from("aws-sqs://MyQueue?amazonSQSClient=#client&defaultVisibilityTimeout=5000&de In the above code, if an exchange doesn't have an appropriate header, it will not make it through the filter AND also not be deleted from the SQS -queue. After 5000 miliseconds, the message will become visible to other +queue. After 5000 milliseconds, the message will become visible to other consumers. ### Available Producer Operations - single message (default) -- sendBatchMessage (from Camel 3) -- deleteMessage (from Camel 3) -- listQueues (from Camel 3) +- sendBatchMessage +- deleteMessage +- listQueues ### Send Batch Message -From Camel 3.x we introduce the sendBatchMessage operation. You can set a `SendMessageBatchRequest` or an `Iterable` +You can set a `SendMessageBatchRequest` or an `Iterable` ------------------------------------------------------------------------------------------------------ from("direct:start") @@ -369,7 +368,7 @@ The id set on each message of the batch will be a Random UUID. ### Delete single Message -From Camel 3.x we introduce the deleteMessage operation. You'll need to set a receipt handle header for the message you want to delete. +Use deleteMessage operation to delete a single message. You'll need to set a receipt handle header for the message you want to delete. ------------------------------------------------------------------------------------------------------ from("direct:start") @@ -378,11 +377,11 @@ from("direct:start") .to("aws-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)®ion=EU_WEST_1"); ------------------------------------------------------------------------------------------------------ -As result you'll get an exchange containing a `DeleteMessageResult` instance, that you can examinate to check if the message was deleted or not. +As result you'll get an exchange containing a `DeleteMessageResult` instance, that you can use to check if the message was deleted or not. ### List Queues -From Camel 3.x we introduce the listQueues operation. +Use listQueues operation to list queues. ------------------------------------------------------------------------------------------------------ from("direct:start") @@ -398,7 +397,7 @@ If set to false any operation on a not-existent queue in AWS won't be successful ### Automatic detection of AmazonSQS client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonSQS bean into the registry. +The component is capable of detecting the presence of an AmazonSQS bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. diff --git a/docs/components/modules/ROOT/pages/aws-swf-component.adoc b/docs/components/modules/ROOT/pages/aws-swf-component.adoc index 74f3e25..df1f551 100644 --- a/docs/components/modules/ROOT/pages/aws-swf-component.adoc +++ b/docs/components/modules/ROOT/pages/aws-swf-component.adoc @@ -286,7 +286,7 @@ registry.bind("client", client); ### Automatic detection of AmazonSimpleWorkflow client in registry -From Camel 3.0.0-M3 the component will be able to detect the presence of an AmazonSimpleWorkflow bean into the registry. +The component is capable of detecting the presence of an AmazonSimpleWorkflow bean into the registry. If it's the only instance of that type it will be used as client and you won't have to define it as uri parameter. This may be really useful for smarter configuration of the endpoint. @@ -305,8 +305,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version}` must be replaced by the actual version of Camel -(2.13 or higher). +where `${camel-version}` must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/azure-blob-component.adoc b/docs/components/modules/ROOT/pages/azure-blob-component.adoc index 32bc4d9..ab60961 100644 --- a/docs/components/modules/ROOT/pages/azure-blob-component.adoc +++ b/docs/components/modules/ROOT/pages/azure-blob-component.adoc @@ -270,8 +270,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version`} must be replaced by the actual version of Camel -(2.19.0 or higher). +where `${camel-version`} must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/azure-queue-component.adoc b/docs/components/modules/ROOT/pages/azure-queue-component.adoc index a5189df..331a2ec 100644 --- a/docs/components/modules/ROOT/pages/azure-queue-component.adoc +++ b/docs/components/modules/ROOT/pages/azure-queue-component.adoc @@ -199,8 +199,7 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `${camel-version`} must be replaced by the actual version of Camel -(2.19.0 or higher). +where `${camel-version`} must be replaced by the actual version of Camel. ### See Also diff --git a/docs/components/modules/ROOT/pages/azure.adoc b/docs/components/modules/ROOT/pages/azure.adoc index 0961eb7..584aa55 100644 --- a/docs/components/modules/ROOT/pages/azure.adoc +++ b/docs/components/modules/ROOT/pages/azure.adoc @@ -5,10 +5,10 @@ The Camel Components for https://azure.microsoft.com/[Windows Azure Services] provide connectivity to Azure services from Camel. -[width="100%",cols="30%,10%,10%,50%",options="header",] +[width="100%",cols="30%,10%,50%",options="header",] |======================================================================= -|Azure Service |Camel Component |Camel Version | Component Description +|Azure Service |Camel Component |Component Description -|https://azure.microsoft.com/services/storage/blobs[Storage Blob Service] |<<azure-blob-component,Azure-Blob>> |2.9.0 |Supports storing and retrieving of blobs -|https://azure.microsoft.com/services/storage/queues[Storage Queue Service] |<<azure-queue-component,Azure-Queue>> |2.9.0 |Supports storing and retrieving of messages in the queues +|https://azure.microsoft.com/services/storage/blobs[Storage Blob Service] |<<azure-blob-component,Azure-Blob>> |Supports storing and retrieving of blobs +|https://azure.microsoft.com/services/storage/queues[Storage Queue Service] |<<azure-queue-component,Azure-Queue>> |Supports storing and retrieving of messages in the queues |======================================================================= diff --git a/docs/components/modules/ROOT/pages/zookeeper-component.adoc b/docs/components/modules/ROOT/pages/zookeeper-component.adoc index 1351b68..92720fb 100644 --- a/docs/components/modules/ROOT/pages/zookeeper-component.adoc +++ b/docs/components/modules/ROOT/pages/zookeeper-component.adoc @@ -12,9 +12,6 @@ following features to Camel: being set must be convertible to `byte[]`). 3. Create and retrieve the list the child nodes attached to a particular node. -4. A Distributed `RoutePolicy` that leverages a -Leader election coordinated by ZooKeeper to determine if exchanges -should get processed. Maven users will need to add the following dependency to their `pom.xml` for this component: @@ -306,67 +303,3 @@ Object testPayload = ... template.sendBodyAndHeader("direct:create-and-write-to-persistent-znode", testPayload, "CamelZooKeeperCreateMode", "PERSISTENT"); ---- -### ZooKeeper enabled Route policies - -ZooKeeper allows for very simple and effective leader election out of -the box. This component exploits this election capability in a -`RoutePolicy` to control when and how routes are -enabled. This policy would typically be used in fail-over scenarios, to -control identical instances of a route across a cluster of Camel based -servers. A very common scenario is a simple 'Master-Slave' setup where -there are multiple instances of a route distributed across a cluster but -only one of them, that of the master, should be running at a time. If -the master fails, a new master should be elected from the available -slaves and the route in this new master should be started. - -The policy uses a common _znode_ path across all instances of the -`RoutePolicy` that will be involved in the election. Each policy writes -its id into this node and Zookeeper will order the writes in the order -it received them. The policy then reads the listing of the node to see -what position of its id; this position is used to determine if the route -should be started or not. The policy is configured at startup with the -number of route instances that should be started across the cluster and -if its position in the list is less than this value then its route will -be started. For a Master-slave scenario, the route is configured with 1 -route instance and only the first entry in the listing will start its -route. All policies watch for updates to the listing and if the listing -changes they recalculate if their route should be started. For more info -on Zookeeper's leader election capability see -http://zookeeper.apache.org/doc/trunk/recipes.html#sc_leaderElection[this -page]. - -The following example uses the node `/someapplication/somepolicy` for -the election and is set up to start only the top '1' entries in the node -listing i.e. elect a master: - -[source,java] ----- -ZooKeeperRoutePolicy policy = new ZooKeeperRoutePolicy("zookeeper:localhost:39913/someapp/somepolicy", 1); -from("direct:policy-controlled") - .routePolicy(policy) - .to("mock:controlled"); ----- - -There are currently 3 policies defined in the component, with different SLAs: - -* `ZooKeeperRoutePolicy` -* `CuratorLeaderRoutePolicy` (since *2.19*) -* `MultiMasterCuratorLeaderRoutePolicy` (since *2.19*) - -*ZooKeeperRoutePolicy* supports multiple active nodes, but it's activation kicks in only after a Camel component and its correspondent Consumer have already been started, - this introduces, depending on your routes definition, the risk that you component can already start consuming events and producing `Exchange`s, before the policy could estabilish - that the node should not be activated. - -*CuratorLeaderRoutePolicy* supports only a single active node, but it's bound to a different `CamelContext` lifecycle method; this Policy kicks in before any route or consumer is started - thus you can be sure that no even is processed before the Policy takes its decision. - -*MultiMasterCuratorLeaderRoutePolicy* support multiple active nodes, and it's bound to the same lifecycle method as `CuratorLeaderRoutePolicy`; this Policy kicks in before any route or consumer is started - thus you can be sure that no even is processed before the Policy takes its decision. - - -### See Also - -* Configuring Camel -* Component -* Endpoint -* Getting Started