http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc 
b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
index 86a92a8..6a15115 100644
--- a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
+++ b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
@@ -57,13 +57,11 @@ The HDFS2 component supports 2 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| common
-| jAASConfiguration |  | Configuration | To use the given configuration for 
security with JAAS.
- 4+^s| advanced
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **jAASConfiguration** (common) | To use the given configuration for security 
with JAAS. |  | Configuration
+| **resolveProperty Placeholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
 |=======================================================================
 // component options: END
 
@@ -81,95 +79,57 @@ with the following path and query parameters:
 
 #### Path Parameters (3 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| hostName |  | String | *Required* HDFS host to use
-| port | 8020 | int | HDFS port to use
-| path |  | String | *Required* The directory path to use
+| Name | Description | Default | Type
+| **hostName** | *Required* HDFS host to use |  | String
+| **port** | HDFS port to use | 8020 | int
+| **path** | *Required* The directory path to use |  | String
 |=======================================================================
 
 #### Query Parameters (38 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| connectOnStartup | true | boolean | Whether to connect to the HDFS file 
system on starting the producer/consumer. If false then the connection is 
created on-demand. Notice that HDFS may take up till 15 minutes to establish a 
connection as it has hardcoded 45 x 20 sec redelivery. By setting this option 
to false allows your application to startup and not block for up till 15 
minutes.
-
-| fileSystemType | HDFS | HdfsFileSystemType | Set to LOCAL to not use HDFS 
but local java.io.File instead.
-
-| fileType | NORMAL_FILE | HdfsFileType | The file type to use. For more 
details see Hadoop HDFS documentation about the various files types.
-
-| keyType | NULL | WritableType | The type for the key in case of sequence or 
map files.
-
-| owner |  | String | The file owner must match this owner for the consumer to 
pickup the file. Otherwise the file is skipped.
-
-| valueType | BYTES | WritableType | The type for the key in case of sequence 
or map files
- 4+^s| consumer
-| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-
-| delay | 1000 | long | The interval (milliseconds) between the directory 
scans.
-
-| initialDelay | 10000 | long | For the consumer how much to wait 
(milliseconds) before to start scanning the directory.
-
-| pattern | * | String | The pattern used for scanning the directory
-
-| sendEmptyMessageWhenIdle | false | boolean | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead.
- 4+^s| consumer (advanced)
-| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
-
-| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
-
-| pollStrategy |  | PollingConsumerPollStrategy | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel.
- 4+^s| producer
-| append | false | boolean | Append to existing file. Notice that not all HDFS 
file systems support the append option.
-
-| overwrite | true | boolean | Whether to overwrite existing files with the 
same name
- 4+^s| advanced
-| blockSize | 67108864 | long | The size of the HDFS blocks
-
-| bufferSize | 4096 | int | The buffer size used by HDFS
-
-| checkIdleInterval | 500 | int | How often (time in millis) in to run the 
idle checker background task. This option is only in use if the splitter 
strategy is IDLE.
-
-| chunkSize | 4096 | int | When reading a normal file this is split into 
chunks producing a message per chunk.
-
-| compressionCodec | DEFAULT | HdfsCompressionCodec | The compression codec to 
use
-
-| compressionType | NONE | CompressionType | The compression type to use (is 
default not in use)
-
-| openedSuffix | opened | String | When a file is opened for reading/writing 
the file is renamed with this suffix to avoid to read it during the writing 
phase.
-
-| readSuffix | read | String | Once the file has been read is renamed with 
this suffix to avoid to read it again.
-
-| replication | 3 | short | The HDFS replication factor
-
-| splitStrategy |  | String | In the current version of Hadoop opening a file 
in append mode is disabled since it's not very reliable. So for the moment it's 
only possible to create new files. The Camel HDFS endpoint tries to solve this 
problem in this way: If the split strategy option has been defined the hdfs 
path will be used as a directory and files will be created using the configured 
UuidGenerator. Every time a splitting condition is met a new file is created. 
The splitStrategy option is defined as a string with the following syntax: 
splitStrategy=ST:valueST:value... where ST can be: BYTES a new file is created 
and the old is closed when the number of written bytes is more than value 
MESSAGES a new file is created and the old is closed when the number of written 
messages is more than value IDLE a new file is created and the old is closed 
when no writing happened in the last value milliseconds
-
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
- 4+^s| scheduler
-| backoffErrorThreshold |  | int | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in.
-
-| backoffIdleThreshold |  | int | The number of subsequent idle polls that 
should happen before the backoffMultipler should kick-in.
-
-| backoffMultiplier |  | int | To let the scheduled polling consumer backoff 
if there has been a number of subsequent idles/errors in a row. The multiplier 
is then the number of polls that will be skipped before the next actual attempt 
is happening again. When this option is in use then backoffIdleThreshold and/or 
backoffErrorThreshold must also be configured.
-
-| greedy | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
-
-| runLoggingLevel | TRACE | LoggingLevel | The consumer logs a start/complete 
log line when it polls. This option allows you to configure the logging level 
for that.
-
-| scheduledExecutorService |  | ScheduledExecutorService | Allows for 
configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
-
-| scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler 
from either camel-spring or camel-quartz2 component
-
-| schedulerProperties |  | Map | To configure additional properties when using 
a custom scheduler or any of the Quartz2 Spring based scheduler.
-
-| startScheduler | true | boolean | Whether the scheduler should be auto 
started.
-
-| timeUnit | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay 
options.
-
-| useFixedDelay | true | boolean | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details.
+| Name | Description | Default | Type
+| **connectOnStartup** (common) | Whether to connect to the HDFS file system 
on starting the producer/consumer. If false then the connection is created 
on-demand. Notice that HDFS may take up till 15 minutes to establish a 
connection as it has hardcoded 45 x 20 sec redelivery. By setting this option 
to false allows your application to startup and not block for up till 15 
minutes. | true | boolean
+| **fileSystemType** (common) | Set to LOCAL to not use HDFS but local 
java.io.File instead. | HDFS | HdfsFileSystemType
+| **fileType** (common) | The file type to use. For more details see Hadoop 
HDFS documentation about the various files types. | NORMAL_FILE | HdfsFileType
+| **keyType** (common) | The type for the key in case of sequence or map 
files. | NULL | WritableType
+| **owner** (common) | The file owner must match this owner for the consumer 
to pickup the file. Otherwise the file is skipped. |  | String
+| **valueType** (common) | The type for the key in case of sequence or map 
files | BYTES | WritableType
+| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored. | false | 
boolean
+| **delay** (consumer) | The interval (milliseconds) between the directory 
scans. | 1000 | long
+| **initialDelay** (consumer) | For the consumer how much to wait 
(milliseconds) before to start scanning the directory. | 10000 | long
+| **pattern** (consumer) | The pattern used for scanning the directory | * | 
String
+| **sendEmptyMessageWhenIdle** (consumer) | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead. | false | boolean
+| **exceptionHandler** (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **pollStrategy** (consumer) | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel. 
|  | PollingConsumerPoll Strategy
+| **append** (producer) | Append to existing file. Notice that not all HDFS 
file systems support the append option. | false | boolean
+| **overwrite** (producer) | Whether to overwrite existing files with the same 
name | true | boolean
+| **blockSize** (advanced) | The size of the HDFS blocks | 67108864 | long
+| **bufferSize** (advanced) | The buffer size used by HDFS | 4096 | int
+| **checkIdleInterval** (advanced) | How often (time in millis) in to run the 
idle checker background task. This option is only in use if the splitter 
strategy is IDLE. | 500 | int
+| **chunkSize** (advanced) | When reading a normal file this is split into 
chunks producing a message per chunk. | 4096 | int
+| **compressionCodec** (advanced) | The compression codec to use | DEFAULT | 
HdfsCompressionCodec
+| **compressionType** (advanced) | The compression type to use (is default not 
in use) | NONE | CompressionType
+| **openedSuffix** (advanced) | When a file is opened for reading/writing the 
file is renamed with this suffix to avoid to read it during the writing phase. 
| opened | String
+| **readSuffix** (advanced) | Once the file has been read is renamed with this 
suffix to avoid to read it again. | read | String
+| **replication** (advanced) | The HDFS replication factor | 3 | short
+| **splitStrategy** (advanced) | In the current version of Hadoop opening a 
file in append mode is disabled since it's not very reliable. So for the moment 
it's only possible to create new files. The Camel HDFS endpoint tries to solve 
this problem in this way: If the split strategy option has been defined the 
hdfs path will be used as a directory and files will be created using the 
configured UuidGenerator. Every time a splitting condition is met a new file is 
created. The splitStrategy option is defined as a string with the following 
syntax: splitStrategy=ST:valueST:value... where ST can be: BYTES a new file is 
created and the old is closed when the number of written bytes is more than 
value MESSAGES a new file is created and the old is closed when the number of 
written messages is more than value IDLE a new file is created and the old is 
closed when no writing happened in the last value milliseconds |  | String
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **backoffErrorThreshold** (scheduler) | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in. |  | int
+| **backoffIdleThreshold** (scheduler) | The number of subsequent idle polls 
that should happen before the backoffMultipler should kick-in. |  | int
+| **backoffMultiplier** (scheduler) | To let the scheduled polling consumer 
backoff if there has been a number of subsequent idles/errors in a row. The 
multiplier is then the number of polls that will be skipped before the next 
actual attempt is happening again. When this option is in use then 
backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | 
int
+| **greedy** (scheduler) | If greedy is enabled then the ScheduledPollConsumer 
will run immediately again if the previous run polled 1 or more messages. | 
false | boolean
+| **runLoggingLevel** (scheduler) | The consumer logs a start/complete log 
line when it polls. This option allows you to configure the logging level for 
that. | TRACE | LoggingLevel
+| **scheduledExecutorService** (scheduler) | Allows for configuring a 
custom/shared thread pool to use for the consumer. By default each consumer has 
its own single threaded thread pool. |  | ScheduledExecutor Service
+| **scheduler** (scheduler) | To use a cron scheduler from either camel-spring 
or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
+| **schedulerProperties** (scheduler) | To configure additional properties 
when using a custom scheduler or any of the Quartz2 Spring based scheduler. |  
| Map
+| **startScheduler** (scheduler) | Whether the scheduler should be auto 
started. | true | boolean
+| **timeUnit** (scheduler) | Time unit for initialDelay and delay options. | 
MILLISECONDS | TimeUnit
+| **useFixedDelay** (scheduler) | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details. | true | boolean
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-hipchat/src/main/docs/hipchat-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-hipchat/src/main/docs/hipchat-component.adoc 
b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
index e2df2f0..e9f49b5 100644
--- a/components/camel-hipchat/src/main/docs/hipchat-component.adoc
+++ b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
@@ -43,61 +43,40 @@ with the following path and query parameters:
 
 #### Path Parameters (3 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| protocol |  | String | *Required* The protocol for the hipchat server such 
as http.
-| host |  | String | *Required* The host for the hipchat server such as 
api.hipchat.com
-| port | 80 | Integer | The port for the hipchat server. Is by default 80.
+| Name | Description | Default | Type
+| **protocol** | *Required* The protocol for the hipchat server such as http. 
|  | String
+| **host** | *Required* The host for the hipchat server such as 
api.hipchat.com |  | String
+| **port** | The port for the hipchat server. Is by default 80. | 80 | Integer
 |=======================================================================
 
 #### Query Parameters (21 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| authToken |  | String | OAuth 2 auth token
-
-| consumeUsers |  | String | Username(s) when consuming messages from the 
hiptchat server. Multiple user names can be separated by comma.
- 4+^s| consumer
-| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-
-| sendEmptyMessageWhenIdle | false | boolean | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead.
- 4+^s| consumer (advanced)
-| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
-
-| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
-
-| pollStrategy |  | PollingConsumerPollStrategy | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel.
- 4+^s| advanced
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
- 4+^s| scheduler
-| backoffErrorThreshold |  | int | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in.
-
-| backoffIdleThreshold |  | int | The number of subsequent idle polls that 
should happen before the backoffMultipler should kick-in.
-
-| backoffMultiplier |  | int | To let the scheduled polling consumer backoff 
if there has been a number of subsequent idles/errors in a row. The multiplier 
is then the number of polls that will be skipped before the next actual attempt 
is happening again. When this option is in use then backoffIdleThreshold and/or 
backoffErrorThreshold must also be configured.
-
-| delay | 500 | long | Milliseconds before the next poll. You can also specify 
time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 
seconds) and 1h (1 hour).
-
-| greedy | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
-
-| initialDelay | 1000 | long | Milliseconds before the first poll starts. You 
can also specify time values using units such as 60s (60 seconds) 5m30s (5 
minutes and 30 seconds) and 1h (1 hour).
-
-| runLoggingLevel | TRACE | LoggingLevel | The consumer logs a start/complete 
log line when it polls. This option allows you to configure the logging level 
for that.
-
-| scheduledExecutorService |  | ScheduledExecutorService | Allows for 
configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
-
-| scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler 
from either camel-spring or camel-quartz2 component
-
-| schedulerProperties |  | Map | To configure additional properties when using 
a custom scheduler or any of the Quartz2 Spring based scheduler.
-
-| startScheduler | true | boolean | Whether the scheduler should be auto 
started.
-
-| timeUnit | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay 
options.
-
-| useFixedDelay | true | boolean | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details.
+| Name | Description | Default | Type
+| **authToken** (common) | OAuth 2 auth token |  | String
+| **consumeUsers** (common) | Username(s) when consuming messages from the 
hiptchat server. Multiple user names can be separated by comma. |  | String
+| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored. | false | 
boolean
+| **sendEmptyMessageWhenIdle** (consumer) | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead. | false | boolean
+| **exceptionHandler** (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **pollStrategy** (consumer) | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel. 
|  | PollingConsumerPoll Strategy
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **backoffErrorThreshold** (scheduler) | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in. |  | int
+| **backoffIdleThreshold** (scheduler) | The number of subsequent idle polls 
that should happen before the backoffMultipler should kick-in. |  | int
+| **backoffMultiplier** (scheduler) | To let the scheduled polling consumer 
backoff if there has been a number of subsequent idles/errors in a row. The 
multiplier is then the number of polls that will be skipped before the next 
actual attempt is happening again. When this option is in use then 
backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | 
int
+| **delay** (scheduler) | Milliseconds before the next poll. You can also 
specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 
30 seconds) and 1h (1 hour). | 500 | long
+| **greedy** (scheduler) | If greedy is enabled then the ScheduledPollConsumer 
will run immediately again if the previous run polled 1 or more messages. | 
false | boolean
+| **initialDelay** (scheduler) | Milliseconds before the first poll starts. 
You can also specify time values using units such as 60s (60 seconds) 5m30s (5 
minutes and 30 seconds) and 1h (1 hour). | 1000 | long
+| **runLoggingLevel** (scheduler) | The consumer logs a start/complete log 
line when it polls. This option allows you to configure the logging level for 
that. | TRACE | LoggingLevel
+| **scheduledExecutorService** (scheduler) | Allows for configuring a 
custom/shared thread pool to use for the consumer. By default each consumer has 
its own single threaded thread pool. |  | ScheduledExecutor Service
+| **scheduler** (scheduler) | To use a cron scheduler from either camel-spring 
or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
+| **schedulerProperties** (scheduler) | To configure additional properties 
when using a custom scheduler or any of the Quartz2 Spring based scheduler. |  
| Map
+| **startScheduler** (scheduler) | Whether the scheduler should be auto 
started. | true | boolean
+| **timeUnit** (scheduler) | Time unit for initialDelay and delay options. | 
MILLISECONDS | TimeUnit
+| **useFixedDelay** (scheduler) | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details. | true | boolean
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-http/src/main/docs/http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/docs/http-component.adoc 
b/components/camel-http/src/main/docs/http-component.adoc
index 8707723..ed0a20a 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -118,23 +118,16 @@ The HTTP component supports 7 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| advanced
-| httpClientConfigurer |  | HttpClientConfigurer | To use the custom 
HttpClientConfigurer to perform configuration of the HttpClient that will be 
used.
-
-| httpConnectionManager |  | HttpConnectionManager | To use a custom 
HttpConnectionManager to manage connections
- 4+^s| producer
-| httpBinding |  | HttpBinding | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient.
-
-| httpConfiguration |  | HttpConfiguration | To use the shared 
HttpConfiguration as base configuration.
-
-| allowJavaSerializedObject | false | boolean | Whether to allow java 
serialization when a request uses 
context-type=application/x-java-serialized-object This is by default turned 
off. If you enable this then be aware that Java will deserialize the incoming 
data from the request to Java and that can be a potential security risk.
- 4+^s| filter
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
- 4+^s| advanced
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **httpClientConfigurer** (advanced) | To use the custom HttpClientConfigurer 
to perform configuration of the HttpClient that will be used. |  | 
HttpClientConfigurer
+| **httpConnectionManager** (advanced) | To use a custom HttpConnectionManager 
to manage connections |  | HttpConnectionManager
+| **httpBinding** (producer) | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient. |  | HttpBinding
+| **httpConfiguration** (producer) | To use the shared HttpConfiguration as 
base configuration. |  | HttpConfiguration
+| **allowJavaSerialized Object** (producer) | Whether to allow java 
serialization when a request uses 
context-type=application/x-java-serialized-object This is by default turned 
off. If you enable this then be aware that Java will deserialize the incoming 
data from the request to Java and that can be a potential security risk. | 
false | boolean
+| **headerFilterStrategy** (filter) | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message. |  | HeaderFilterStrategy
+| **resolveProperty Placeholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
 |=======================================================================
 // component options: END
 
@@ -155,93 +148,55 @@ with the following path and query parameters:
 
 #### Path Parameters (1 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| httpUri |  | URI | *Required* The url of the HTTP endpoint to call.
+| Name | Description | Default | Type
+| **httpUri** | *Required* The url of the HTTP endpoint to call. |  | URI
 |=======================================================================
 
 #### Query Parameters (38 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| common
-| disableStreamCache | false | boolean | Determines whether or not the raw 
input stream from Servlet is cached or not (Camel will read the stream into a 
in memory/overflow to file Stream caching) cache. By default Camel will cache 
the Servlet input stream to support reading it multiple times to ensure it 
Camel can retrieve all data from the stream. However you can set this option to 
true when you for example need to access the raw stream such as streaming it 
directly to a file or other persistent store. DefaultHttpBinding will copy the 
request input stream into a stream cache and put it into message body if this 
option is false to support reading the stream multiple times. If you use 
Servlet to bridge/proxy an endpoint then consider enabling this option to 
improve performance in case you do not need to read the message payload 
multiple times. The http/http4 producer will by default cache the response body 
stream. If setting this option to true then the producers will not cache the r
 esponse body stream but use the response stream as-is as the message body.
-
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
HeaderFilterStrategy to filter header to and from Camel message.
- 4+^s| common (advanced)
-| httpBinding |  | HttpBinding | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient.
- 4+^s| producer
-| bridgeEndpoint | false | boolean | If the option is true HttpProducer will 
ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You 
may also set the option throwExceptionOnFailure to be false to let the 
HttpProducer send all the fault response back.
-
-| chunked | true | boolean | If this option is false the Servlet will disable 
the HTTP streaming and set the content-length header on the response
-
-| connectionClose | false | boolean | Specifies whether a Connection Close 
header must be added to HTTP Request. By default connectionClose is false.
-
-| copyHeaders | true | boolean | If this option is true then IN exchange 
headers will be copied to OUT exchange headers according to copy strategy. 
Setting this to false allows to only include the headers from the HTTP response 
(not propagating IN headers).
-
-| httpMethod |  | HttpMethods | Configure the HTTP method to use. The 
HttpMethod header cannot override this option if set.
-
-| ignoreResponseBody | false | boolean | If this option is true The http 
producer won't read response body and cache the input stream
-
-| preserveHostHeader | false | boolean | If the option is true HttpProducer 
will set the Host header to the value contained in the current exchange Host 
header useful in reverse proxy applications where you want the Host header 
received by the downstream server to reflect the URL called by the upstream 
client this allows applications which use the Host header to generate accurate 
URL's for a proxied service
-
-| throwExceptionOnFailure | true | boolean | Option to disable throwing the 
HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status code.
-
-| transferException | false | boolean | If enabled and an Exchange failed 
processing on the consumer side and if the caused Exception was send back 
serialized in the response as a application/x-java-serialized-object content 
type. On the producer side the exception will be deserialized and thrown as is 
instead of the HttpOperationFailedException. The caused exception is required 
to be serialized. This is by default turned off. If you enable this then be 
aware that Java will deserialize the incoming data from the request to Java and 
that can be a potential security risk.
- 4+^s| producer (advanced)
-| cookieHandler |  | CookieHandler | Configure a cookie handler to maintain a 
HTTP session
-
-| okStatusCodeRange | 200-299 | String | The status codes which is considered 
a success response. The values are inclusive. The range must be defined as 
from-to with the dash included.
-
-| urlRewrite |  | UrlRewrite | Refers to a custom 
org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls 
when you bridge/proxy endpoints. See more details at 
http://camel.apache.org/urlrewrite.html
- 4+^s| advanced
-| httpClientConfigurer |  | HttpClientConfigurer | Register a custom 
configuration strategy for new HttpClient instances created by producers or 
consumers such as to configure authentication mechanisms etc
-
-| httpClientOptions |  | Map | To configure the HttpClient using the 
key/values from the Map.
-
-| httpConnectionManager |  | HttpConnectionManager | To use a custom 
HttpConnectionManager to manage connections
-
-| httpConnectionManagerOptions |  | Map | To configure the 
HttpConnectionManager using the key/values from the Map.
-
-| mapHttpMessageBody | true | boolean | If this option is true then IN 
exchange Body of the exchange will be mapped to HTTP body. Setting this to 
false will avoid the HTTP mapping.
-
-| mapHttpMessageFormUrlEncodedBody | true | boolean | If this option is true 
then IN exchange Form Encoded body of the exchange will be mapped to HTTP. 
Setting this to false will avoid the HTTP Form Encoded body mapping.
-
-| mapHttpMessageHeaders | true | boolean | If this option is true then IN 
exchange Headers of the exchange will be mapped to HTTP headers. Setting this 
to false will avoid the HTTP Headers mapping.
-
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
- 4+^s| proxy
-| proxyAuthDomain |  | String | Proxy authentication domain to use with NTML
-
-| proxyAuthHost |  | String | Proxy authentication host
-
-| proxyAuthMethod |  | String | Proxy authentication method to use
-
-| proxyAuthPassword |  | String | Proxy authentication password
-
-| proxyAuthPort |  | int | Proxy authentication port
-
-| proxyAuthScheme |  | String | Proxy authentication scheme to use
-
-| proxyAuthUsername |  | String | Proxy authentication username
-
-| proxyHost |  | String | Proxy hostname to use
-
-| proxyPort |  | int | Proxy port to use
- 4+^s| security
-| authDomain |  | String | Authentication domain to use with NTML
-
-| authHost |  | String | Authentication host to use with NTML
-
-| authMethod |  | String | Authentication methods allowed to use as a comma 
separated list of values Basic Digest or NTLM.
-
-| authMethodPriority |  | String | Which authentication method to prioritize 
to use either as Basic Digest or NTLM.
-
-| authPassword |  | String | Authentication password
-
-| authUsername |  | String | Authentication username
+| Name | Description | Default | Type
+| **disableStreamCache** (common) | Determines whether or not the raw input 
stream from Servlet is cached or not (Camel will read the stream into a in 
memory/overflow to file Stream caching) cache. By default Camel will cache the 
Servlet input stream to support reading it multiple times to ensure it Camel 
can retrieve all data from the stream. However you can set this option to true 
when you for example need to access the raw stream such as streaming it 
directly to a file or other persistent store. DefaultHttpBinding will copy the 
request input stream into a stream cache and put it into message body if this 
option is false to support reading the stream multiple times. If you use 
Servlet to bridge/proxy an endpoint then consider enabling this option to 
improve performance in case you do not need to read the message payload 
multiple times. The http/http4 producer will by default cache the response body 
stream. If setting this option to true then the producers will not cache the 
respon
 se body stream but use the response stream as-is as the message body. | false 
| boolean
+| **headerFilterStrategy** (common) | To use a custom HeaderFilterStrategy to 
filter header to and from Camel message. |  | HeaderFilterStrategy
+| **httpBinding** (common) | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient. |  | HttpBinding
+| **bridgeEndpoint** (producer) | If the option is true HttpProducer will 
ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You 
may also set the option throwExceptionOnFailure to be false to let the 
HttpProducer send all the fault response back. | false | boolean
+| **chunked** (producer) | If this option is false the Servlet will disable 
the HTTP streaming and set the content-length header on the response | true | 
boolean
+| **connectionClose** (producer) | Specifies whether a Connection Close header 
must be added to HTTP Request. By default connectionClose is false. | false | 
boolean
+| **copyHeaders** (producer) | If this option is true then IN exchange headers 
will be copied to OUT exchange headers according to copy strategy. Setting this 
to false allows to only include the headers from the HTTP response (not 
propagating IN headers). | true | boolean
+| **httpMethod** (producer) | Configure the HTTP method to use. The HttpMethod 
header cannot override this option if set. |  | HttpMethods
+| **ignoreResponseBody** (producer) | If this option is true The http producer 
won't read response body and cache the input stream | false | boolean
+| **preserveHostHeader** (producer) | If the option is true HttpProducer will 
set the Host header to the value contained in the current exchange Host header 
useful in reverse proxy applications where you want the Host header received by 
the downstream server to reflect the URL called by the upstream client this 
allows applications which use the Host header to generate accurate URL's for a 
proxied service | false | boolean
+| **throwExceptionOnFailure** (producer) | Option to disable throwing the 
HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status 
code. | true | boolean
+| **transferException** (producer) | If enabled and an Exchange failed 
processing on the consumer side and if the caused Exception was send back 
serialized in the response as a application/x-java-serialized-object content 
type. On the producer side the exception will be deserialized and thrown as is 
instead of the HttpOperationFailedException. The caused exception is required 
to be serialized. This is by default turned off. If you enable this then be 
aware that Java will deserialize the incoming data from the request to Java and 
that can be a potential security risk. | false | boolean
+| **cookieHandler** (producer) | Configure a cookie handler to maintain a HTTP 
session |  | CookieHandler
+| **okStatusCodeRange** (producer) | The status codes which is considered a 
success response. The values are inclusive. The range must be defined as 
from-to with the dash included. | 200-299 | String
+| **urlRewrite** (producer) | Refers to a custom 
org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls 
when you bridge/proxy endpoints. See more details at 
http://camel.apache.org/urlrewrite.html |  | UrlRewrite
+| **httpClientConfigurer** (advanced) | Register a custom configuration 
strategy for new HttpClient instances created by producers or consumers such as 
to configure authentication mechanisms etc |  | HttpClientConfigurer
+| **httpClientOptions** (advanced) | To configure the HttpClient using the 
key/values from the Map. |  | Map
+| **httpConnectionManager** (advanced) | To use a custom HttpConnectionManager 
to manage connections |  | HttpConnectionManager
+| **httpConnectionManager Options** (advanced) | To configure the 
HttpConnectionManager using the key/values from the Map. |  | Map
+| **mapHttpMessageBody** (advanced) | If this option is true then IN exchange 
Body of the exchange will be mapped to HTTP body. Setting this to false will 
avoid the HTTP mapping. | true | boolean
+| **mapHttpMessageFormUrl EncodedBody** (advanced) | If this option is true 
then IN exchange Form Encoded body of the exchange will be mapped to HTTP. 
Setting this to false will avoid the HTTP Form Encoded body mapping. | true | 
boolean
+| **mapHttpMessageHeaders** (advanced) | If this option is true then IN 
exchange Headers of the exchange will be mapped to HTTP headers. Setting this 
to false will avoid the HTTP Headers mapping. | true | boolean
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **proxyAuthDomain** (proxy) | Proxy authentication domain to use with NTML | 
 | String
+| **proxyAuthHost** (proxy) | Proxy authentication host |  | String
+| **proxyAuthMethod** (proxy) | Proxy authentication method to use |  | String
+| **proxyAuthPassword** (proxy) | Proxy authentication password |  | String
+| **proxyAuthPort** (proxy) | Proxy authentication port |  | int
+| **proxyAuthScheme** (proxy) | Proxy authentication scheme to use |  | String
+| **proxyAuthUsername** (proxy) | Proxy authentication username |  | String
+| **proxyHost** (proxy) | Proxy hostname to use |  | String
+| **proxyPort** (proxy) | Proxy port to use |  | int
+| **authDomain** (security) | Authentication domain to use with NTML |  | 
String
+| **authHost** (security) | Authentication host to use with NTML |  | String
+| **authMethod** (security) | Authentication methods allowed to use as a comma 
separated list of values Basic Digest or NTLM. |  | String
+| **authMethodPriority** (security) | Which authentication method to 
prioritize to use either as Basic Digest or NTLM. |  | String
+| **authPassword** (security) | Authentication password |  | String
+| **authUsername** (security) | Authentication username |  | String
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-http4/src/main/docs/http4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc 
b/components/camel-http4/src/main/docs/http4-component.adoc
index ca58f49..00e7442 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -55,37 +55,23 @@ The HTTP4 component supports 14 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| advanced
-| httpClientConfigurer |  | HttpClientConfigurer | To use the custom 
HttpClientConfigurer to perform configuration of the HttpClient that will be 
used.
-
-| clientConnectionManager |  | HttpClientConnectionManager | To use a custom 
and shared HttpClientConnectionManager to manage connections. If this has been 
configured then this is always used for all endpoints created by this component.
-
-| httpContext |  | HttpContext | To use a custom 
org.apache.http.protocol.HttpContext when executing requests.
- 4+^s| security
-| sslContextParameters |  | SSLContextParameters | To configure security using 
SSLContextParameters. Important: Only one instance of 
org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. 
If you need to use 2 or more different instances you need to define a new 
HttpComponent per instance you need.
-
-| x509HostnameVerifier |  | HostnameVerifier | To use a custom 
X509HostnameVerifier such as DefaultHostnameVerifier or 
org.apache.http.conn.ssl.NoopHostnameVerifier.
- 4+^s| advanced
-| maxTotalConnections | 200 | int | The maximum number of connections.
-
-| connectionsPerRoute | 20 | int | The maximum number of connections per route.
-
-| connectionTimeToLive |  | long | The time for connection to live the time 
unit is millisecond the default value is always keep alive.
- 4+^s| producer
-| cookieStore |  | CookieStore | To use a custom 
org.apache.http.client.CookieStore. By default the 
org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only 
cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to 
be a noop cookie store as cookie shouldn't be stored as we are just bridging 
(eg acting as a proxy).
- 4+^s| advanced
-| httpBinding |  | HttpBinding | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient.
-
-| httpConfiguration |  | HttpConfiguration | To use the shared 
HttpConfiguration as base configuration.
-
-| allowJavaSerializedObject | false | boolean | Whether to allow java 
serialization when a request uses 
context-type=application/x-java-serialized-object. This is by default turned 
off. If you enable this then be aware that Java will deserialize the incoming 
data from the request to Java and that can be a potential security risk.
- 4+^s| filter
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
- 4+^s| advanced
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **httpClientConfigurer** (advanced) | To use the custom HttpClientConfigurer 
to perform configuration of the HttpClient that will be used. |  | 
HttpClientConfigurer
+| **clientConnectionManager** (advanced) | To use a custom and shared 
HttpClientConnectionManager to manage connections. If this has been configured 
then this is always used for all endpoints created by this component. |  | 
HttpClientConnection Manager
+| **httpContext** (advanced) | To use a custom 
org.apache.http.protocol.HttpContext when executing requests. |  | HttpContext
+| **sslContextParameters** (security) | To configure security using 
SSLContextParameters. Important: Only one instance of 
org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. 
If you need to use 2 or more different instances you need to define a new 
HttpComponent per instance you need. |  | SSLContextParameters
+| **x509HostnameVerifier** (security) | To use a custom X509HostnameVerifier 
such as DefaultHostnameVerifier or 
org.apache.http.conn.ssl.NoopHostnameVerifier. |  | HostnameVerifier
+| **maxTotalConnections** (advanced) | The maximum number of connections. | 
200 | int
+| **connectionsPerRoute** (advanced) | The maximum number of connections per 
route. | 20 | int
+| **connectionTimeToLive** (advanced) | The time for connection to live the 
time unit is millisecond the default value is always keep alive. |  | long
+| **cookieStore** (producer) | To use a custom 
org.apache.http.client.CookieStore. By default the 
org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only 
cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to 
be a noop cookie store as cookie shouldn't be stored as we are just bridging 
(eg acting as a proxy). |  | CookieStore
+| **httpBinding** (advanced) | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient. |  | HttpBinding
+| **httpConfiguration** (advanced) | To use the shared HttpConfiguration as 
base configuration. |  | HttpConfiguration
+| **allowJavaSerialized Object** (advanced) | Whether to allow java 
serialization when a request uses 
context-type=application/x-java-serialized-object. This is by default turned 
off. If you enable this then be aware that Java will deserialize the incoming 
data from the request to Java and that can be a potential security risk. | 
false | boolean
+| **headerFilterStrategy** (filter) | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message. |  | HeaderFilterStrategy
+| **resolveProperty Placeholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
 |=======================================================================
 // component options: END
 
@@ -107,113 +93,65 @@ with the following path and query parameters:
 
 #### Path Parameters (1 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| httpUri |  | URI | *Required* The url of the HTTP endpoint to call.
+| Name | Description | Default | Type
+| **httpUri** | *Required* The url of the HTTP endpoint to call. |  | URI
 |=======================================================================
 
 #### Query Parameters (48 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| common
-| disableStreamCache | false | boolean | Determines whether or not the raw 
input stream from Servlet is cached or not (Camel will read the stream into a 
in memory/overflow to file Stream caching) cache. By default Camel will cache 
the Servlet input stream to support reading it multiple times to ensure it 
Camel can retrieve all data from the stream. However you can set this option to 
true when you for example need to access the raw stream such as streaming it 
directly to a file or other persistent store. DefaultHttpBinding will copy the 
request input stream into a stream cache and put it into message body if this 
option is false to support reading the stream multiple times. If you use 
Servlet to bridge/proxy an endpoint then consider enabling this option to 
improve performance in case you do not need to read the message payload 
multiple times. The http/http4 producer will by default cache the response body 
stream. If setting this option to true then the producers will not cache the r
 esponse body stream but use the response stream as-is as the message body.
-
-| headerFilterStrategy |  | HeaderFilterStrategy | To use a custom 
HeaderFilterStrategy to filter header to and from Camel message.
- 4+^s| common (advanced)
-| httpBinding |  | HttpBinding | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient.
- 4+^s| producer
-| authenticationPreemptive | false | boolean | If this option is true 
camel-http4 sends preemptive basic authentication to the server.
-
-| bridgeEndpoint | false | boolean | If the option is true HttpProducer will 
ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You 
may also set the option throwExceptionOnFailure to be false to let the 
HttpProducer send all the fault response back.
-
-| chunked | true | boolean | If this option is false the Servlet will disable 
the HTTP streaming and set the content-length header on the response
-
-| clearExpiredCookies | true | boolean | Whether to clear expired cookies 
before sending the HTTP request. This ensures the cookies store does not keep 
growing by adding new cookies which is newer removed when they are expired.
-
-| connectionClose | false | boolean | Specifies whether a Connection Close 
header must be added to HTTP Request. By default connectionClose is false.
-
-| cookieStore |  | CookieStore | To use a custom CookieStore. By default the 
BasicCookieStore is used which is an in-memory only cookie store. Notice if 
bridgeEndpoint=true then the cookie store is forced to be a noop cookie store 
as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). 
If a cookieHandler is set then the cookie store is also forced to be a noop 
cookie store as cookie handling is then performed by the cookieHandler.
-
-| copyHeaders | true | boolean | If this option is true then IN exchange 
headers will be copied to OUT exchange headers according to copy strategy. 
Setting this to false allows to only include the headers from the HTTP response 
(not propagating IN headers).
-
-| deleteWithBody | false | boolean | Whether the HTTP DELETE should include 
the message body or not. By default HTTP DELETE do not include any HTTP 
message. However in some rare cases users may need to be able to include the 
message body.
-
-| httpMethod |  | HttpMethods | Configure the HTTP method to use. The 
HttpMethod header cannot override this option if set.
-
-| ignoreResponseBody | false | boolean | If this option is true The http 
producer won't read response body and cache the input stream
-
-| preserveHostHeader | false | boolean | If the option is true HttpProducer 
will set the Host header to the value contained in the current exchange Host 
header useful in reverse proxy applications where you want the Host header 
received by the downstream server to reflect the URL called by the upstream 
client this allows applications which use the Host header to generate accurate 
URL's for a proxied service
-
-| throwExceptionOnFailure | true | boolean | Option to disable throwing the 
HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status code.
-
-| transferException | false | boolean | If enabled and an Exchange failed 
processing on the consumer side and if the caused Exception was send back 
serialized in the response as a application/x-java-serialized-object content 
type. On the producer side the exception will be deserialized and thrown as is 
instead of the HttpOperationFailedException. The caused exception is required 
to be serialized. This is by default turned off. If you enable this then be 
aware that Java will deserialize the incoming data from the request to Java and 
that can be a potential security risk.
- 4+^s| producer (advanced)
-| cookieHandler |  | CookieHandler | Configure a cookie handler to maintain a 
HTTP session
-
-| okStatusCodeRange | 200-299 | String | The status codes which is considered 
a success response. The values are inclusive. The range must be defined as 
from-to with the dash included.
-
-| urlRewrite |  | UrlRewrite | Refers to a custom 
org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls 
when you bridge/proxy endpoints. See more details at 
http://camel.apache.org/urlrewrite.html
- 4+^s| advanced
-| clientBuilder |  | HttpClientBuilder | Provide access to the http client 
request parameters used on new RequestConfig instances used by producers or 
consumers of this endpoint.
-
-| clientConnectionManager |  | HttpClientConnectionManager | To use a custom 
HttpClientConnectionManager to manage connections
-
-| connectionsPerRoute | 20 | int | The maximum number of connections per route.
-
-| httpClient |  | HttpClient | Sets a custom HttpClient to be used by the 
producer
-
-| httpClientConfigurer |  | HttpClientConfigurer | Register a custom 
configuration strategy for new HttpClient instances created by producers or 
consumers such as to configure authentication mechanisms etc
-
-| httpClientOptions |  | Map | To configure the HttpClient using the 
key/values from the Map.
-
-| httpContext |  | HttpContext | To use a custom HttpContext instance
-
-| mapHttpMessageBody | true | boolean | If this option is true then IN 
exchange Body of the exchange will be mapped to HTTP body. Setting this to 
false will avoid the HTTP mapping.
-
-| mapHttpMessageFormUrlEncodedBody | true | boolean | If this option is true 
then IN exchange Form Encoded body of the exchange will be mapped to HTTP. 
Setting this to false will avoid the HTTP Form Encoded body mapping.
-
-| mapHttpMessageHeaders | true | boolean | If this option is true then IN 
exchange Headers of the exchange will be mapped to HTTP headers. Setting this 
to false will avoid the HTTP Headers mapping.
-
-| maxTotalConnections | 200 | int | The maximum number of connections.
-
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
-
-| useSystemProperties | false | boolean | To use System Properties as fallback 
for configuration
- 4+^s| proxy
-| proxyAuthDomain |  | String | Proxy authentication domain to use with NTML
-
-| proxyAuthHost |  | String | Proxy authentication host
-
-| proxyAuthMethod |  | String | Proxy authentication method to use
-
-| proxyAuthPassword |  | String | Proxy authentication password
-
-| proxyAuthPort |  | int | Proxy authentication port
-
-| proxyAuthScheme |  | String | Proxy authentication scheme to use
-
-| proxyAuthUsername |  | String | Proxy authentication username
-
-| proxyHost |  | String | Proxy hostname to use
-
-| proxyPort |  | int | Proxy port to use
- 4+^s| security
-| authDomain |  | String | Authentication domain to use with NTML
-
-| authHost |  | String | Authentication host to use with NTML
-
-| authMethod |  | String | Authentication methods allowed to use as a comma 
separated list of values Basic Digest or NTLM.
-
-| authMethodPriority |  | String | Which authentication method to prioritize 
to use either as Basic Digest or NTLM.
-
-| authPassword |  | String | Authentication password
-
-| authUsername |  | String | Authentication username
-
-| x509HostnameVerifier |  | HostnameVerifier | To use a custom 
X509HostnameVerifier such as DefaultHostnameVerifier or 
org.apache.http.conn.ssl.NoopHostnameVerifier.
+| Name | Description | Default | Type
+| **disableStreamCache** (common) | Determines whether or not the raw input 
stream from Servlet is cached or not (Camel will read the stream into a in 
memory/overflow to file Stream caching) cache. By default Camel will cache the 
Servlet input stream to support reading it multiple times to ensure it Camel 
can retrieve all data from the stream. However you can set this option to true 
when you for example need to access the raw stream such as streaming it 
directly to a file or other persistent store. DefaultHttpBinding will copy the 
request input stream into a stream cache and put it into message body if this 
option is false to support reading the stream multiple times. If you use 
Servlet to bridge/proxy an endpoint then consider enabling this option to 
improve performance in case you do not need to read the message payload 
multiple times. The http/http4 producer will by default cache the response body 
stream. If setting this option to true then the producers will not cache the 
respon
 se body stream but use the response stream as-is as the message body. | false 
| boolean
+| **headerFilterStrategy** (common) | To use a custom HeaderFilterStrategy to 
filter header to and from Camel message. |  | HeaderFilterStrategy
+| **httpBinding** (common) | To use a custom HttpBinding to control the 
mapping between Camel message and HttpClient. |  | HttpBinding
+| **authenticationPreemptive** (producer) | If this option is true camel-http4 
sends preemptive basic authentication to the server. | false | boolean
+| **bridgeEndpoint** (producer) | If the option is true HttpProducer will 
ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You 
may also set the option throwExceptionOnFailure to be false to let the 
HttpProducer send all the fault response back. | false | boolean
+| **chunked** (producer) | If this option is false the Servlet will disable 
the HTTP streaming and set the content-length header on the response | true | 
boolean
+| **clearExpiredCookies** (producer) | Whether to clear expired cookies before 
sending the HTTP request. This ensures the cookies store does not keep growing 
by adding new cookies which is newer removed when they are expired. | true | 
boolean
+| **connectionClose** (producer) | Specifies whether a Connection Close header 
must be added to HTTP Request. By default connectionClose is false. | false | 
boolean
+| **cookieStore** (producer) | To use a custom CookieStore. By default the 
BasicCookieStore is used which is an in-memory only cookie store. Notice if 
bridgeEndpoint=true then the cookie store is forced to be a noop cookie store 
as cookie shouldn't be stored as we are just bridging (eg acting as a proxy). 
If a cookieHandler is set then the cookie store is also forced to be a noop 
cookie store as cookie handling is then performed by the cookieHandler. |  | 
CookieStore
+| **copyHeaders** (producer) | If this option is true then IN exchange headers 
will be copied to OUT exchange headers according to copy strategy. Setting this 
to false allows to only include the headers from the HTTP response (not 
propagating IN headers). | true | boolean
+| **deleteWithBody** (producer) | Whether the HTTP DELETE should include the 
message body or not. By default HTTP DELETE do not include any HTTP message. 
However in some rare cases users may need to be able to include the message 
body. | false | boolean
+| **httpMethod** (producer) | Configure the HTTP method to use. The HttpMethod 
header cannot override this option if set. |  | HttpMethods
+| **ignoreResponseBody** (producer) | If this option is true The http producer 
won't read response body and cache the input stream | false | boolean
+| **preserveHostHeader** (producer) | If the option is true HttpProducer will 
set the Host header to the value contained in the current exchange Host header 
useful in reverse proxy applications where you want the Host header received by 
the downstream server to reflect the URL called by the upstream client this 
allows applications which use the Host header to generate accurate URL's for a 
proxied service | false | boolean
+| **throwExceptionOnFailure** (producer) | Option to disable throwing the 
HttpOperationFailedException in case of failed responses from the remote 
server. This allows you to get all responses regardless of the HTTP status 
code. | true | boolean
+| **transferException** (producer) | If enabled and an Exchange failed 
processing on the consumer side and if the caused Exception was send back 
serialized in the response as a application/x-java-serialized-object content 
type. On the producer side the exception will be deserialized and thrown as is 
instead of the HttpOperationFailedException. The caused exception is required 
to be serialized. This is by default turned off. If you enable this then be 
aware that Java will deserialize the incoming data from the request to Java and 
that can be a potential security risk. | false | boolean
+| **cookieHandler** (producer) | Configure a cookie handler to maintain a HTTP 
session |  | CookieHandler
+| **okStatusCodeRange** (producer) | The status codes which is considered a 
success response. The values are inclusive. The range must be defined as 
from-to with the dash included. | 200-299 | String
+| **urlRewrite** (producer) | Refers to a custom 
org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls 
when you bridge/proxy endpoints. See more details at 
http://camel.apache.org/urlrewrite.html |  | UrlRewrite
+| **clientBuilder** (advanced) | Provide access to the http client request 
parameters used on new RequestConfig instances used by producers or consumers 
of this endpoint. |  | HttpClientBuilder
+| **clientConnectionManager** (advanced) | To use a custom 
HttpClientConnectionManager to manage connections |  | HttpClientConnection 
Manager
+| **connectionsPerRoute** (advanced) | The maximum number of connections per 
route. | 20 | int
+| **httpClient** (advanced) | Sets a custom HttpClient to be used by the 
producer |  | HttpClient
+| **httpClientConfigurer** (advanced) | Register a custom configuration 
strategy for new HttpClient instances created by producers or consumers such as 
to configure authentication mechanisms etc |  | HttpClientConfigurer
+| **httpClientOptions** (advanced) | To configure the HttpClient using the 
key/values from the Map. |  | Map
+| **httpContext** (advanced) | To use a custom HttpContext instance |  | 
HttpContext
+| **mapHttpMessageBody** (advanced) | If this option is true then IN exchange 
Body of the exchange will be mapped to HTTP body. Setting this to false will 
avoid the HTTP mapping. | true | boolean
+| **mapHttpMessageFormUrl EncodedBody** (advanced) | If this option is true 
then IN exchange Form Encoded body of the exchange will be mapped to HTTP. 
Setting this to false will avoid the HTTP Form Encoded body mapping. | true | 
boolean
+| **mapHttpMessageHeaders** (advanced) | If this option is true then IN 
exchange Headers of the exchange will be mapped to HTTP headers. Setting this 
to false will avoid the HTTP Headers mapping. | true | boolean
+| **maxTotalConnections** (advanced) | The maximum number of connections. | 
200 | int
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **useSystemProperties** (advanced) | To use System Properties as fallback 
for configuration | false | boolean
+| **proxyAuthDomain** (proxy) | Proxy authentication domain to use with NTML | 
 | String
+| **proxyAuthHost** (proxy) | Proxy authentication host |  | String
+| **proxyAuthMethod** (proxy) | Proxy authentication method to use |  | String
+| **proxyAuthPassword** (proxy) | Proxy authentication password |  | String
+| **proxyAuthPort** (proxy) | Proxy authentication port |  | int
+| **proxyAuthScheme** (proxy) | Proxy authentication scheme to use |  | String
+| **proxyAuthUsername** (proxy) | Proxy authentication username |  | String
+| **proxyHost** (proxy) | Proxy hostname to use |  | String
+| **proxyPort** (proxy) | Proxy port to use |  | int
+| **authDomain** (security) | Authentication domain to use with NTML |  | 
String
+| **authHost** (security) | Authentication host to use with NTML |  | String
+| **authMethod** (security) | Authentication methods allowed to use as a comma 
separated list of values Basic Digest or NTLM. |  | String
+| **authMethodPriority** (security) | Which authentication method to 
prioritize to use either as Basic Digest or NTLM. |  | String
+| **authPassword** (security) | Authentication password |  | String
+| **authUsername** (security) | Authentication username |  | String
+| **x509HostnameVerifier** (security) | To use a custom X509HostnameVerifier 
such as DefaultHostnameVerifier or 
org.apache.http.conn.ssl.NoopHostnameVerifier. |  | HostnameVerifier
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-ibatis/src/main/docs/ibatis-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ibatis/src/main/docs/ibatis-component.adoc 
b/components/camel-ibatis/src/main/docs/ibatis-component.adoc
index 8c92e15..2eddd0d 100644
--- a/components/camel-ibatis/src/main/docs/ibatis-component.adoc
+++ b/components/camel-ibatis/src/main/docs/ibatis-component.adoc
@@ -60,17 +60,13 @@ The iBatis component supports 4 options which are listed 
below.
 
 
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
- 4+^s| advanced
-| sqlMapClient |  | SqlMapClient | To use the given 
com.ibatis.sqlmap.client.SqlMapClient
- 4+^s| common
-| sqlMapConfig | classpath:SqlMapConfig.xml | String | Location of iBatis xml 
configuration file. The default value is: SqlMapConfig.xml loaded from the 
classpath
-
-| useTransactions | true | boolean | Whether to use transactions. This option 
is by default true.
- 4+^s| advanced
-| resolvePropertyPlaceholders | true | boolean | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders.
+| Name | Description | Default | Type
+| **sqlMapClient** (advanced) | To use the given 
com.ibatis.sqlmap.client.SqlMapClient |  | SqlMapClient
+| **sqlMapConfig** (common) | Location of iBatis xml configuration file. The 
default value is: SqlMapConfig.xml loaded from the classpath | 
classpath:SqlMapConfig.xml | String
+| **useTransactions** (common) | Whether to use transactions. This option is 
by default true. | true | boolean
+| **resolveProperty Placeholders** (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
 |=======================================================================
 // component options: END
 
@@ -90,71 +86,44 @@ with the following path and query parameters:
 
 #### Path Parameters (1 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| statement |  | String | *Required* The statement name in the iBatis XML 
mapping file which maps to the query insert update or delete operation you wish 
to evaluate.
+| Name | Description | Default | Type
+| **statement** | *Required* The statement name in the iBatis XML mapping file 
which maps to the query insert update or delete operation you wish to evaluate. 
|  | String
 |=======================================================================
 
 #### Query Parameters (27 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| isolation | TRANSACTION_REPEATABLE_READ | String | Transaction isolation 
level
-
-| useTransactions | true | boolean | Whether to use transactions. This option 
is by default true.
- 4+^s| consumer
-| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-
-| maxMessagesPerPoll | 0 | int | This option is intended to split results 
returned by the database pool into the batches and deliver them in multiple 
exchanges. This integer defines the maximum messages to deliver in single 
exchange. By default no maximum is set. Can be used to set a limit of e.g. 1000 
to avoid when starting up the server that there are thousands of files. Set a 
value of 0 or negative to disable it.
-
-| onConsume |  | String | Statement to run after data has been processed in 
the route
-
-| routeEmptyResultSet | false | boolean | Whether allow empty resultset to be 
routed to the next hop
-
-| sendEmptyMessageWhenIdle | false | boolean | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead.
-
-| strategy |  | IBatisProcessingStrategy | Allows to plugin a custom 
IBatisProcessingStrategy to use by the consumer.
-
-| useIterator | true | boolean | Process resultset individually or as a list
- 4+^s| consumer (advanced)
-| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
-
-| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
-
-| pollStrategy |  | PollingConsumerPollStrategy | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel.
- 4+^s| producer
-| statementType |  | StatementType | Mandatory to specify for the producer to 
control which kind of operation to invoke.
- 4+^s| advanced
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
- 4+^s| scheduler
-| backoffErrorThreshold |  | int | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in.
-
-| backoffIdleThreshold |  | int | The number of subsequent idle polls that 
should happen before the backoffMultipler should kick-in.
-
-| backoffMultiplier |  | int | To let the scheduled polling consumer backoff 
if there has been a number of subsequent idles/errors in a row. The multiplier 
is then the number of polls that will be skipped before the next actual attempt 
is happening again. When this option is in use then backoffIdleThreshold and/or 
backoffErrorThreshold must also be configured.
-
-| delay | 500 | long | Milliseconds before the next poll. You can also specify 
time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 
seconds) and 1h (1 hour).
-
-| greedy | false | boolean | If greedy is enabled then the 
ScheduledPollConsumer will run immediately again if the previous run polled 1 
or more messages.
-
-| initialDelay | 1000 | long | Milliseconds before the first poll starts. You 
can also specify time values using units such as 60s (60 seconds) 5m30s (5 
minutes and 30 seconds) and 1h (1 hour).
-
-| runLoggingLevel | TRACE | LoggingLevel | The consumer logs a start/complete 
log line when it polls. This option allows you to configure the logging level 
for that.
-
-| scheduledExecutorService |  | ScheduledExecutorService | Allows for 
configuring a custom/shared thread pool to use for the consumer. By default 
each consumer has its own single threaded thread pool.
-
-| scheduler | none | ScheduledPollConsumerScheduler | To use a cron scheduler 
from either camel-spring or camel-quartz2 component
-
-| schedulerProperties |  | Map | To configure additional properties when using 
a custom scheduler or any of the Quartz2 Spring based scheduler.
-
-| startScheduler | true | boolean | Whether the scheduler should be auto 
started.
-
-| timeUnit | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay 
options.
-
-| useFixedDelay | true | boolean | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details.
+| Name | Description | Default | Type
+| **isolation** (common) | Transaction isolation level | 
TRANSACTION_REPEATABLE_READ | String
+| **useTransactions** (common) | Whether to use transactions. This option is 
by default true. | true | boolean
+| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored. | false | 
boolean
+| **maxMessagesPerPoll** (consumer) | This option is intended to split results 
returned by the database pool into the batches and deliver them in multiple 
exchanges. This integer defines the maximum messages to deliver in single 
exchange. By default no maximum is set. Can be used to set a limit of e.g. 1000 
to avoid when starting up the server that there are thousands of files. Set a 
value of 0 or negative to disable it. | 0 | int
+| **onConsume** (consumer) | Statement to run after data has been processed in 
the route |  | String
+| **routeEmptyResultSet** (consumer) | Whether allow empty resultset to be 
routed to the next hop | false | boolean
+| **sendEmptyMessageWhenIdle** (consumer) | If the polling consumer did not 
poll any files you can enable this option to send an empty message (no body) 
instead. | false | boolean
+| **strategy** (consumer) | Allows to plugin a custom IBatisProcessingStrategy 
to use by the consumer. |  | IBatisProcessing Strategy
+| **useIterator** (consumer) | Process resultset individually or as a list | 
true | boolean
+| **exceptionHandler** (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **pollStrategy** (consumer) | A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation to control error handling usually occurred during the 
poll operation before an Exchange have been created and being routed in Camel. 
|  | PollingConsumerPoll Strategy
+| **statementType** (producer) | Mandatory to specify for the producer to 
control which kind of operation to invoke. |  | StatementType
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+| **backoffErrorThreshold** (scheduler) | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in. |  | int
+| **backoffIdleThreshold** (scheduler) | The number of subsequent idle polls 
that should happen before the backoffMultipler should kick-in. |  | int
+| **backoffMultiplier** (scheduler) | To let the scheduled polling consumer 
backoff if there has been a number of subsequent idles/errors in a row. The 
multiplier is then the number of polls that will be skipped before the next 
actual attempt is happening again. When this option is in use then 
backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | 
int
+| **delay** (scheduler) | Milliseconds before the next poll. You can also 
specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 
30 seconds) and 1h (1 hour). | 500 | long
+| **greedy** (scheduler) | If greedy is enabled then the ScheduledPollConsumer 
will run immediately again if the previous run polled 1 or more messages. | 
false | boolean
+| **initialDelay** (scheduler) | Milliseconds before the first poll starts. 
You can also specify time values using units such as 60s (60 seconds) 5m30s (5 
minutes and 30 seconds) and 1h (1 hour). | 1000 | long
+| **runLoggingLevel** (scheduler) | The consumer logs a start/complete log 
line when it polls. This option allows you to configure the logging level for 
that. | TRACE | LoggingLevel
+| **scheduledExecutorService** (scheduler) | Allows for configuring a 
custom/shared thread pool to use for the consumer. By default each consumer has 
its own single threaded thread pool. |  | ScheduledExecutor Service
+| **scheduler** (scheduler) | To use a cron scheduler from either camel-spring 
or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
+| **schedulerProperties** (scheduler) | To configure additional properties 
when using a custom scheduler or any of the Quartz2 Spring based scheduler. |  
| Map
+| **startScheduler** (scheduler) | Whether the scheduler should be auto 
started. | true | boolean
+| **timeUnit** (scheduler) | Time unit for initialDelay and delay options. | 
MILLISECONDS | TimeUnit
+| **useFixedDelay** (scheduler) | Controls if fixed delay or fixed rate is 
used. See ScheduledExecutorService in JDK for details. | true | boolean
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-infinispan/src/main/docs/infinispan-component.adoc
----------------------------------------------------------------------
diff --git 
a/components/camel-infinispan/src/main/docs/infinispan-component.adoc 
b/components/camel-infinispan/src/main/docs/infinispan-component.adoc
index 446ef8b..9dfa579 100644
--- a/components/camel-infinispan/src/main/docs/infinispan-component.adoc
+++ b/components/camel-infinispan/src/main/docs/infinispan-component.adoc
@@ -53,45 +53,31 @@ with the following path and query parameters:
 
 #### Path Parameters (1 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| host |  | String | *Required* Specifies the host of the cache on Infinispan 
instance
+| Name | Description | Default | Type
+| **host** | *Required* Specifies the host of the cache on Infinispan instance 
|  | String
 |=======================================================================
 
 #### Query Parameters (14 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| cacheContainer |  | BasicCacheContainer | Specifies the cache Container to 
connect
-
-| cacheName |  | String | Specifies the cache name
-
-| queryBuilder |  | InfinispanQueryBuilder | Specifies the query builder.
- 4+^s| consumer
-| bridgeErrorHandler | false | boolean | Allows for bridging the consumer to 
the Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored.
-
-| clusteredListener | false | boolean | If true the listener will be installed 
for the entire cluster
-
-| customListener |  | InfinispanCustomListener | Returns the custom listener 
in use if provided
-
-| eventTypes |  | String | Specifies the set of event types to register by the 
consumer. Multiple event can be separated by comma. The possible event types 
are: CACHE_ENTRY_ACTIVATED CACHE_ENTRY_PASSIVATED CACHE_ENTRY_VISITED 
CACHE_ENTRY_LOADED CACHE_ENTRY_EVICTED CACHE_ENTRY_CREATED CACHE_ENTRY_REMOVED 
CACHE_ENTRY_MODIFIED TRANSACTION_COMPLETED TRANSACTION_REGISTERED 
CACHE_ENTRY_INVALIDATED DATA_REHASHED TOPOLOGY_CHANGED PARTITION_STATUS_CHANGED
-
-| sync | true | boolean | If true the consumer will receive notifications 
synchronously
- 4+^s| consumer (advanced)
-| exceptionHandler |  | ExceptionHandler | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored.
-
-| exchangePattern |  | ExchangePattern | Sets the exchange pattern when the 
consumer creates an exchange.
- 4+^s| producer
-| command | put | String | The operation to perform.
- 4+^s| advanced
-| configurationUri |  | String | An implementation specific URI for the 
CacheManager
-
-| flags |  | String | A comma separated list of Flag to be applied by default 
on each cache invocation not applicable to remote caches.
-
-| synchronous | false | boolean | Sets whether synchronous processing should 
be strictly used or Camel is allowed to use asynchronous processing (if 
supported).
+| Name | Description | Default | Type
+| **cacheContainer** (common) | Specifies the cache Container to connect |  | 
BasicCacheContainer
+| **cacheName** (common) | Specifies the cache name |  | String
+| **queryBuilder** (common) | Specifies the query builder. |  | 
InfinispanQueryBuilder
+| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages or the likes will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN or ERROR level and ignored. | false | 
boolean
+| **clusteredListener** (consumer) | If true the listener will be installed 
for the entire cluster | false | boolean
+| **customListener** (consumer) | Returns the custom listener in use if 
provided |  | InfinispanCustom Listener
+| **eventTypes** (consumer) | Specifies the set of event types to register by 
the consumer. Multiple event can be separated by comma. The possible event 
types are: CACHE_ENTRY_ACTIVATED CACHE_ENTRY_PASSIVATED CACHE_ENTRY_VISITED 
CACHE_ENTRY_LOADED CACHE_ENTRY_EVICTED CACHE_ENTRY_CREATED CACHE_ENTRY_REMOVED 
CACHE_ENTRY_MODIFIED TRANSACTION_COMPLETED TRANSACTION_REGISTERED 
CACHE_ENTRY_INVALIDATED DATA_REHASHED TOPOLOGY_CHANGED PARTITION_STATUS_CHANGED 
|  | String
+| **sync** (consumer) | If true the consumer will receive notifications 
synchronously | true | boolean
+| **exceptionHandler** (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
+| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| **command** (producer) | The operation to perform. | put | String
+| **configurationUri** (advanced) | An implementation specific URI for the 
CacheManager |  | String
+| **flags** (advanced) | A comma separated list of Flag to be applied by 
default on each cache invocation not applicable to remote caches. |  | String
+| **synchronous** (advanced) | Sets whether synchronous processing should be 
strictly used or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
 |=======================================================================
 // endpoint options: END
 

Reply via email to