You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/06/09 12:19:55 UTC
[6/8] camel git commit: Added missing placeholder for options in
asciidoc files
Added missing placeholder for options in asciidoc files
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f4b66541
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f4b66541
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f4b66541
Branch: refs/heads/master
Commit: f4b66541376c1314d710dc0d25e7b453fec9efe4
Parents: b668016
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jun 9 14:11:36 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jun 9 14:11:36 2016 +0200
----------------------------------------------------------------------
.../camel-ahc-ws/src/main/docs/ahc-ws.adoc | 6 +
components/camel-amqp/src/main/docs/amqp.adoc | 6 +
components/camel-apns/src/main/docs/apns.adoc | 33 +--
.../src/main/docs/atmosphere-websocket.adoc | 10 +
components/camel-atom/src/main/docs/atom.adoc | 45 +---
components/camel-avro/src/main/docs/avro.adoc | 19 +-
.../camel-base64/src/main/docs/base64.adoc | 15 +-
.../src/main/docs/bean-validator.adoc | 21 +-
.../camel-beanio/src/main/docs/beanio.adoc | 22 +-
.../src/main/docs/beanstalk.adoc | 61 +----
components/camel-box/src/main/docs/box.adoc | 54 +++++
.../src/main/docs/braintree.adoc | 48 ++++
components/camel-cache/src/main/docs/cache.adoc | 78 +------
.../src/main/docs/cassandra.adoc | 213 -----------------
.../camel-cassandraql/src/main/docs/cql.adoc | 233 +++++++++++++++++++
.../camel-castor/src/main/docs/castor.adoc | 19 +-
components/camel-chunk/src/main/docs/chunk.adoc | 18 +-
components/camel-cmis/src/main/docs/cmis.adoc | 32 +--
18 files changed, 406 insertions(+), 527 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-ahc-ws/src/main/docs/ahc-ws.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws.adoc b/components/camel-ahc-ws/src/main/docs/ahc-ws.adoc
index 0476bfb..326abaf 100644
--- a/components/camel-ahc-ws/src/main/docs/ahc-ws.adoc
+++ b/components/camel-ahc-ws/src/main/docs/ahc-ws.adoc
@@ -44,6 +44,12 @@ AHC-WS Options
As the AHC-WS component is based on the AHC component, you can use the
various configuration options of the AHC component.
+// component options: START
+// component options: END
+
+// endpoint options: START
+// endpoint options: END
+
[[AHC-WS-WritingandReadingDataoverWebsocket]]
Writing and Reading Data over Websocket
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-amqp/src/main/docs/amqp.adoc
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/docs/amqp.adoc b/components/camel-amqp/src/main/docs/amqp.adoc
index 1b84680..aa21287 100644
--- a/components/camel-amqp/src/main/docs/amqp.adoc
+++ b/components/camel-amqp/src/main/docs/amqp.adoc
@@ -38,6 +38,12 @@ AMQP Options
You can specify all of the various configuration options of the
link:../../../../camel-jms/src/main/docs/readme.html[JMS] component after the destination name.
+// component options: START
+// component options: END
+
+// endpoint options: START
+// endpoint options: END
+
[[AMQP-Usage]]
Usage
^^^^^
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-apns/src/main/docs/apns.adoc
----------------------------------------------------------------------
diff --git a/components/camel-apns/src/main/docs/apns.adoc b/components/camel-apns/src/main/docs/apns.adoc
index ada0bae..b460d7e 100644
--- a/components/camel-apns/src/main/docs/apns.adoc
+++ b/components/camel-apns/src/main/docs/apns.adoc
@@ -54,36 +54,11 @@ apns:consumer[?options]
Options
^^^^^^^
-[[APNS-Producer]]
-Producer
-++++++++
+// component options: START
+// component options: END
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Property |Default |Description
-|`tokens` | |Empty by default. Configure this property in case you want to statically
-declare tokens related to devices you want to notify. Tokens are
-separated by comma.
-|=======================================================================
-
-[[APNS-Consumer]]
-Consumer
-++++++++
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Property |Default |Description
-|`delay` |`3600` |Delay in seconds between each poll.
-
-|`initialDelay` |`10` |Seconds before polling starts.
-
-|`timeUnit` |`SECONDS` |Time Unit for polling.
-
-|`userFixedDelay` |`true` |If `true`, use fixed delay between pools, otherwise fixed rate is used.
-See
-http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/ScheduledExecutorService.html[ScheduledExecutorService]
-in JDK for details.
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
You can append query options to the URI in the following format,
`?option=value&option=value&...`
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc
index f0e7c33..6c4b111 100644
--- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc
+++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket.adoc
@@ -31,6 +31,16 @@ their�`pom.xml`�for this component:
</dependency>
------------------------------------------------------------
+[[Atmosphere-Websocket-Options]]
+Atmosphere-Websocket Options
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+// component options: START
+// component options: END
+
+// endpoint options: START
+// endpoint options: END
+
[[Atmosphere-Websocket-URIFormat]]
URI Format
^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-atom/src/main/docs/atom.adoc
----------------------------------------------------------------------
diff --git a/components/camel-atom/src/main/docs/atom.adoc b/components/camel-atom/src/main/docs/atom.adoc
index 26f7cf7..7c50308 100644
--- a/components/camel-atom/src/main/docs/atom.adoc
+++ b/components/camel-atom/src/main/docs/atom.adoc
@@ -36,48 +36,11 @@ Where *atomUri* is the URI to the Atom feed to poll.
Options
^^^^^^^
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Property |Default |Description
-|`splitEntries` |`true` |If `true` Camel will poll the feed and for the subsequent polls return
-each entry poll by poll. If the feed contains 7 entries then Camel will
-return the first entry on the first poll, the 2nd entry on the next
-poll, until no more entries where as Camel will do a new update on the
-feed. If `false` then Camel will poll a fresh feed on every invocation.
-
-|`filter` |`true` |Is only used by the split entries to filter the entries to return. Camel
-will default use the `UpdateDateFilter` that only return new entries
-from the feed. So the client consuming from the feed never receives the
-same entry more than once. The filter will return the entries ordered by
-the newest last.
-
-|`lastUpdate` |`null` |Is only used by the filter, as the starting timestamp for selection
-never entries (uses the `entry.updated` timestamp). Syntax format is:
-`yyyy-MM-ddTHH:MM:ss`. Example: `2007-12-24T17:45:59`.
-
-|`throttleEntries` |`true` |*Camel 2.5:* Sets whether all entries identified in a single feed poll
-should be delivered immediately. If `true`, only one entry is processed
-per `consumer.delay`. Only applicable when `splitEntries` is set to
-`true`.
-
-|`feedHeader` |`true` |Sets whether to add the Abdera Feed object as a header.
+// component options: START
+// component options: END
-|`sortEntries` |`false` |If `splitEntries` is `true`, this sets whether to sort those entries by
-updated date.
-
-|`consumer.delay` |`500` |Delay in millis between each poll.
-
-|`consumer.initialDelay` |`1000` |Millis before polling starts.
-
-|`consumer.userFixedDelay` |`false` |If `true`, use fixed delay between pools, otherwise fixed rate is used.
-See
-http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/ScheduledExecutorService.html[ScheduledExecutorService]
-in JDK for details.
-
-|`username` | | *Camel 2.16:* For basic authentication when polling from a HTTP feed
-
-|`password` | | *Camel 2.16:* For basic authentication when polling from a HTTP feed
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
You can append query options to the URI in the following format,
`?option=value&option=value&...`
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-avro/src/main/docs/avro.adoc
----------------------------------------------------------------------
diff --git a/components/camel-avro/src/main/docs/avro.adoc b/components/camel-avro/src/main/docs/avro.adoc
index 2bd0f77..540e4cf 100644
--- a/components/camel-avro/src/main/docs/avro.adoc
+++ b/components/camel-avro/src/main/docs/avro.adoc
@@ -176,22 +176,11 @@ wrapping.
Avro RPC URI Options
^^^^^^^^^^^^^^^^^^^^
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Version |Description
-|`protocolClassName`| | The class name of the avro protocol.
-
-|`singleParameter` |2.12 |If true, consumer parameter won't be wrapped into array. Will fail if
-protocol specifies more then 1 parameter for the message
+// component options: START
+// component options: END
-|`protocol` | | Avro protocol object. Can be used instead of `protocolClassName` when
-complex protocol needs to be created. One cane used #name notation to
-refer beans from the Registry
-
-|`reflectionProtocol` |2.12 |If protocol object provided is reflection protocol. Should be used only
-with `protocol` parameter because for `protocolClassName` protocol type
-will be autodetected
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
[[avro-AvroRPCHeaders]]
Avro RPC Headers
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-base64/src/main/docs/base64.adoc
----------------------------------------------------------------------
diff --git a/components/camel-base64/src/main/docs/base64.adoc b/components/camel-base64/src/main/docs/base64.adoc
index 4931808..dec53c5 100644
--- a/components/camel-base64/src/main/docs/base64.adoc
+++ b/components/camel-base64/src/main/docs/base64.adoc
@@ -10,18 +10,11 @@ http://en.wikipedia.org/wiki/Base64[base64 encoding and decoding].
Options
^^^^^^^
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Option |Default |Description
+// component options: START
+// component options: END
-|lineLength |76 |To specific a maximum line length for the encoded data.
-
-|lineSeparator |\r\n |The line separators to use.
-
-|urlSafe |`false` |Instead of emitting '+' and '/' we emit '-' and '_' respectively.
-urlSafe is only applied to encode operations. Decoding seamlessly
-handles both modes.
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
In Spring DSL, you configure the data format using this tag:
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-bean-validator/src/main/docs/bean-validator.adoc
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/src/main/docs/bean-validator.adoc b/components/camel-bean-validator/src/main/docs/bean-validator.adoc
index bd19b79..9d8c515 100644
--- a/components/camel-bean-validator/src/main/docs/bean-validator.adoc
+++ b/components/camel-bean-validator/src/main/docs/bean-validator.adoc
@@ -47,25 +47,12 @@ Where *label* is an arbitrary text value describing the endpoint. +
[[BeanValidator-URIOptions]]
URI Options
^^^^^^^^^^^
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Option |Default |Description
-|`group` |`javax.validation.groups.Default` |The custom validation group to use.
+// component options: START
+// component options: END
-|`validationProviderResolver` |Depends on JSR303 jar provided. |Camel *2.13.0*: Reference to a custom
-`javax.validation.ValidationProviderResolver` in the
-link:registry.html[Registry].
-
-|`messageInterpolator` |`org.hibernate.validator.engine.ResourceBundleMessageInterpolator` |Reference to a custom `javax.validation.MessageInterpolator` in the
-link:registry.html[Registry].
-
-|`traversableResolver` |`org.hibernate.validator.engine.resolver.DefaultTraversableResolver` |Reference to a custom `javax.validation.TraversableResolver` in the
-link:registry.html[Registry].
-
-|`constraintValidatorFactory` |`org.hibernate.validator.engine.ConstraintValidatorFactoryImpl` |Reference to a custom `javax.validation.ConstraintValidatorFactory` in
-the link:registry.html[Registry].
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
[[BeanValidator-OSGideployment]]
OSGi deployment
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-beanio/src/main/docs/beanio.adoc
----------------------------------------------------------------------
diff --git a/components/camel-beanio/src/main/docs/beanio.adoc b/components/camel-beanio/src/main/docs/beanio.adoc
index 6d5b4a1..93f45d7 100644
--- a/components/camel-beanio/src/main/docs/beanio.adoc
+++ b/components/camel-beanio/src/main/docs/beanio.adoc
@@ -16,26 +16,12 @@ XML] file where you define the mapping from the flat format to Objects
[[BeanIO-Options]]
Options
^^^^^^^
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Option |Default |Description
-|mapping | | The BeanIO mapping file. The option is mandatory. Is by default loaded
-from the classpath. You can prefix with `file:`, `http:`, or
-`classpath:` to denote from where to load the mapping file.
+// component options: START
+// component options: END
-|streamName | |The name of the stream to use. This option is mandatory.
-
-|ignoreUnidentifiedRecords |`false` |Whether to ignore unidentified records.
-
-|ignoreUnexpectedRecords |`false` |Whether to ignore unexpected records.
-
-|ignoreInvalidRecords |`false` |Whether to ignore invalid records.
-
-|encoding |Platform default |The charset to use.
-
-|beanReaderErrorHandler | |A custom BeanReaderErrorHandler implementation to use in your dataformat definition
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
[[BeanIO-Usage]]
Usage
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-beanstalk/src/main/docs/beanstalk.adoc
----------------------------------------------------------------------
diff --git a/components/camel-beanstalk/src/main/docs/beanstalk.adoc b/components/camel-beanstalk/src/main/docs/beanstalk.adoc
index a1df59b..8f6b2c3 100644
--- a/components/camel-beanstalk/src/main/docs/beanstalk.adoc
+++ b/components/camel-beanstalk/src/main/docs/beanstalk.adoc
@@ -58,54 +58,19 @@ details here].
By the way, you cannot specify several tubes when you are writing jobs
into Beanstalk.
-[[Beanstalk-CommonURIoptions]]
-Common URI options
-^^^^^^^^^^^^^^^^^^
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Default value |Description
-
-|jobPriority |1000 |Job priority. (0 is the highest,
-see�http://github.com/kr/beanstalkd/blob/v1.3/doc/protocol.txt[Beanstalk
-protocol])
-
-|jobDelay |0 |Job delay in seconds.
-
-|jobTimeToRun |60 |Job time to run in seconds. (when 0, the beanstalkd daemon raises it to
-1 automatically,
-see�http://github.com/kr/beanstalkd/blob/v1.3/doc/protocol.txt[Beanstalk
-protocol])
+[[Beanstalk-options]]
+Beanstalk options
+^^^^^^^^^^^^^^^^^
-|=======================================================================
-�
+// component options: START
+// component options: END
-[[Beanstalk-ProducerUIRoptions]]
-Producer URI options
-^^^^^^^^^^^^^^^^^^^^
+// endpoint options: START
+// endpoint options: END
Producer�behavior�is affected by the�`command`�parameter which tells
what to do with the job, it can be
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Default value |Description
-
-|command |put |* `put`�means to put the job into Beanstalk. Job body is specified in
-the Camel message body. Job ID will be returned
-in�_beanstalk.jobId_�message header.
-* `delete`,�`release`,�`touch`�or�`bury`�expect Job ID in the message
-header�_beanstalk.jobId_. Result of the operation is returned
-in�_beanstalk.result_�message header
-* `kick`�expects the number of jobs to kick in the message body and
-returns the number of jobs actually kicked out in the message
-header�_beanstalk.result_.
-|=======================================================================
-�
-
-[[Beanstalk-ConsumerUIRoptions]]
-Consumer UIR options
-^^^^^^^^^^^^^^^^^^^^
-
The consumer may delete the job immediately after reserving it or wait
until Camel routes process it. While the first scenario is more like a
\u201cmessage queue\u201d, the second is similar to \u201cjob queue\u201d. This behavior is
@@ -126,18 +91,6 @@ Be careful when specifying�`release`, as the failed job will immediately
become available in the same tube and your consumer will try to acquire
it again. You can�`release`�and specify�_jobDelay_�though.
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Default value |Description
-
-|onFailure |bury |Command to use when processing failed. You can choose among: bury,
-delete or release.
-
-|useBlockIO |true |Whether to use blockIO.
-
-|awaitJob |true |Whether to wait for job to complete before ack the job from beanstalk
-|=======================================================================
-
The beanstalk consumer is a�Scheduled�link:polling-consumer.html[Polling
Consumer] which means there is more options you can configure, such as
how frequent the consumer should poll. For more details
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-box/src/main/docs/box.adoc
----------------------------------------------------------------------
diff --git a/components/camel-box/src/main/docs/box.adoc b/components/camel-box/src/main/docs/box.adoc
index 5414704..dc28888 100644
--- a/components/camel-box/src/main/docs/box.adoc
+++ b/components/camel-box/src/main/docs/box.adoc
@@ -33,6 +33,60 @@ for this component:
</dependency>
-------------------------------------------
+[[Box-Options]]
+Box Options
+^^^^^^^^^^^
+
+
+// component options: START
+The Box component supports 1 options which are listed below.
+
+
+
+{% raw %}
+[width="100%",cols="2s,1m,8",options="header"]
+|=======================================================================
+| Name | Java Type | Description
+| configuration | BoxConfiguration | To use the shared configuration
+|=======================================================================
+{% endraw %}
+// component options: END
+
+
+
+// endpoint options: START
+The Box component supports 21 endpoint options which are listed below:
+
+{% raw %}
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|=======================================================================
+| Name | Group | Default | Java Type | Description
+| apiName | common | | BoxApiName | *Required* What kind of operation to perform
+| methodName | common | | String | *Required* What sub operation to use for the selected operation
+| clientId | common | | String | Box application client ID
+| clientSecret | common | | String | Box application client secret
+| inBody | common | | String | Sets the name of a parameter to be passed in the exchange In Body
+| loginTimeout | common | 30 | int | Amount of time the component will wait for a response from Box.com default is 30 seconds
+| revokeOnShutdown | common | false | boolean | Flag to revoke OAuth refresh token on route shutdown default false. Will require a fresh refresh token on restart using either a custom IAuthSecureStorage or automatic component login by providing a user password
+| sharedLink | common | | String | Box shared link for shared endpoints can be a link for a shared comment file or folder
+| sharedPassword | common | | String | Password associated with the shared link MUST be provided with sharedLink
+| 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.
+| 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/ERROR level and ignored.
+| boxConfig | advanced | | IBoxConfig | Custom Box SDK configuration not required normally
+| connectionManagerBuilder | advanced | | BoxConnectionManagerBuilder | Custom Box connection manager builder used to override default settings like max connections for underlying HttpClient.
+| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
+| httpParams | advanced | | Map | Custom HTTP params for settings like proxy host
+| refreshListener | advanced | | OAuthRefreshListener | OAuth listener for token updates if the Camel application needs to use the access token outside the route
+| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
+| authSecureStorage | security | | IAuthSecureStorage | OAuth Secure Storage callback can be used to provide and or save OAuth tokens. The callback may return null on first call to allow the component to login and authorize application and obtain an OAuth token which can then be saved in the secure storage. For the component to be able to create a token automatically a user password must be provided.
+| sslContextParameters | security | | SSLContextParameters | To configure security using SSLContextParameters.
+| userName | security | | String | Box user name MUST be provided
+| userPassword | security | | String | Box user password MUST be provided if authSecureStorage is not set or returns null on first call
+|=======================================================================
+{% endraw %}
+// endpoint options: END
+
+
[[Box-URIformat]]
URI format
^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-braintree/src/main/docs/braintree.adoc
----------------------------------------------------------------------
diff --git a/components/camel-braintree/src/main/docs/braintree.adoc b/components/camel-braintree/src/main/docs/braintree.adoc
index ee8f2ea..3d5e435 100644
--- a/components/camel-braintree/src/main/docs/braintree.adoc
+++ b/components/camel-braintree/src/main/docs/braintree.adoc
@@ -31,6 +31,54 @@ for this component:
�
+[[Braintree-Options]]
+Braintree Options
+^^^^^^^^^^^^^^^^^
+
+
+// component options: START
+The Braintree component supports 1 options which are listed below.
+
+
+
+{% raw %}
+[width="100%",cols="2s,1m,8",options="header"]
+|=======================================================================
+| Name | Java Type | Description
+| configuration | BraintreeConfiguration | To use the shared configuration
+|=======================================================================
+{% endraw %}
+// component options: END
+
+
+
+// endpoint options: START
+The Braintree component supports 15 endpoint options which are listed below:
+
+{% raw %}
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|=======================================================================
+| Name | Group | Default | Java Type | Description
+| apiName | common | | BraintreeApiName | *Required* What kind of operation to perform
+| methodName | common | | String | What sub operation to use for the selected operation
+| environment | common | | String | *Required* The environment Either SANDBOX or PRODUCTION
+| inBody | common | | String | Sets the name of a parameter to be passed in the exchange In Body
+| merchantId | common | | String | *Required* The merchant id provided by Braintree.
+| privateKey | common | | String | *Required* The private key provided by Braintree.
+| publicKey | common | | String | *Required* The public key provided by Braintree.
+| 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.
+| 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/ERROR level and ignored.
+| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
+| httpReadTimeout | advanced | | Integer | Set read timeout for http calls.
+| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
+| httpLogLevel | logging | | String | Set logging level for http calls see java.util.logging.Level
+| proxyHost | proxy | | String | The proxy host
+| proxyPort | proxy | | Integer | The proxy port
+|=======================================================================
+{% endraw %}
+// endpoint options: END
+
+
[[Braintree-URIformat]]
URI format
^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-cache/src/main/docs/cache.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cache/src/main/docs/cache.adoc b/components/camel-cache/src/main/docs/cache.adoc
index 7e19032..c0c2d6e 100644
--- a/components/camel-cache/src/main/docs/cache.adoc
+++ b/components/camel-cache/src/main/docs/cache.adoc
@@ -45,81 +45,11 @@ You can append query options to the URI in the following format,
Options
^^^^^^^
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Default Value |Description
-
-|`maxElementsInMemory` |`1000` |The number of elements that may be stored in the defined cache
-
-|`memoryStoreEvictionPolicy` |`MemoryStoreEvictionPolicy.LFU` |The number of elements that may be stored in the defined cache. Options
-include
-
-* MemoryStoreEvictionPolicy.LFU - Least frequently used
-* MemoryStoreEvictionPolicy.LRU - Least recently used
-* MemoryStoreEvictionPolicy.FIFO - first in first out, the oldest
-element by creation time
-
-|`overflowToDisk` |`true` |Specifies whether cache may overflow to disk
-
-|`eternal` |`false` |Sets whether elements are eternal. If eternal, timeouts are ignored and
-the +
- element never expires.
-
-|`timeToLiveSeconds` |`300` |The maximum time between creation time and when an element expires. +
- Is used only if the element is not eternal
-
-|`timeToIdleSeconds` |`300` |The maximum amount of time between accesses before an element expires
-
-|`diskPersistent` |`false` |Whether the disk store persists between restarts of the Virtual Machine.
-
-|`diskExpiryThreadIntervalSeconds` |`120` |The number of seconds between runs of the disk expiry thread.
-
-|`cacheManagerFactory` |`null` |*Camel 2.8:* If you want to use a custom factory which instantiates and
-creates the EHCache `net.sf.ehcache.CacheManager`.
- _Type:_ abstract org.apache.camel.component.cache.CacheManagerFactory
-
-|`eventListenerRegistry` |`null` |*Camel 2.8:* Sets a list of EHCache
-`net.sf.ehcache.event.CacheEventListener` for all new caches- no need to
-define it per cache in EHCache xml config anymore.
- _Type:_ org.apache.camel.component.cache.CacheEventListenerRegistry
+// component options: START
+// component options: END
-|`cacheLoaderRegistry` |`null` |*Camel 2.8:* Sets a list of
-`org.apache.camel.component.cache.CacheLoaderWrapper` that extends
-EHCache `net.sf.ehcache.loader.CacheLoader` for all new caches- no need
-to define it per cache in EHCache xml config anymore.
- _Type:_ org.apache.camel.component.cache.CacheLoaderRegistry
-
-|`key` |`null` |*Camel 2.10:* To configure using a cache key by default. If a key is
-provided in the message header, then the key from the header takes
-precedence.
-
-|`operation` |`null` |*Camel 2.10:* To configure using an cache operation by default. If an
-operation in the message header, then the operation from the header
-takes precedence.
-
-|`objectCache` |`false` |*Camel 2.15:* Whether to turn on allowing to store non serializable
-objects in the cache. If this option is enabled then overflow to disk
-cannot be enabled as well.
-|=======================================================================
-
-[[Cache-CacheComponentoptions]]
-Cache Component options
-^^^^^^^^^^^^^^^^^^^^^^^
-
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Name |Default Value |Description
-
-|`configuration` | | To use a custom `org.apache.camel.component.cache.CacheConfiguration`
-configuration.
-
-|`cacheManagerFactory` | | To use a custom `org.apache.camel.component.cache.CacheManagerFactory`.
-
-|`configurationFile` | | *Camel 2.13/2.12.3:* To configure the location of the `ehcache.xml` file
-to use, such as `classpath:com/foo/mycache.xml` to load from classpath.
-If no configuration is given, then the default settings from EHCache is
-used.
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
[[Cache-SendingReceivingMessagestofromthecache]]
Sending/Receiving Messages to/from the cache
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-cassandraql/src/main/docs/cassandra.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/src/main/docs/cassandra.adoc b/components/camel-cassandraql/src/main/docs/cassandra.adoc
deleted file mode 100644
index fe0aad1..0000000
--- a/components/camel-cassandraql/src/main/docs/cassandra.adoc
+++ /dev/null
@@ -1,213 +0,0 @@
-[[Cassandra-CamelCassandraComponent]]
-Camel Cassandra Component
--------------------------
-
-*Available as of Camel 2.15*
-
-http://cassandra.apache.org[Apache Cassandra] is an open source NoSQL
-database designed to handle large amounts on commodity hardware. Like
-Amazon's DynamoDB, Cassandra has a peer-to-peer and master-less
-architecture to avoid single point of failure and garanty high
-availability. Like Google's BigTable, Cassandra data is structured using
-column families which can be accessed through the Thrift RPC API or a
-SQL-like API called CQL.
-
-This component aims at integrating Cassandra 2.0+ using the CQL3 API
-(not the Thrift API). It's based on
-https://github.com/datastax/java-driver[Cassandra Java Driver] provided
-by DataStax.
-
-Maven users will need to add the following dependency to their
-`pom.xml`:
-
-*pom.xml*
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cassandraql</artifactId>
- <version>x.y.z</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
-
-[[Cassandra-URIformat]]
-URI format
-~~~~~~~~~~
-
-The endpoint can initiate the Cassandra connection or use an existing
-one.
-
-[cols="<,<",options="header",]
-|======================================================================
-|URI |Description
-|`cql:localhost/keyspace` |Single host, default port, usual for testing
-|`cql:host1,host2/keyspace` |Multi host, default port
-|`cql:host1,host2:9042/keyspace` |Multi host, custom port
-|`cql:host1,host2` |Default port and keyspace
-|`cql:bean:sessionRef` |Provided Session reference
-|`cql:bean:clusterRef/keyspace` |Provided Cluster reference
-|======================================================================
-
-To fine tune the Cassandra connection (SSL options, pooling options,
-load balancing policy, retry policy, reconnection policy...), create
-your own Cluster instance and give it to the Camel endpoint.
-
-[[Cassandra-EndpointOptions]]
-Endpoint Options
-~~~~~~~~~~~~~~~~
-
-[width="100%",cols="<34%,<33%,<33%",options="header",]
-|=======================================================================
-|Option |Default |Description
-|`clusterName` |� |Cluster name
-
-|`username and password` |� |Session authentication
-
-|`cql` |� |CQL query. Can be overriden with a message header.
-
-|`consistencyLevel` |� |`ANY`, `ONE`, `TWO`, `QUORUM`, `LOCAL_QUORUM`...
-
-|`prepareStatements` |`true` |Use prepared statement (default) or not
-
-|`resultSetConversionStrategy` |`ALL` |How is ResultSet converted
-transformed into message body `ALL`, `ONE`, `LIMIT_10`, `LIMIT_100`...
-|=======================================================================
-
-[[Cassandra-Messages]]
-Messages
-~~~~~~~~
-
-[[Cassandra-IncomingMessage]]
-Incoming Message
-^^^^^^^^^^^^^^^^
-
-The Camel Cassandra endpoint expects a bunch of simple objects (`Object`
-or `Object[]` or `Collection<Object>`) which will be bound to the CQL
-statement as query parameters. If message body is null or empty, then�
-CQL query will be executed without binding parameters.
-
-Headers:
-
-* `CamelCqlQuery` (optional, `String` or `RegularStatement`): CQL query
-either as a plain String or built using the `QueryBuilder`.
-
-[[Cassandra-OutgoingMessage]]
-Outgoing Message
-^^^^^^^^^^^^^^^^
-
-The Camel Cassandra endpoint produces one or many a Cassandra Row
-objects depending on the�`resultSetConversionStrategy`:
-
-�
-
-* `List<Row>` if `resultSetConversionStrategy` is `ALL` or
-`LIMIT_[0-9]+`
-* Single` Row` if `resultSetConversionStrategy` is `ONE`
-* Anything else, if `resultSetConversionStrategy` is a custom
-implementation of the `ResultSetConversionStrategy`
-
-[[Cassandra-Repositories]]
-Repositories
-~~~~~~~~~~~~
-
-Cassandra can be used to store message keys or messages for the
-idempotent and aggregation EIP.
-
-Cassandra might not be the best tool for queuing use cases yet, read
-http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets[Cassandra
-anti-patterns queues and queue like datasets]. It's advised to use
-LeveledCompaction and a small GC grace setting for these tables to allow
-tombstoned rows to be removed quickly.
-
-[[Cassandra-Idempotentrepository]]
-Idempotent repository
-^^^^^^^^^^^^^^^^^^^^^
-
-The `NamedCassandraIdempotentRepository` stores messages keys in a
-Cassandra table like this:
-
-*CAMEL_IDEMPOTENT.cql*
-
-[source,sql]
----------------------------------------------------------
-CREATE TABLE CAMEL_IDEMPOTENT (
- NAME varchar, -- Repository name
- KEY varchar, -- Message key
- PRIMARY KEY (NAME, KEY)
-) WITH compaction = {'class':'LeveledCompactionStrategy'}
- AND gc_grace_seconds = 86400;
----------------------------------------------------------
-
-This repository implementation uses lightweight transactions (also known
-as Compare and Set) and requires Cassandra 2.0.7+.
-
-Alternatively, the `CassandraIdempotentRepository` does not have a
-`NAME` column and can be extended to use a different data model.
-
-[width="100%",cols="<34%,<33%,<33%",options="header",]
-|=======================================================================
-|Option |Default |Description
-
-|`table` |`CAMEL_IDEMPOTENT` |Table name
-
-|`pkColumns` |`NAME`,` KEY` |Primary key columns
-
-|`name` | | Repository name, value used for `NAME` column
-
-|`ttl` | | Key time to live
-
-|`writeConsistencyLevel` | | Consistency level used to insert/delete key: `ANY`, `ONE`, `TWO`,
-`QUORUM`, `LOCAL_QUORUM`\u2026
-
-|`readConsistencyLevel` | | Consistency level used to read/check key: `ONE`, `TWO`, `QUORUM`,
-`LOCAL_QUORUM`\u2026
-|=======================================================================
-
-[[Cassandra-Aggregationrepository]]
-Aggregation repository
-^^^^^^^^^^^^^^^^^^^^^^
-
-The `NamedCassandraAggregationRepository` stores exchanges by
-correlation key in a Cassandra table like this:
-
-*CAMEL_AGGREGATION.cql*
-
-[source,sql]
----------------------------------------------------------
-CREATE TABLE CAMEL_AGGREGATION (
- NAME varchar, -- Repository name
- KEY varchar, -- Correlation id
- EXCHANGE_ID varchar, -- Exchange id
- EXCHANGE blob, -- Serialized exchange
- PRIMARY KEY (NAME, KEY)
-) WITH compaction = {'class':'LeveledCompactionStrategy'}
- AND gc_grace_seconds = 86400;
----------------------------------------------------------
-
-Alternatively, the `CassandraAggregationRepository` does not have a
-`NAME` column and can be extended to use a different data model.
-
-[width="100%",cols="<34%,<33%,<33%",options="header",]
-|=======================================================================
-|Option |Default |Description
-
-|`table` |`CAMEL_AGGREGATION` |Table name
-
-|`pkColumns` |`NAME`,`KEY` |Primary key columns
-
-|`exchangeIdColumn` |`EXCHANGE_ID` |Exchange Id column
-
-|`exchangeColumn` |`EXCHANGE` |Exchange content column
-
-|`name` | | Repository name, value used for `NAME` column
-
-|`ttl` | | Exchange time to live
-
-|`writeConsistencyLevel` | | Consistency level used to insert/delete exchange: `ANY`, `ONE`, `TWO`,
-`QUORUM`, `LOCAL_QUORUM`\u2026
-
-|`readConsistencyLevel` | | Consistency level used to read/check exchange: `ONE`, `TWO`, `QUORUM`,
-`LOCAL_QUORUM`\u2026
-|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-cassandraql/src/main/docs/cql.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/src/main/docs/cql.adoc b/components/camel-cassandraql/src/main/docs/cql.adoc
new file mode 100644
index 0000000..f166cac
--- /dev/null
+++ b/components/camel-cassandraql/src/main/docs/cql.adoc
@@ -0,0 +1,233 @@
+[[Cassandra-CamelCassandraComponent]]
+Camel Cassandra Component
+-------------------------
+
+*Available as of Camel 2.15*
+
+http://cassandra.apache.org[Apache Cassandra] is an open source NoSQL
+database designed to handle large amounts on commodity hardware. Like
+Amazon's DynamoDB, Cassandra has a peer-to-peer and master-less
+architecture to avoid single point of failure and garanty high
+availability. Like Google's BigTable, Cassandra data is structured using
+column families which can be accessed through the Thrift RPC API or a
+SQL-like API called CQL.
+
+This component aims at integrating Cassandra 2.0+ using the CQL3 API
+(not the Thrift API). It's based on
+https://github.com/datastax/java-driver[Cassandra Java Driver] provided
+by DataStax.
+
+Maven users will need to add the following dependency to their
+`pom.xml`:
+
+*pom.xml*
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cassandraql</artifactId>
+ <version>x.y.z</version>
+ <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+[[Cassandra-URIformat]]
+URI format
+~~~~~~~~~~
+
+The endpoint can initiate the Cassandra connection or use an existing
+one.
+
+[cols="<,<",options="header",]
+|======================================================================
+|URI |Description
+|`cql:localhost/keyspace` |Single host, default port, usual for testing
+|`cql:host1,host2/keyspace` |Multi host, default port
+|`cql:host1,host2:9042/keyspace` |Multi host, custom port
+|`cql:host1,host2` |Default port and keyspace
+|`cql:bean:sessionRef` |Provided Session reference
+|`cql:bean:clusterRef/keyspace` |Provided Cluster reference
+|======================================================================
+
+To fine tune the Cassandra connection (SSL options, pooling options,
+load balancing policy, retry policy, reconnection policy...), create
+your own Cluster instance and give it to the Camel endpoint.
+
+[[Cassandra-Options]]
+Cassandra Options
+~~~~~~~~~~~~~~~~~
+
+
+// component options: START
+The Cassandra CQL component has no options.
+// component options: END
+
+
+
+// endpoint options: START
+The Cassandra CQL component supports 18 endpoint options which are listed below:
+
+{% raw %}
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|=======================================================================
+| Name | Group | Default | Java Type | Description
+| beanRef | common | | String | beanRef is defined using bean:id
+| hosts | common | | String | Hostname(s) cassansdra server(s). Multiple hosts can be separated by comma.
+| port | common | | Integer | Port number of cassansdra server(s)
+| keyspace | common | | String | Keyspace to use
+| cluster | common | | Cluster | To use the Cluster instance (you would normally not use this option)
+| clusterName | common | | String | Cluster name
+| consistencyLevel | common | | ConsistencyLevel | Consistency level to use
+| cql | common | | String | CQL query to perform. Can be overridden with the message header with key CamelCqlQuery.
+| loadBalancingPolicy | common | | String | To use a specific LoadBalancingPolicy
+| password | common | | String | Password for session authentication
+| prepareStatements | common | true | boolean | Whether to use PreparedStatements or regular Statements
+| resultSetConversionStrategy | common | | String | To use a custom class that implements logic for converting ResultSet into message body ALL ONE LIMIT_10 LIMIT_100...
+| session | common | | Session | To use the Session instance (you would normally not use this option)
+| username | common | | String | Username for session authentication
+| 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.
+| 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/ERROR level and ignored.
+| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
+| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
+|=======================================================================
+{% endraw %}
+// endpoint options: END
+
+
+[[Cassandra-Messages]]
+Messages
+~~~~~~~~
+
+[[Cassandra-IncomingMessage]]
+Incoming Message
+^^^^^^^^^^^^^^^^
+
+The Camel Cassandra endpoint expects a bunch of simple objects (`Object`
+or `Object[]` or `Collection<Object>`) which will be bound to the CQL
+statement as query parameters. If message body is null or empty, then�
+CQL query will be executed without binding parameters.
+
+Headers:
+
+* `CamelCqlQuery` (optional, `String` or `RegularStatement`): CQL query
+either as a plain String or built using the `QueryBuilder`.
+
+[[Cassandra-OutgoingMessage]]
+Outgoing Message
+^^^^^^^^^^^^^^^^
+
+The Camel Cassandra endpoint produces one or many a Cassandra Row
+objects depending on the�`resultSetConversionStrategy`:
+
+�
+
+* `List<Row>` if `resultSetConversionStrategy` is `ALL` or
+`LIMIT_[0-9]+`
+* Single` Row` if `resultSetConversionStrategy` is `ONE`
+* Anything else, if `resultSetConversionStrategy` is a custom
+implementation of the `ResultSetConversionStrategy`
+
+[[Cassandra-Repositories]]
+Repositories
+~~~~~~~~~~~~
+
+Cassandra can be used to store message keys or messages for the
+idempotent and aggregation EIP.
+
+Cassandra might not be the best tool for queuing use cases yet, read
+http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets[Cassandra
+anti-patterns queues and queue like datasets]. It's advised to use
+LeveledCompaction and a small GC grace setting for these tables to allow
+tombstoned rows to be removed quickly.
+
+[[Cassandra-Idempotentrepository]]
+Idempotent repository
+^^^^^^^^^^^^^^^^^^^^^
+
+The `NamedCassandraIdempotentRepository` stores messages keys in a
+Cassandra table like this:
+
+*CAMEL_IDEMPOTENT.cql*
+
+[source,sql]
+---------------------------------------------------------
+CREATE TABLE CAMEL_IDEMPOTENT (
+ NAME varchar, -- Repository name
+ KEY varchar, -- Message key
+ PRIMARY KEY (NAME, KEY)
+) WITH compaction = {'class':'LeveledCompactionStrategy'}
+ AND gc_grace_seconds = 86400;
+---------------------------------------------------------
+
+This repository implementation uses lightweight transactions (also known
+as Compare and Set) and requires Cassandra 2.0.7+.
+
+Alternatively, the `CassandraIdempotentRepository` does not have a
+`NAME` column and can be extended to use a different data model.
+
+[width="100%",cols="<34%,<33%,<33%",options="header",]
+|=======================================================================
+|Option |Default |Description
+
+|`table` |`CAMEL_IDEMPOTENT` |Table name
+
+|`pkColumns` |`NAME`,` KEY` |Primary key columns
+
+|`name` | | Repository name, value used for `NAME` column
+
+|`ttl` | | Key time to live
+
+|`writeConsistencyLevel` | | Consistency level used to insert/delete key: `ANY`, `ONE`, `TWO`,
+`QUORUM`, `LOCAL_QUORUM`\u2026
+
+|`readConsistencyLevel` | | Consistency level used to read/check key: `ONE`, `TWO`, `QUORUM`,
+`LOCAL_QUORUM`\u2026
+|=======================================================================
+
+[[Cassandra-Aggregationrepository]]
+Aggregation repository
+^^^^^^^^^^^^^^^^^^^^^^
+
+The `NamedCassandraAggregationRepository` stores exchanges by
+correlation key in a Cassandra table like this:
+
+*CAMEL_AGGREGATION.cql*
+
+[source,sql]
+---------------------------------------------------------
+CREATE TABLE CAMEL_AGGREGATION (
+ NAME varchar, -- Repository name
+ KEY varchar, -- Correlation id
+ EXCHANGE_ID varchar, -- Exchange id
+ EXCHANGE blob, -- Serialized exchange
+ PRIMARY KEY (NAME, KEY)
+) WITH compaction = {'class':'LeveledCompactionStrategy'}
+ AND gc_grace_seconds = 86400;
+---------------------------------------------------------
+
+Alternatively, the `CassandraAggregationRepository` does not have a
+`NAME` column and can be extended to use a different data model.
+
+[width="100%",cols="<34%,<33%,<33%",options="header",]
+|=======================================================================
+|Option |Default |Description
+
+|`table` |`CAMEL_AGGREGATION` |Table name
+
+|`pkColumns` |`NAME`,`KEY` |Primary key columns
+
+|`exchangeIdColumn` |`EXCHANGE_ID` |Exchange Id column
+
+|`exchangeColumn` |`EXCHANGE` |Exchange content column
+
+|`name` | | Repository name, value used for `NAME` column
+
+|`ttl` | | Exchange time to live
+
+|`writeConsistencyLevel` | | Consistency level used to insert/delete exchange: `ANY`, `ONE`, `TWO`,
+`QUORUM`, `LOCAL_QUORUM`\u2026
+
+|`readConsistencyLevel` | | Consistency level used to read/check exchange: `ONE`, `TWO`, `QUORUM`,
+`LOCAL_QUORUM`\u2026
+|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-castor/src/main/docs/castor.adoc
----------------------------------------------------------------------
diff --git a/components/camel-castor/src/main/docs/castor.adoc b/components/camel-castor/src/main/docs/castor.adoc
index 0c930f5..f09723d 100644
--- a/components/camel-castor/src/main/docs/castor.adoc
+++ b/components/camel-castor/src/main/docs/castor.adoc
@@ -112,22 +112,11 @@ on multiple routes. You have to set the <castor> element directly in
Options
^^^^^^^
-Castor supports the following options
+// component options: START
+// component options: END
-[width="100%",cols="10%,10%,10%,70%",options="header",]
-|=======================================================================
-|Option |Type |Default |Description
-
-|encoding |String |UTF-8 |Encoding to use when marshalling an Object to XML
-
-|validation |Boolean |false |Whether validation is turned on or off.
-
-|mappingFile |String |null |Path to a Castor mapping file to load from the classpath.
-
-|packages |String[] |null |Add additional packages to Castor XmlContext
-
-|classNames |String[] |null |Add additional class names to Castor XmlContext
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
[[Castor-Dependencies]]
Dependencies
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-chunk/src/main/docs/chunk.adoc
----------------------------------------------------------------------
diff --git a/components/camel-chunk/src/main/docs/chunk.adoc b/components/camel-chunk/src/main/docs/chunk.adoc
index 2690a4d..c0996b7 100644
--- a/components/camel-chunk/src/main/docs/chunk.adoc
+++ b/components/camel-chunk/src/main/docs/chunk.adoc
@@ -39,22 +39,12 @@ format,�`?option=value&option=value&...`
[[Chunk-Options]]
Options
^^^^^^^
-[width="100%",cols="10%,10%,80%",options="header",]
-|=======================================================================
-|Option |Default |Description
-
-|`encoding` |`null` |Character encoding of the resource content.
-
-|themesFolder |`null` |Alternative folder to scan for a template name.
-|themeSubfolder |`null` |Alternative subfolder to scan for a template name if themeFolder
-parameter is set.
+// component options: START
+// component options: END
-|`themeLayer` |`null` |A specific layer of a template file to use as template.
-
-|`extension` |`null` |Alternative extension to scan for a template name if themeFolder and
-themeSubfolder are set.
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
Chunk component will look for a specific template in _themes_ folder
with extensions _.chtml_ or _.cxml.�_If you need to specify a different
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b66541/components/camel-cmis/src/main/docs/cmis.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cmis/src/main/docs/cmis.adoc b/components/camel-cmis/src/main/docs/cmis.adoc
index 2d865f2..3fc8bab 100644
--- a/components/camel-cmis/src/main/docs/cmis.adoc
+++ b/components/camel-cmis/src/main/docs/cmis.adoc
@@ -21,34 +21,14 @@ You can append query options to the URI in the following format,
?options=value&option2=value&...
[[CMIS-URIOptions]]
-URI Options
-^^^^^^^^^^^
-
-[width="100%",cols="10%,10%,10%,70%",options="header",]
-|=======================================================================
-|Name |Default Value |Context |Description
-
-|queryMode |`false` |Producer |If true, will execute the cmis query from the message body and return
-result, otherwise will create a node in the cmis repository
-
-|query |`String` |Consumer |The cmis query to execute against the repository. If not specified, the
-consumer will retrieve every node from the content repository by
-iterating the content tree recursively
-
-|username |`null` |Both |Username for the cmis repository
-
-|password |`null` |Both |Password for the cmis repository
-
-|repositoryId |`null` |Both |The Id of the repository to use. If not specified the first available
-repository is used
-
-|pageSize |`100` |Both |Number of nodes to retrieve per page
+CMIS Options
+^^^^^^^^^^^^
-|readCount |`0` |Both |Max number of nodes to read
+// component options: START
+// component options: END
-|readContent |`false` |Both |If set to true, the content of document node will be retrieved in
-addition to the properties
-|=======================================================================
+// endpoint options: START
+// endpoint options: END
[[CMIS-Usage]]
Usage