You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/03/17 16:24:29 UTC

[21/30] camel git commit: Component docs - Adjust tables yet again. Almost there in github to make it read all description and default value without scrolling.

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-elasticsearch/src/main/docs/elasticsearch-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/docs/elasticsearch-component.adoc b/components/camel-elasticsearch/src/main/docs/elasticsearch-component.adoc
index bd0e135..dadb762 100644
--- a/components/camel-elasticsearch/src/main/docs/elasticsearch-component.adoc
+++ b/components/camel-elasticsearch/src/main/docs/elasticsearch-component.adoc
@@ -35,13 +35,11 @@ The Elasticsearch 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| advanced
-| client |  | Client | To use an existing configured Elasticsearch client instead of creating a client per endpoint.
-
-| 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
+| **client** (advanced) | To use an existing configured Elasticsearch client instead of creating a client per endpoint. |  | Client
+| **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
 
@@ -58,39 +56,28 @@ 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
-| clusterName |  | String | *Required* Name of cluster or use local for local mode
+| Name | Description | Default | Type
+| **clusterName** | *Required* Name of cluster or use local for local mode |  | String
 |=======================================================================
 
 #### Query Parameters (11 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| clientTransportSniff | true | Boolean | Is the client allowed to sniff the rest of the cluster or not (default true). This setting map to the client.transport.sniff setting.
-
-| consistencyLevel | DEFAULT | WriteConsistencyLevel | The write consistency level to use with INDEX and BULK operations (can be any of ONE QUORUM ALL or DEFAULT)
-
-| data |  | Boolean | Is the node going to be allowed to allocate data (shards) to it or not. This setting map to the node.data setting.
-
-| indexName |  | String | The name of the index to act against
-
-| indexType |  | String | The type of the index to act against
-
-| ip |  | String | The TransportClient remote host ip to use
-
-| operation |  | String | What operation to perform
-
-| pathHome | ${user.home}/.elasticsearch | String | The path.home property of ElasticSearch configuration. You need to provide a valid path otherwise the default $user.home/.elasticsearch will be used.
-
-| port | 9300 | int | The TransportClient remote port to use (defaults to 9300)
-
-| transportAddresses |  | String | Comma separated list with ip:port formatted remote transport addresses to use. The ip and port options must be left blank for transportAddresses to be considered instead.
- 4+^s| advanced
-| 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
+| **clientTransportSniff** (producer) | Is the client allowed to sniff the rest of the cluster or not (default true). This setting map to the client.transport.sniff setting. | true | Boolean
+| **consistencyLevel** (producer) | The write consistency level to use with INDEX and BULK operations (can be any of ONE QUORUM ALL or DEFAULT) | DEFAULT | WriteConsistencyLevel
+| **data** (producer) | Is the node going to be allowed to allocate data (shards) to it or not. This setting map to the node.data setting. |  | Boolean
+| **indexName** (producer) | The name of the index to act against |  | String
+| **indexType** (producer) | The type of the index to act against |  | String
+| **ip** (producer) | The TransportClient remote host ip to use |  | String
+| **operation** (producer) | What operation to perform |  | String
+| **pathHome** (producer) | The path.home property of ElasticSearch configuration. You need to provide a valid path otherwise the default $user.home/.elasticsearch will be used. | ${user.home}/.elasticsearch | String
+| **port** (producer) | The TransportClient remote port to use (defaults to 9300) | 9300 | int
+| **transportAddresses** (producer) | Comma separated list with ip:port formatted remote transport addresses to use. The ip and port options must be left blank for transportAddresses to be considered instead. |  | 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
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-elasticsearch5/src/main/docs/elasticsearch5-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch5/src/main/docs/elasticsearch5-component.adoc b/components/camel-elasticsearch5/src/main/docs/elasticsearch5-component.adoc
index 58ec2cc..76590b1 100644
--- a/components/camel-elasticsearch5/src/main/docs/elasticsearch5-component.adoc
+++ b/components/camel-elasticsearch5/src/main/docs/elasticsearch5-component.adoc
@@ -47,35 +47,26 @@ 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
-| clusterName |  | String | *Required* Name of the cluster
+| Name | Description | Default | Type
+| **clusterName** | *Required* Name of the cluster |  | String
 |=======================================================================
 
 #### Query Parameters (9 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| clientTransportSniff | true | Boolean | Is the client allowed to sniff the rest of the cluster or not (default true). This setting map to the client.transport.sniff setting.
-
-| indexName |  | String | The name of the index to act against
-
-| indexType |  | String | The type of the index to act against
-
-| ip |  | String | The TransportClient remote host ip to use
-
-| operation |  | ElasticsearchOperation | What operation to perform
-
-| port | 9300 | int | The TransportClient remote port to use (defaults to 9300)
-
-| transportAddresses |  | String | Comma separated list with ip:port formatted remote transport addresses to use. The ip and port options must be left blank for transportAddresses to be considered instead.
-
-| waitForActiveShards | 1 | int | Index creation waits for the write consistency number of shards to be available
- 4+^s| advanced
-| 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
+| **clientTransportSniff** (producer) | Is the client allowed to sniff the rest of the cluster or not (default true). This setting map to the client.transport.sniff setting. | true | Boolean
+| **indexName** (producer) | The name of the index to act against |  | String
+| **indexType** (producer) | The type of the index to act against |  | String
+| **ip** (producer) | The TransportClient remote host ip to use |  | String
+| **operation** (producer) | What operation to perform |  | ElasticsearchOperation
+| **port** (producer) | The TransportClient remote port to use (defaults to 9300) | 9300 | int
+| **transportAddresses** (producer) | Comma separated list with ip:port formatted remote transport addresses to use. The ip and port options must be left blank for transportAddresses to be considered instead. |  | String
+| **waitForActiveShards** (producer) | Index creation waits for the write consistency number of shards to be available | 1 | int
+| **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
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-elsql/src/main/docs/elsql-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc b/components/camel-elsql/src/main/docs/elsql-component.adoc
index 17ce69e..0efcb8b 100644
--- a/components/camel-elsql/src/main/docs/elsql-component.adoc
+++ b/components/camel-elsql/src/main/docs/elsql-component.adoc
@@ -53,19 +53,14 @@ The ElSQL component supports 5 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
-| databaseVendor |  | ElSqlDatabaseVendor | To use a vendor specific com.opengamma.elsql.ElSqlConfig
-
-| dataSource |  | DataSource | Sets the DataSource to use to communicate with the database.
- 4+^s| advanced
-| elSqlConfig |  | ElSqlConfig | To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead.
- 4+^s| common
-| resourceUri |  | String | The resource file which contains the elsql SQL statements to use. You can specify multiple resources separated by comma. The resources are loaded on the classpath by default you can prefix with file: to load from file system. Notice you can set this option on the component and then you do not have to configure this on the endpoint.
- 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
+| **databaseVendor** (common) | To use a vendor specific com.opengamma.elsql.ElSqlConfig |  | ElSqlDatabaseVendor
+| **dataSource** (common) | Sets the DataSource to use to communicate with the database. |  | DataSource
+| **elSqlConfig** (advanced) | To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead. |  | ElSqlConfig
+| **resourceUri** (common) | The resource file which contains the elsql SQL statements to use. You can specify multiple resources separated by comma. The resources are loaded on the classpath by default you can prefix with file: to load from file system. Notice you can set this option on the component and then you do not have to configure this on the endpoint. |  | String
+| **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
 
@@ -78,112 +73,65 @@ with the following path and query parameters:
 
 #### Path Parameters (2 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| elsqlName |  | String | *Required* The name of the elsql to use (is NAMED in the elsql file)
-| resourceUri |  | String | The resource file which contains the elsql SQL statements to use. You can specify multiple resources separated by comma. The resources are loaded on the classpath by default you can prefix with file: to load from file system. Notice you can set this option on the component and then you do not have to configure this on the endpoint.
+| Name | Description | Default | Type
+| **elsqlName** | *Required* The name of the elsql to use (is NAMED in the elsql file) |  | String
+| **resourceUri** | The resource file which contains the elsql SQL statements to use. You can specify multiple resources separated by comma. The resources are loaded on the classpath by default you can prefix with file: to load from file system. Notice you can set this option on the component and then you do not have to configure this on the endpoint. |  | String
 |=======================================================================
 
 #### Query Parameters (47 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| allowNamedParameters | true | boolean | Whether to allow using named parameters in the queries.
-
-| databaseVendor |  | ElSqlDatabaseVendor | To use a vendor specific com.opengamma.elsql.ElSqlConfig
-
-| dataSource |  | DataSource | Sets the DataSource to use to communicate with the database.
-
-| dataSourceRef |  | String | Sets the reference to a DataSource to lookup from the registry to use for communicating with the database.
-
-| outputClass |  | String | Specify the full package and class name to use as conversion when outputType=SelectOne.
-
-| outputHeader |  | String | Store the query result in a header instead of the message body. By default outputHeader == null and the query result is stored in the message body any existing content in the message body is discarded. If outputHeader is set the value is used as the name of the header to store the query result and the original message body is preserved.
-
-| outputType | SelectList | SqlOutputType | Make the output of consumer or producer to SelectList as List of Map or SelectOne as single Java object in the following way:a) If the query has only single column then that JDBC Column object is returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object.b) If the query has more than one column then it will return a Map of that result.c) If the outputClass is set then it will convert the query result into an Java bean object by calling all the setters that match the column names.It will assume your class has a default constructor to create instance with.d) If the query resulted in more than one rows it throws an non-unique result exception.StreamList streams the result of the query using an Iterator. This can be used with the Splitter EIP in streaming mode to process the ResultSet in streaming fashion.
-
-| separator | , | char | The separator to use when parameter values is taken from message body (if the body is a String type) to be inserted at placeholders.Notice if you use named parameters then a Map type is used instead. The default value is comma
- 4+^s| consumer
-| breakBatchOnConsumeFail | false | boolean | Sets whether to break batch if onConsume failed.
-
-| 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.
-
-| expectedUpdateCount | -1 | int | Sets an expected update count to validate when using onConsume.
-
-| maxMessagesPerPoll |  | int | Sets the maximum number of messages to poll
-
-| onConsume |  | String | After processing each row then this query can be executed if the Exchange was processed successfully for example to mark the row as processed. The query can have parameter.
-
-| onConsumeBatchComplete |  | String | After processing the entire batch this query can be executed to bulk update rows etc. The query cannot have parameters.
-
-| onConsumeFailed |  | String | After processing each row then this query can be executed if the Exchange failed for example to mark the row as failed. The query can have parameter.
-
-| routeEmptyResultSet | false | boolean | Sets whether empty resultset should be allowed to be sent to the next hop. Defaults to false. So the empty resultset will be filtered out.
-
-| 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.
-
-| transacted | false | boolean | Enables or disables transaction. If enabled then if processing an exchange failed then the consumerbreak out processing any further exchanges to cause a rollback eager.
-
-| useIterator | true | boolean | Sets how resultset should be delivered to route. Indicates delivery as either a list or individual object. defaults to true.
- 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.
-
-| processingStrategy |  | SqlProcessingStrategy | Allows to plugin to use a custom org.apache.camel.component.sql.SqlProcessingStrategy to execute queries when the consumer has processed the rows/batch.
- 4+^s| producer
-| batch | false | boolean | Enables or disables batch mode
-
-| noop | false | boolean | If set will ignore the results of the SQL query and use the existing IN message as the OUT message for the continuation of processing
-
-| useMessageBodyForSql | false | boolean | Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used.
- 4+^s| producer (advanced)
-| alwaysPopulateStatement | false | boolean | If enabled then the populateStatement method from org.apache.camel.component.sql.SqlPrepareStatementStrategy is always invoked also if there is no expected parameters to be prepared. When this is false then the populateStatement is only invoked if there is 1 or more expected parameters to be set; for example this avoids reading the message body/headers for SQL queries with no parameters.
-
-| parametersCount |  | int | If set greater than zero then Camel will use this count value of parameters to replace instead of querying via JDBC metadata API. This is useful if the JDBC vendor could not return correct parameters count then user may override instead.
- 4+^s| advanced
-| elSqlConfig |  | ElSqlConfig | To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead.
-
-| placeholder | # | String | Specifies a character that will be replaced to in SQL query. Notice that it is simple String.replaceAll() operation and no SQL parsing is involved (quoted strings will also change).
-
-| prepareStatementStrategy |  | SqlPrepareStatementStrategy | Allows to plugin to use a custom org.apache.camel.component.sql.SqlPrepareStatementStrategy to control preparation of the query and prepared statement.
-
-| synchronous | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
-
-| templateOptions |  | Map | Configures the Spring JdbcTemplate with the key/values from the Map
-
-| usePlaceholder | true | boolean | Sets whether to use placeholder and replace all placeholder characters with sign in the SQL queries.
- 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
+| **allowNamedParameters** (common) | Whether to allow using named parameters in the queries. | true | boolean
+| **databaseVendor** (common) | To use a vendor specific com.opengamma.elsql.ElSqlConfig |  | ElSqlDatabaseVendor
+| **dataSource** (common) | Sets the DataSource to use to communicate with the database. |  | DataSource
+| **dataSourceRef** (common) | Sets the reference to a DataSource to lookup from the registry to use for communicating with the database. |  | String
+| **outputClass** (common) | Specify the full package and class name to use as conversion when outputType=SelectOne. |  | String
+| **outputHeader** (common) | Store the query result in a header instead of the message body. By default outputHeader == null and the query result is stored in the message body any existing content in the message body is discarded. If outputHeader is set the value is used as the name of the header to store the query result and the original message body is preserved. |  | String
+| **outputType** (common) | Make the output of consumer or producer to SelectList as List of Map or SelectOne as single Java object in the following way:a) If the query has only single column then that JDBC Column object is returned. (such as SELECT COUNT( ) FROM PROJECT will return a Long object.b) If the query has more than one column then it will return a Map of that result.c) If the outputClass is set then it will convert the query result into an Java bean object by calling all the setters that match the column names.It will assume your class has a default constructor to create instance with.d) If the query resulted in more than one rows it throws an non-unique result exception.StreamList streams the result of the query using an Iterator. This can be used with the Splitter EIP in streaming mode to process the ResultSet in streaming fashion. | SelectList | SqlOutputType
+| **separator** (common) | The separator to use when parameter values is taken from message body (if the body is a String type) to be inserted at placeholders.Notice if you use named parameters then a Map type is used instead. The default value is comma | , | char
+| **breakBatchOnConsumeFail** (consumer) | Sets whether to break batch if onConsume failed. | false | 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
+| **expectedUpdateCount** (consumer) | Sets an expected update count to validate when using onConsume. | -1 | int
+| **maxMessagesPerPoll** (consumer) | Sets the maximum number of messages to poll |  | int
+| **onConsume** (consumer) | After processing each row then this query can be executed if the Exchange was processed successfully for example to mark the row as processed. The query can have parameter. |  | String
+| **onConsumeBatchComplete** (consumer) | After processing the entire batch this query can be executed to bulk update rows etc. The query cannot have parameters. |  | String
+| **onConsumeFailed** (consumer) | After processing each row then this query can be executed if the Exchange failed for example to mark the row as failed. The query can have parameter. |  | String
+| **routeEmptyResultSet** (consumer) | Sets whether empty resultset should be allowed to be sent to the next hop. Defaults to false. So the empty resultset will be filtered out. | 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
+| **transacted** (consumer) | Enables or disables transaction. If enabled then if processing an exchange failed then the consumerbreak out processing any further exchanges to cause a rollback eager. | false | boolean
+| **useIterator** (consumer) | Sets how resultset should be delivered to route. Indicates delivery as either a list or individual object. defaults to true. | 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
+| **processingStrategy** (consumer) | Allows to plugin to use a custom org.apache.camel.component.sql.SqlProcessingStrategy to execute queries when the consumer has processed the rows/batch. |  | SqlProcessingStrategy
+| **batch** (producer) | Enables or disables batch mode | false | boolean
+| **noop** (producer) | If set will ignore the results of the SQL query and use the existing IN message as the OUT message for the continuation of processing | false | boolean
+| **useMessageBodyForSql** (producer) | Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used. | false | boolean
+| **alwaysPopulateStatement** (producer) | If enabled then the populateStatement method from org.apache.camel.component.sql.SqlPrepareStatementStrategy is always invoked also if there is no expected parameters to be prepared. When this is false then the populateStatement is only invoked if there is 1 or more expected parameters to be set; for example this avoids reading the message body/headers for SQL queries with no parameters. | false | boolean
+| **parametersCount** (producer) | If set greater than zero then Camel will use this count value of parameters to replace instead of querying via JDBC metadata API. This is useful if the JDBC vendor could not return correct parameters count then user may override instead. |  | int
+| **elSqlConfig** (advanced) | To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead. |  | ElSqlConfig
+| **placeholder** (advanced) | Specifies a character that will be replaced to in SQL query. Notice that it is simple String.replaceAll() operation and no SQL parsing is involved (quoted strings will also change). | # | String
+| **prepareStatementStrategy** (advanced) | Allows to plugin to use a custom org.apache.camel.component.sql.SqlPrepareStatementStrategy to control preparation of the query and prepared statement. |  | SqlPrepareStatement Strategy
+| **synchronous** (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| **templateOptions** (advanced) | Configures the Spring JdbcTemplate with the key/values from the Map |  | Map
+| **usePlaceholder** (advanced) | Sets whether to use placeholder and replace all placeholder characters with sign in the SQL queries. | true | 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-etcd/src/main/docs/etcd-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-etcd/src/main/docs/etcd-component.adoc b/components/camel-etcd/src/main/docs/etcd-component.adoc
index 925b8ea..1b45013 100644
--- a/components/camel-etcd/src/main/docs/etcd-component.adoc
+++ b/components/camel-etcd/src/main/docs/etcd-component.adoc
@@ -26,75 +26,46 @@ with the following path and query parameters:
 
 #### Path Parameters (2 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| namespace |  | EtcdNamespace | *Required* The API namespace to use
-| path |  | String | The path the endpoint refers to
+| Name | Description | Default | Type
+| **namespace** | *Required* The API namespace to use |  | EtcdNamespace
+| **path** | The path the endpoint refers to |  | String
 |=======================================================================
 
 #### Query Parameters (29 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| recursive | false | boolean | To apply an action recursively.
-
-| servicePath | /services/ | String | The path to look for for service discovery
-
-| timeout |  | Long | To set the maximum time an action could take to complete.
-
-| uris | http://localhost:2379,http://localhost:4001 | String | To set the URIs the client connects.
- 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.
-
-| sendEmptyExchangeOnTimeout | false | boolean | To send an empty message in case of timeout watching for a key.
-
-| 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.
-
-| fromIndex | 0 | Long | The index to watch from
-
-| 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
-| timeToLive |  | Integer | To set the lifespan of a key in milliseconds.
- 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.
- 4+^s| security
-| password |  | String | The password to use for basic authentication.
-
-| sslContextParameters |  | SSLContextParameters | To configure security using SSLContextParameters.
-
-| userName |  | String | The user name to use for basic authentication.
+| Name | Description | Default | Type
+| **recursive** (common) | To apply an action recursively. | false | boolean
+| **servicePath** (common) | The path to look for for service discovery | /services/ | String
+| **timeout** (common) | To set the maximum time an action could take to complete. |  | Long
+| **uris** (common) | To set the URIs the client connects. | http://localhost:2379,http://localhost:4001 | 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
+| **sendEmptyExchangeOnTimeout** (consumer) | To send an empty message in case of timeout watching for a key. | 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
+| **fromIndex** (consumer) | The index to watch from | 0 | Long
+| **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
+| **timeToLive** (producer) | To set the lifespan of a key in milliseconds. |  | Integer
+| **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
+| **password** (security) | The password to use for basic authentication. |  | String
+| **sslContextParameters** (security) | To configure security using SSLContextParameters. |  | SSLContextParameters
+| **userName** (security) | The user name to use for basic authentication. |  | String
 |=======================================================================
 // endpoint options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-eventadmin/src/main/docs/eventadmin-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-eventadmin/src/main/docs/eventadmin-component.adoc b/components/camel-eventadmin/src/main/docs/eventadmin-component.adoc
index de78d74..9fedc56 100644
--- a/components/camel-eventadmin/src/main/docs/eventadmin-component.adoc
+++ b/components/camel-eventadmin/src/main/docs/eventadmin-component.adoc
@@ -37,13 +37,11 @@ The OSGi EventAdmin 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
-| bundleContext |  | BundleContext | The OSGi BundleContext is automatic injected by Camel
- 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
+| **bundleContext** (common) | The OSGi BundleContext is automatic injected by Camel |  | BundleContext
+| **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
 
@@ -56,27 +54,22 @@ 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
-| topic |  | String | Name of topic to listen or send to
+| Name | Description | Default | Type
+| **topic** | Name of topic to listen or send to |  | String
 |=======================================================================
 
 #### Query Parameters (5 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| send | false | boolean | Whether to use 'send' or 'synchronous' deliver. Default false (async delivery)
- 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.
- 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| advanced
-| 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
+| **send** (common) | Whether to use 'send' or 'synchronous' deliver. Default false (async delivery) | false | 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
+| **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
+| **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
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-exec/src/main/docs/exec-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-exec/src/main/docs/exec-component.adoc b/components/camel-exec/src/main/docs/exec-component.adoc
index 73d0f46..57b952f 100644
--- a/components/camel-exec/src/main/docs/exec-component.adoc
+++ b/components/camel-exec/src/main/docs/exec-component.adoc
@@ -46,33 +46,25 @@ 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
-| executable |  | String | *Required* Sets the executable to be executed. The executable must not be empty or null.
+| Name | Description | Default | Type
+| **executable** | *Required* Sets the executable to be executed. The executable must not be empty or null. |  | String
 |=======================================================================
 
 #### Query Parameters (8 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| args |  | String | The arguments may be one or many whitespace-separated tokens.
-
-| binding |  | ExecBinding | A reference to a org.apache.commons.exec.ExecBinding in the Registry.
-
-| commandExecutor |  | ExecCommandExecutor | A reference to a org.apache.commons.exec.ExecCommandExecutor in the Registry that customizes the command execution. The default command executor utilizes the commons-exec library which adds a shutdown hook for every executed command.
-
-| outFile |  | String | The name of a file created by the executable that should be considered as its output. If no outFile is set the standard output (stdout) of the executable will be used instead.
-
-| timeout |  | long | The timeout in milliseconds after which the executable should be terminated. If execution has not completed within the timeout the component will send a termination request.
-
-| useStderrOnEmptyStdout | false | boolean | A boolean indicating that when stdout is empty this component will populate the Camel Message Body with stderr. This behavior is disabled (false) by default.
-
-| workingDir |  | String | The directory in which the command should be executed. If null the working directory of the current process will be used.
- 4+^s| advanced
-| 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
+| **args** (producer) | The arguments may be one or many whitespace-separated tokens. |  | String
+| **binding** (producer) | A reference to a org.apache.commons.exec.ExecBinding in the Registry. |  | ExecBinding
+| **commandExecutor** (producer) | A reference to a org.apache.commons.exec.ExecCommandExecutor in the Registry that customizes the command execution. The default command executor utilizes the commons-exec library which adds a shutdown hook for every executed command. |  | ExecCommandExecutor
+| **outFile** (producer) | The name of a file created by the executable that should be considered as its output. If no outFile is set the standard output (stdout) of the executable will be used instead. |  | String
+| **timeout** (producer) | The timeout in milliseconds after which the executable should be terminated. If execution has not completed within the timeout the component will send a termination request. |  | long
+| **useStderrOnEmptyStdout** (producer) | A boolean indicating that when stdout is empty this component will populate the Camel Message Body with stderr. This behavior is disabled (false) by default. | false | boolean
+| **workingDir** (producer) | The directory in which the command should be executed. If null the working directory of the current process will be used. |  | 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
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-facebook/src/main/docs/facebook-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/main/docs/facebook-component.adoc b/components/camel-facebook/src/main/docs/facebook-component.adoc
index a482af1..1823609 100644
--- a/components/camel-facebook/src/main/docs/facebook-component.adoc
+++ b/components/camel-facebook/src/main/docs/facebook-component.adoc
@@ -56,13 +56,11 @@ The Facebook 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| advanced
-| configuration |  | FacebookConfiguration | To use the shared configuration
-
-| 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
+| **configuration** (advanced) | To use the shared configuration |  | FacebookConfiguration
+| **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
 
@@ -79,221 +77,119 @@ 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
-| methodName |  | String | *Required* What operation to perform
+| Name | Description | Default | Type
+| **methodName** | *Required* What operation to perform |  | String
 |=======================================================================
 
 #### Query Parameters (102 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| achievementURL |  | URL | The unique URL of the achievement
-
-| albumId |  | String | The album ID
-
-| albumUpdate |  | AlbumUpdate | The facebook Album to be created or updated
-
-| appId |  | String | The ID of the Facebook Application
-
-| center |  | GeoLocation | Location latitude and longitude
-
-| checkinId |  | String | The checkin ID
-
-| checkinUpdate |  | CheckinUpdate | The checkin to be created. Deprecated instead create a Post with an attached location
-
-| clientURL |  | String | Facebook4J API client URL
-
-| clientVersion |  | String | Facebook4J client API version
-
-| commentId |  | String | The comment ID
-
-| commentUpdate |  | CommentUpdate | The facebook Comment to be created or updated
-
-| debugEnabled | false | Boolean | Enables deubg output. Effective only with the embedded logger
-
-| description |  | String | The description text
-
-| distance |  | Integer | Distance in meters
-
-| domainId |  | String | The domain ID
-
-| domainName |  | String | The domain name
-
-| domainNames |  | List | The domain names
-
-| eventId |  | String | The event ID
-
-| eventUpdate |  | EventUpdate | The event to be created or updated
-
-| friendId |  | String | The friend ID
-
-| friendlistId |  | String | The friend list ID
-
-| friendlistName |  | String | The friend list Name
-
-| friendUserId |  | String | The friend user ID
-
-| groupId |  | String | The group ID
-
-| gzipEnabled | true | Boolean | Use Facebook GZIP encoding
-
-| httpConnectionTimeout | 20000 | Integer | Http connection timeout in milliseconds
-
-| httpDefaultMaxPerRoute | 2 | Integer | HTTP maximum connections per route
-
-| httpMaxTotalConnections | 20 | Integer | HTTP maximum total connections
-
-| httpReadTimeout | 120000 | Integer | Http read timeout in milliseconds
-
-| httpRetryCount | 0 | Integer | Number of HTTP retries
-
-| httpRetryIntervalSeconds | 5 | Integer | HTTP retry interval in seconds
-
-| httpStreamingReadTimeout | 40000 | Integer | HTTP streaming read timeout in milliseconds
-
-| ids |  | List | The ids of users
-
-| inBody |  | String | Sets the name of a parameter to be passed in the exchange In Body
-
-| includeRead |  | Boolean | Enables notifications that the user has already read in addition to unread ones
-
-| isHidden |  | Boolean | Whether hidden
-
-| jsonStoreEnabled | false | Boolean | If set to true raw JSON forms will be stored in DataObjectFactory
-
-| link |  | URL | Link URL
-
-| linkId |  | String | Link ID
-
-| locale |  | Locale | Desired FQL locale
-
-| mbeanEnabled | false | Boolean | If set to true Facebook4J mbean will be registerd
-
-| message |  | String | The message text
-
-| messageId |  | String | The message ID
-
-| metric |  | String | The metric name
-
-| milestoneId |  | String | The milestone id
-
-| name |  | String | Test user name must be of the form 'first last'
-
-| noteId |  | String | The note ID
-
-| notificationId |  | String | The notification ID
-
-| objectId |  | String | The insight object ID
-
-| offerId |  | String | The offer id
-
-| optionDescription |  | String | The question's answer option description
-
-| pageId |  | String | The page id
-
-| permissionName |  | String | The permission name
-
-| permissions |  | String | Test user permissions in the format perm1perm2...
-
-| photoId |  | String | The photo ID
-
-| pictureId |  | Integer | The picture id
-
-| pictureId2 |  | Integer | The picture2 id
-
-| pictureSize |  | PictureSize | The picture size
-
-| placeId |  | String | The place ID
-
-| postId |  | String | The post ID
-
-| postUpdate |  | PostUpdate | The post to create or update
-
-| prettyDebugEnabled | false | Boolean | Prettify JSON debug output if set to true
-
-| queries |  | Map | FQL queries
-
-| query |  | String | FQL query or search terms for search endpoints
-
-| questionId |  | String | The question id
-
-| reading |  | Reading | Optional reading parameters. See Reading Options(reading)
-
-| readingOptions |  | Map | To configure Reading using key/value pairs from the Map.
-
-| restBaseURL | https://graph.facebook.com/ | String | API base URL
-
-| scoreValue |  | Integer | The numeric score with value
-
-| size |  | PictureSize | The picture size one of large normal small or square
-
-| source |  | Media | The media content from either a java.io.File or java.io.Inputstream
-
-| subject |  | String | The note of the subject
-
-| tabId |  | String | The tab id
-
-| tagUpdate |  | TagUpdate | Photo tag information
-
-| testUser1 |  | TestUser | Test user 1
-
-| testUser2 |  | TestUser | Test user 2
-
-| testUserId |  | String | The ID of the test user
-
-| title |  | String | The title text
-
-| toUserId |  | String | The ID of the user to tag
-
-| toUserIds |  | List | The IDs of the users to tag
-
-| userId |  | String | The Facebook user ID
-
-| userId1 |  | String | The ID of a user 1
-
-| userId2 |  | String | The ID of a user 2
-
-| userIds |  | List | The IDs of users to invite to event
-
-| userLocale |  | String | The test user locale
-
-| useSSL | true | Boolean | Use SSL
-
-| videoBaseURL | https://graph-video.facebook.com/ | String | Video API base URL
-
-| videoId |  | String | The video ID
- 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.
- 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| advanced
-| synchronous | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
- 4+^s| proxy
-| httpProxyHost |  | String | HTTP proxy server host name
-
-| httpProxyPassword |  | String | HTTP proxy server password
-
-| httpProxyPort |  | Integer | HTTP proxy server port
-
-| httpProxyUser |  | String | HTTP proxy server user name
- 4+^s| security
-| oAuthAccessToken |  | String | The user access token
-
-| oAuthAccessTokenURL | https://graph.facebook.com/oauth/access_token | String | OAuth access token URL
-
-| oAuthAppId |  | String | The application Id
-
-| oAuthAppSecret |  | String | The application Secret
-
-| oAuthAuthorizationURL | https://www.facebook.com/dialog/oauth | String | OAuth authorization URL
-
-| oAuthPermissions |  | String | Default OAuth permissions. Comma separated permission names. See https://developers.facebook.com/docs/reference/login/permissions for the detail
+| Name | Description | Default | Type
+| **achievementURL** (common) | The unique URL of the achievement |  | URL
+| **albumId** (common) | The album ID |  | String
+| **albumUpdate** (common) | The facebook Album to be created or updated |  | AlbumUpdate
+| **appId** (common) | The ID of the Facebook Application |  | String
+| **center** (common) | Location latitude and longitude |  | GeoLocation
+| **checkinId** (common) | The checkin ID |  | String
+| **checkinUpdate** (common) | The checkin to be created. Deprecated instead create a Post with an attached location |  | CheckinUpdate
+| **clientURL** (common) | Facebook4J API client URL |  | String
+| **clientVersion** (common) | Facebook4J client API version |  | String
+| **commentId** (common) | The comment ID |  | String
+| **commentUpdate** (common) | The facebook Comment to be created or updated |  | CommentUpdate
+| **debugEnabled** (common) | Enables deubg output. Effective only with the embedded logger | false | Boolean
+| **description** (common) | The description text |  | String
+| **distance** (common) | Distance in meters |  | Integer
+| **domainId** (common) | The domain ID |  | String
+| **domainName** (common) | The domain name |  | String
+| **domainNames** (common) | The domain names |  | List
+| **eventId** (common) | The event ID |  | String
+| **eventUpdate** (common) | The event to be created or updated |  | EventUpdate
+| **friendId** (common) | The friend ID |  | String
+| **friendlistId** (common) | The friend list ID |  | String
+| **friendlistName** (common) | The friend list Name |  | String
+| **friendUserId** (common) | The friend user ID |  | String
+| **groupId** (common) | The group ID |  | String
+| **gzipEnabled** (common) | Use Facebook GZIP encoding | true | Boolean
+| **httpConnectionTimeout** (common) | Http connection timeout in milliseconds | 20000 | Integer
+| **httpDefaultMaxPerRoute** (common) | HTTP maximum connections per route | 2 | Integer
+| **httpMaxTotalConnections** (common) | HTTP maximum total connections | 20 | Integer
+| **httpReadTimeout** (common) | Http read timeout in milliseconds | 120000 | Integer
+| **httpRetryCount** (common) | Number of HTTP retries | 0 | Integer
+| **httpRetryIntervalSeconds** (common) | HTTP retry interval in seconds | 5 | Integer
+| **httpStreamingReadTimeout** (common) | HTTP streaming read timeout in milliseconds | 40000 | Integer
+| **ids** (common) | The ids of users |  | List
+| **inBody** (common) | Sets the name of a parameter to be passed in the exchange In Body |  | String
+| **includeRead** (common) | Enables notifications that the user has already read in addition to unread ones |  | Boolean
+| **isHidden** (common) | Whether hidden |  | Boolean
+| **jsonStoreEnabled** (common) | If set to true raw JSON forms will be stored in DataObjectFactory | false | Boolean
+| **link** (common) | Link URL |  | URL
+| **linkId** (common) | Link ID |  | String
+| **locale** (common) | Desired FQL locale |  | Locale
+| **mbeanEnabled** (common) | If set to true Facebook4J mbean will be registerd | false | Boolean
+| **message** (common) | The message text |  | String
+| **messageId** (common) | The message ID |  | String
+| **metric** (common) | The metric name |  | String
+| **milestoneId** (common) | The milestone id |  | String
+| **name** (common) | Test user name must be of the form 'first last' |  | String
+| **noteId** (common) | The note ID |  | String
+| **notificationId** (common) | The notification ID |  | String
+| **objectId** (common) | The insight object ID |  | String
+| **offerId** (common) | The offer id |  | String
+| **optionDescription** (common) | The question's answer option description |  | String
+| **pageId** (common) | The page id |  | String
+| **permissionName** (common) | The permission name |  | String
+| **permissions** (common) | Test user permissions in the format perm1perm2... |  | String
+| **photoId** (common) | The photo ID |  | String
+| **pictureId** (common) | The picture id |  | Integer
+| **pictureId2** (common) | The picture2 id |  | Integer
+| **pictureSize** (common) | The picture size |  | PictureSize
+| **placeId** (common) | The place ID |  | String
+| **postId** (common) | The post ID |  | String
+| **postUpdate** (common) | The post to create or update |  | PostUpdate
+| **prettyDebugEnabled** (common) | Prettify JSON debug output if set to true | false | Boolean
+| **queries** (common) | FQL queries |  | Map
+| **query** (common) | FQL query or search terms for search endpoints |  | String
+| **questionId** (common) | The question id |  | String
+| **reading** (common) | Optional reading parameters. See Reading Options(reading) |  | Reading
+| **readingOptions** (common) | To configure Reading using key/value pairs from the Map. |  | Map
+| **restBaseURL** (common) | API base URL | https://graph.facebook.com/ | String
+| **scoreValue** (common) | The numeric score with value |  | Integer
+| **size** (common) | The picture size one of large normal small or square |  | PictureSize
+| **source** (common) | The media content from either a java.io.File or java.io.Inputstream |  | Media
+| **subject** (common) | The note of the subject |  | String
+| **tabId** (common) | The tab id |  | String
+| **tagUpdate** (common) | Photo tag information |  | TagUpdate
+| **testUser1** (common) | Test user 1 |  | TestUser
+| **testUser2** (common) | Test user 2 |  | TestUser
+| **testUserId** (common) | The ID of the test user |  | String
+| **title** (common) | The title text |  | String
+| **toUserId** (common) | The ID of the user to tag |  | String
+| **toUserIds** (common) | The IDs of the users to tag |  | List
+| **userId** (common) | The Facebook user ID |  | String
+| **userId1** (common) | The ID of a user 1 |  | String
+| **userId2** (common) | The ID of a user 2 |  | String
+| **userIds** (common) | The IDs of users to invite to event |  | List
+| **userLocale** (common) | The test user locale |  | String
+| **useSSL** (common) | Use SSL | true | Boolean
+| **videoBaseURL** (common) | Video API base URL | https://graph-video.facebook.com/ | String
+| **videoId** (common) | The video ID |  | 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
+| **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
+| **synchronous** (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| **httpProxyHost** (proxy) | HTTP proxy server host name |  | String
+| **httpProxyPassword** (proxy) | HTTP proxy server password |  | String
+| **httpProxyPort** (proxy) | HTTP proxy server port |  | Integer
+| **httpProxyUser** (proxy) | HTTP proxy server user name |  | String
+| **oAuthAccessToken** (security) | The user access token |  | String
+| **oAuthAccessTokenURL** (security) | OAuth access token URL | https://graph.facebook.com/oauth/access_token | String
+| **oAuthAppId** (security) | The application Id |  | String
+| **oAuthAppSecret** (security) | The application Secret |  | String
+| **oAuthAuthorizationURL** (security) | OAuth authorization URL | https://www.facebook.com/dialog/oauth | String
+| **oAuthPermissions** (security) | Default OAuth permissions. Comma separated permission names. See https://developers.facebook.com/docs/reference/login/permissions for the detail |  | String
 |=======================================================================
 // endpoint options: END
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-flatpack/src/main/docs/flatpack-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-flatpack/src/main/docs/flatpack-component.adoc b/components/camel-flatpack/src/main/docs/flatpack-component.adoc
index 2ec6b1b..5a48d6c 100644
--- a/components/camel-flatpack/src/main/docs/flatpack-component.adoc
+++ b/components/camel-flatpack/src/main/docs/flatpack-component.adoc
@@ -53,68 +53,43 @@ with the following path and query parameters:
 
 #### Path Parameters (2 parameters):
 
-[width="100%",cols="2,1,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-| type | delim | FlatpackType | Whether to use fixed or delimiter
-| resourceUri |  | String | *Required* URL for loading the flatpack mapping file from classpath or file system
+| Name | Description | Default | Type
+| **type** | Whether to use fixed or delimiter | delim | FlatpackType
+| **resourceUri** | *Required* URL for loading the flatpack mapping file from classpath or file system |  | String
 |=======================================================================
 
 #### Query Parameters (25 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| allowShortLines | false | boolean | Allows for lines to be shorter than expected and ignores the extra characters
-
-| delimiter | , | char | The default character delimiter for delimited files.
-
-| ignoreExtraColumns | false | boolean | Allows for lines to be longer than expected and ignores the extra characters
-
-| ignoreFirstRecord | true | boolean | Whether the first line is ignored for delimited files (for the column headers).
-
-| splitRows | true | boolean | Sets the Component to send each row as a separate exchange once parsed
-
-| textQualifier |  | char | The text qualifier for delimited 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.
-
-| 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
+| **allowShortLines** (common) | Allows for lines to be shorter than expected and ignores the extra characters | false | boolean
+| **delimiter** (common) | The default character delimiter for delimited files. | , | char
+| **ignoreExtraColumns** (common) | Allows for lines to be longer than expected and ignores the extra characters | false | boolean
+| **ignoreFirstRecord** (common) | Whether the first line is ignored for delimited files (for the column headers). | true | boolean
+| **splitRows** (common) | Sets the Component to send each row as a separate exchange once parsed | true | boolean
+| **textQualifier** (common) | The text qualifier for delimited files. |  | char
+| **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-flink/src/main/docs/flink-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-flink/src/main/docs/flink-component.adoc b/components/camel-flink/src/main/docs/flink-component.adoc
index 976349c..c581d61 100644
--- a/components/camel-flink/src/main/docs/flink-component.adoc
+++ b/components/camel-flink/src/main/docs/flink-component.adoc
@@ -47,29 +47,23 @@ 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
-| endpointType |  | EndpointType | *Required* Type of the endpoint (dataset datastream).
+| Name | Description | Default | Type
+| **endpointType** | *Required* Type of the endpoint (dataset datastream). |  | EndpointType
 |=======================================================================
 
 #### Query Parameters (6 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| collect | true | boolean | Indicates if results should be collected or counted.
-
-| dataSet |  | DataSet | DataSet to compute against.
-
-| dataSetCallback |  | DataSetCallback | Function performing action against a DataSet.
-
-| dataStream |  | DataStream | DataStream to compute against.
-
-| dataStreamCallback |  | DataStreamCallback | Function performing action against a DataStream.
- 4+^s| advanced
-| 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
+| **collect** (producer) | Indicates if results should be collected or counted. | true | boolean
+| **dataSet** (producer) | DataSet to compute against. |  | DataSet
+| **dataSetCallback** (producer) | Function performing action against a DataSet. |  | DataSetCallback
+| **dataStream** (producer) | DataStream to compute against. |  | DataStream
+| **dataStreamCallback** (producer) | Function performing action against a DataStream. |  | DataStreamCallback
+| **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
 
@@ -85,19 +79,14 @@ The Apache Flink component supports 5 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| producer
-| dataSet |  | DataSet | DataSet to compute against.
-
-| dataStream |  | DataStream | DataStream to compute against.
-
-| dataSetCallback |  | DataSetCallback | Function performing action against a DataSet.
-
-| dataStreamCallback |  | DataStreamCallback | Function performing action against a DataStream.
- 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
+| **dataSet** (producer) | DataSet to compute against. |  | DataSet
+| **dataStream** (producer) | DataStream to compute against. |  | DataStream
+| **dataSetCallback** (producer) | Function performing action against a DataSet. |  | DataSetCallback
+| **dataStreamCallback** (producer) | Function performing action against a DataStream. |  | DataStreamCallback
+| **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
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db81a114/components/camel-fop/src/main/docs/fop-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-fop/src/main/docs/fop-component.adoc b/components/camel-fop/src/main/docs/fop-component.adoc
index f2c784f..0b79ace 100644
--- a/components/camel-fop/src/main/docs/fop-component.adoc
+++ b/components/camel-fop/src/main/docs/fop-component.adoc
@@ -76,23 +76,20 @@ 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
-| outputType |  | FopOutputType | *Required* The primary output format is PDF but other output formats are also supported.
+| Name | Description | Default | Type
+| **outputType** | *Required* The primary output format is PDF but other output formats are also supported. |  | FopOutputType
 |=======================================================================
 
 #### Query Parameters (3 parameters):
 
-[width="100%",cols="2,1m,1m,6",options="header"]
+[width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
-| Name | Default | Java Type | Description
-
-| fopFactory |  | FopFactory | Allows to use a custom configured or implementation of org.apache.fop.apps.FopFactory.
-
-| userConfigURL |  | String | The location of a configuration file which can be loaded from classpath or file system.
- 4+^s| advanced
-| 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
+| **fopFactory** (producer) | Allows to use a custom configured or implementation of org.apache.fop.apps.FopFactory. |  | FopFactory
+| **userConfigURL** (producer) | The location of a configuration file which can be loaded from classpath or file system. |  | 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