http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-restlet/src/main/docs/restlet-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/docs/restlet-component.adoc 
b/components/camel-restlet/src/main/docs/restlet-component.adoc
index 9006cfd..9c0b71e 100644
--- a/components/camel-restlet/src/main/docs/restlet-component.adoc
+++ b/components/camel-restlet/src/main/docs/restlet-component.adoc
@@ -74,26 +74,26 @@ The Restlet component supports 20 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| controllerDaemon |  |  | Boolean | Indicates if the controller thread should 
be a daemon (not blocking JVM exit).
-| controllerSleepTimeMs |  |  | Integer | Time for the controller thread to 
sleep between each control.
-| inboundBufferSize |  |  | Integer | The size of the buffer when reading 
messages.
-| maxConnectionsPerHost |  |  | Integer | Maximum number of concurrent 
connections per host (IP address).
-| maxThreads |  |  | Integer | Maximum threads that will service requests.
-| lowThreads |  |  | Integer | Number of worker threads determining when the 
connector is considered overloaded.
-| maxTotalConnections |  |  | Integer | Maximum number of concurrent 
connections in total.
-| minThreads |  |  | Integer | Minimum threads waiting to service requests.
-| outboundBufferSize |  |  | Integer | The size of the buffer when writing 
messages.
-| persistingConnections |  |  | Boolean | Indicates if connections should be 
kept alive after a call.
-| pipeliningConnections |  |  | Boolean | Indicates if pipelining connections 
are supported.
-| threadMaxIdleTimeMs |  |  | Integer | Time for an idle thread to wait for an 
operation before being collected.
-| useForwardedForHeader |  |  | Boolean | Lookup the X-Forwarded-For header 
supported by popular proxies and caches and uses it to populate the 
Request.getClientAddresses() method result. This information is only safe for 
intermediary components within your local network. Other addresses could easily 
be changed by setting a fake header and should not be trusted for serious 
security checks.
-| reuseAddress |  |  | Boolean | Enable/disable the SO_REUSEADDR socket 
option. See java.io.ServerSocketreuseAddress property for additional details.
-| maxQueued |  |  | Integer | Maximum number of calls that can be queued if 
there aren't any worker thread available to service them. If the value is '0' 
then no queue is used and calls are rejected if no worker thread is immediately 
available. If the value is '-1' then an unbounded queue is used and calls are 
never rejected.
-| disableStreamCache |  | false | boolean | Determines whether or not the raw 
input stream from Restlet 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 Restlet input stream to support reading it multiple times to ensure 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. DefaultRestletBinding 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.
-| port |  |  | int | To configure the port number for the restlet consumer 
routes. This allows to configure this once to reuse the same port for these 
consumers.
-| synchronous |  |  | Boolean | Whether to use synchronous Restlet Client for 
the producer. Setting this option to true can yield faster performance as it 
seems the Restlet synchronous Client works better.
-| enabledConverters |  |  | List | A list of converters to enable as full 
class name or simple class name. All the converters automatically registered 
are enabled if empty or null
-| headerFilterStrategy |  |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
+| controllerDaemon | consumer (advanced) |  | Boolean | Indicates if the 
controller thread should be a daemon (not blocking JVM exit).
+| controllerSleepTimeMs | consumer (advanced) |  | Integer | Time for the 
controller thread to sleep between each control.
+| inboundBufferSize | consumer |  | Integer | The size of the buffer when 
reading messages.
+| maxConnectionsPerHost | common |  | Integer | Maximum number of concurrent 
connections per host (IP address).
+| maxThreads | consumer (advanced) |  | Integer | Maximum threads that will 
service requests.
+| lowThreads | consumer (advanced) |  | Integer | Number of worker threads 
determining when the connector is considered overloaded.
+| maxTotalConnections | common |  | Integer | Maximum number of concurrent 
connections in total.
+| minThreads | consumer (advanced) |  | Integer | Minimum threads waiting to 
service requests.
+| outboundBufferSize | consumer |  | Integer | The size of the buffer when 
writing messages.
+| persistingConnections | consumer (advanced) |  | Boolean | Indicates if 
connections should be kept alive after a call.
+| pipeliningConnections | consumer (advanced) |  | Boolean | Indicates if 
pipelining connections are supported.
+| threadMaxIdleTimeMs | consumer (advanced) |  | Integer | Time for an idle 
thread to wait for an operation before being collected.
+| useForwardedForHeader | consumer |  | Boolean | Lookup the X-Forwarded-For 
header supported by popular proxies and caches and uses it to populate the 
Request.getClientAddresses() method result. This information is only safe for 
intermediary components within your local network. Other addresses could easily 
be changed by setting a fake header and should not be trusted for serious 
security checks.
+| reuseAddress | consumer |  | Boolean | Enable/disable the SO_REUSEADDR 
socket option. See java.io.ServerSocketreuseAddress property for additional 
details.
+| maxQueued | consumer (advanced) |  | Integer | Maximum number of calls that 
can be queued if there aren't any worker thread available to service them. If 
the value is '0' then no queue is used and calls are rejected if no worker 
thread is immediately available. If the value is '-1' then an unbounded queue 
is used and calls are never rejected.
+| disableStreamCache | consumer (advanced) | false | boolean | Determines 
whether or not the raw input stream from Restlet 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 Restlet input stream to support reading it 
multiple times to ensure 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. 
DefaultRestletBinding 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.
+| port | consumer |  | int | To configure the port number for the restlet 
consumer routes. This allows to configure this once to reuse the same port for 
these consumers.
+| synchronous | producer |  | Boolean | Whether to use synchronous Restlet 
Client for the producer. Setting this option to true can yield faster 
performance as it seems the Restlet synchronous Client works better.
+| enabledConverters | advanced |  | List | A list of converters to enable as 
full class name or simple class name. All the converters automatically 
registered are enabled if empty or null
+| headerFilterStrategy | filter |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
----------------------------------------------------------------------
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
 
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index 7ab485c..8913525 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -462,22 +462,22 @@ The Salesforce component supports 16 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| loginConfig |  |  | SalesforceLoginConfig | To use the shared 
SalesforceLoginConfig as login configuration
-| config |  |  | SalesforceEndpointConfig | To use the shared 
SalesforceLoginConfig as configuration
-| httpClientProperties |  |  | Map | Used for configuring HTTP client 
properties as key/value pairs
-| sslContextParameters |  |  | SSLContextParameters | To configure security 
using SSLContextParameters
-| httpProxyHost |  |  | String | To configure HTTP proxy host
-| httpProxyPort |  |  | Integer | To configure HTTP proxy port
-| httpProxyUsername |  |  | String | To configure HTTP proxy username
-| httpProxyPassword |  |  | String | To configure HTTP proxy password
-| isHttpProxySocks4 |  | false | boolean | Enable for Socks4 proxy false by 
default
-| isHttpProxySecure |  | false | boolean | Enable for TLS connections true by 
default
-| httpProxyIncludedAddresses |  |  | Set | HTTP proxy included addresses
-| httpProxyExcludedAddresses |  |  | Set | HTTP proxy excluded addresses
-| httpProxyAuthUri |  |  | String | HTTP proxy authentication URI
-| httpProxyRealm |  |  | String | HTTP proxy authentication realm
-| httpProxyUseDigestAuth |  | false | boolean | Use HTTP proxy Digest 
authentication false by default
-| packages |  |  | String[] | Package names to scan for DTO classes (multiple 
packages can be separated by comma).
+| loginConfig | security |  | SalesforceLoginConfig | To use the shared 
SalesforceLoginConfig as login configuration
+| config | advanced |  | SalesforceEndpointConfig | To use the shared 
SalesforceLoginConfig as configuration
+| httpClientProperties | advanced |  | Map | Used for configuring HTTP client 
properties as key/value pairs
+| sslContextParameters | security |  | SSLContextParameters | To configure 
security using SSLContextParameters
+| httpProxyHost | proxy |  | String | To configure HTTP proxy host
+| httpProxyPort | proxy |  | Integer | To configure HTTP proxy port
+| httpProxyUsername | security |  | String | To configure HTTP proxy username
+| httpProxyPassword | security |  | String | To configure HTTP proxy password
+| isHttpProxySocks4 | proxy | false | boolean | Enable for Socks4 proxy false 
by default
+| isHttpProxySecure | security | false | boolean | Enable for TLS connections 
true by default
+| httpProxyIncludedAddresses | proxy |  | Set | HTTP proxy included addresses
+| httpProxyExcludedAddresses | proxy |  | Set | HTTP proxy excluded addresses
+| httpProxyAuthUri | security |  | String | HTTP proxy authentication URI
+| httpProxyRealm | security |  | String | HTTP proxy authentication realm
+| httpProxyUseDigestAuth | security | false | boolean | Use HTTP proxy Digest 
authentication false by default
+| packages | common |  | String[] | Package names to scan for DTO classes 
(multiple packages can be separated by comma).
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-saxon/src/main/docs/xquery-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/main/docs/xquery-component.adoc 
b/components/camel-saxon/src/main/docs/xquery-component.adoc
index 6a3cad9..159f14c 100644
--- a/components/camel-saxon/src/main/docs/xquery-component.adoc
+++ b/components/camel-saxon/src/main/docs/xquery-component.adoc
@@ -25,7 +25,7 @@ The XQuery component supports 1 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| moduleURIResolver |  |  | ModuleURIResolver | To use the custom 
ModuleURIResolver
+| moduleURIResolver | advanced |  | ModuleURIResolver | To use the custom 
ModuleURIResolver
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-servicenow/src/main/docs/servicenow-component.adoc
----------------------------------------------------------------------
diff --git 
a/components/camel-servicenow/src/main/docs/servicenow-component.adoc 
b/components/camel-servicenow/src/main/docs/servicenow-component.adoc
index 9cc703b..4feba12 100644
--- a/components/camel-servicenow/src/main/docs/servicenow-component.adoc
+++ b/components/camel-servicenow/src/main/docs/servicenow-component.adoc
@@ -44,13 +44,13 @@ The ServiceNow component supports 7 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| configuration |  |  | ServiceNowConfiguration | The ServiceNow default 
configuration
-| apiUrl |  |  | String | The ServiceNow REST API url
-| userName |  |  | String | ServiceNow user account name
-| password |  |  | String | ServiceNow account password
-| oauthClientId |  |  | String | OAuth2 ClientID
-| oauthClientSecret |  |  | String | OAuth2 ClientSecret
-| oauthTokenUrl |  |  | String | OAuth token Url
+| configuration | advanced |  | ServiceNowConfiguration | The ServiceNow 
default configuration
+| apiUrl | producer |  | String | The ServiceNow REST API url
+| userName | security |  | String | ServiceNow user account name
+| password | security |  | String | ServiceNow account password
+| oauthClientId | security |  | String | OAuth2 ClientID
+| oauthClientSecret | security |  | String | OAuth2 ClientSecret
+| oauthTokenUrl | security |  | String | OAuth token Url
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-servlet/src/main/docs/servlet-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-servlet/src/main/docs/servlet-component.adoc 
b/components/camel-servlet/src/main/docs/servlet-component.adoc
index 7fc4561..40bf31d 100644
--- a/components/camel-servlet/src/main/docs/servlet-component.adoc
+++ b/components/camel-servlet/src/main/docs/servlet-component.adoc
@@ -54,13 +54,13 @@ The Servlet component supports 7 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| servletName |  |  | String | Default name of servlet to use. The default 
name is CamelServlet.
-| httpRegistry |  |  | HttpRegistry | To use a custom 
org.apache.camel.component.servlet.HttpRegistry.
-| attachmentMultipartBinding |  | false | boolean | Whether to automatic bind 
multipart/form-data as attachments on the Camel Exchange. The options 
attachmentMultipartBinding=true and disableStreamCache=false cannot work 
together. Remove disableStreamCache to use AttachmentMultipartBinding. This is 
turn off by default as this may require servlet specific configuration to 
enable this when using Servlet's.
-| 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.
-| headerFilterStrategy |  |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
+| servletName | consumer |  | String | Default name of servlet to use. The 
default name is CamelServlet.
+| httpRegistry | consumer |  | HttpRegistry | To use a custom 
org.apache.camel.component.servlet.HttpRegistry.
+| attachmentMultipartBinding | consumer | false | boolean | Whether to 
automatic bind multipart/form-data as attachments on the Camel Exchange. The 
options attachmentMultipartBinding=true and disableStreamCache=false cannot 
work together. Remove disableStreamCache to use AttachmentMultipartBinding. 
This is turn off by default as this may require servlet specific configuration 
to enable this when using Servlet's.
+| httpBinding | advanced |  | HttpBinding | To use a custom HttpBinding to 
control the mapping between Camel message and HttpClient.
+| httpConfiguration | advanced |  | HttpConfiguration | To use the shared 
HttpConfiguration as base configuration.
+| allowJavaSerializedObject | advanced | 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.
+| headerFilterStrategy | filter |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/docs/sjms-batch-component.adoc 
b/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
index 03f7c81..5892047 100644
--- a/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
+++ b/components/camel-sjms/src/main/docs/sjms-batch-component.adoc
@@ -125,8 +125,8 @@ The Simple JMS Batch component supports 2 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| connectionFactory |  |  | ConnectionFactory | A ConnectionFactory is 
required to enable the SjmsBatchComponent.
-| headerFilterStrategy |  |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
+| connectionFactory | advanced |  | ConnectionFactory | A ConnectionFactory is 
required to enable the SjmsBatchComponent.
+| headerFilterStrategy | filter |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-sjms/src/main/docs/sjms-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/docs/sjms-component.adoc 
b/components/camel-sjms/src/main/docs/sjms-component.adoc
index f528e56..34c3fff 100644
--- a/components/camel-sjms/src/main/docs/sjms-component.adoc
+++ b/components/camel-sjms/src/main/docs/sjms-component.adoc
@@ -112,15 +112,15 @@ The Simple JMS component supports 9 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| connectionFactory |  |  | ConnectionFactory | A ConnectionFactory is 
required to enable the SjmsComponent. It can be set directly or set set as part 
of a ConnectionResource.
-| connectionResource |  |  | ConnectionResource | A ConnectionResource is an 
interface that allows for customization and container control of the 
ConnectionFactory. See Plugable Connection Resource Management for further 
details.
-| connectionCount |  | 1 | Integer | The maximum number of connections 
available to endpoints started under this component
-| jmsKeyFormatStrategy |  |  | JmsKeyFormatStrategy | Pluggable strategy for 
encoding and decoding JMS keys so they can be compliant with the JMS 
specification. Camel provides one implementation out of the box: default. The 
default strategy will safely marshal dots and hyphens (. and -). Can be used 
for JMS brokers which do not care whether JMS header keys contain illegal 
characters. You can provide your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation.
-| transactionCommitStrategy |  |  | TransactionCommitStrategy | To configure 
which kind of commit strategy to use. Camel provides two implementations out of 
the box default and batch.
-| destinationCreationStrategy |  |  | DestinationCreationStrategy | To use a 
custom DestinationCreationStrategy.
-| timedTaskManager |  |  | TimedTaskManager | To use a custom TimedTaskManager
-| messageCreatedStrategy |  |  | MessageCreatedStrategy | To use the given 
MessageCreatedStrategy which are invoked when Camel creates new instances of 
javax.jms.Message objects when Camel is sending a JMS message.
-| headerFilterStrategy |  |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
+| connectionFactory | advanced |  | ConnectionFactory | A ConnectionFactory is 
required to enable the SjmsComponent. It can be set directly or set set as part 
of a ConnectionResource.
+| connectionResource | advanced |  | ConnectionResource | A ConnectionResource 
is an interface that allows for customization and container control of the 
ConnectionFactory. See Plugable Connection Resource Management for further 
details.
+| connectionCount | common | 1 | Integer | The maximum number of connections 
available to endpoints started under this component
+| jmsKeyFormatStrategy | advanced |  | JmsKeyFormatStrategy | Pluggable 
strategy for encoding and decoding JMS keys so they can be compliant with the 
JMS specification. Camel provides one implementation out of the box: default. 
The default strategy will safely marshal dots and hyphens (. and -). Can be 
used for JMS brokers which do not care whether JMS header keys contain illegal 
characters. You can provide your own implementation of the 
org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the 
notation.
+| transactionCommitStrategy | transaction |  | TransactionCommitStrategy | To 
configure which kind of commit strategy to use. Camel provides two 
implementations out of the box default and batch.
+| destinationCreationStrategy | advanced |  | DestinationCreationStrategy | To 
use a custom DestinationCreationStrategy.
+| timedTaskManager | advanced |  | TimedTaskManager | To use a custom 
TimedTaskManager
+| messageCreatedStrategy | advanced |  | MessageCreatedStrategy | To use the 
given MessageCreatedStrategy which are invoked when Camel creates new instances 
of javax.jms.Message objects when Camel is sending a JMS message.
+| headerFilterStrategy | filter |  | HeaderFilterStrategy | To use a custom 
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel 
message.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-slack/src/main/docs/slack-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-slack/src/main/docs/slack-component.adoc 
b/components/camel-slack/src/main/docs/slack-component.adoc
index 4eae3ac..5d65ad2 100644
--- a/components/camel-slack/src/main/docs/slack-component.adoc
+++ b/components/camel-slack/src/main/docs/slack-component.adoc
@@ -56,7 +56,7 @@ The Slack component supports 1 options which are listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| webhookUrl |  |  | String | The incoming webhook URL
+| webhookUrl | producer |  | String | The incoming webhook URL
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-smpp/src/main/docs/smpp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/docs/smpp-component.adoc 
b/components/camel-smpp/src/main/docs/smpp-component.adoc
index 4167da9..85096f2 100644
--- a/components/camel-smpp/src/main/docs/smpp-component.adoc
+++ b/components/camel-smpp/src/main/docs/smpp-component.adoc
@@ -187,7 +187,7 @@ The SMPP component supports 1 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| configuration |  |  | SmppConfiguration | To use the shared 
SmppConfiguration as configuration.
+| configuration | advanced |  | SmppConfiguration | To use the shared 
SmppConfiguration as configuration.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
----------------------------------------------------------------------
diff --git 
a/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc 
b/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
index 7cd7005..6f56978 100644
--- a/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
+++ b/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
@@ -46,17 +46,17 @@ The Spark Rest component supports 11 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| port |  | 4567 | int | Port number. Will by default use 4567
-| ipAddress |  | 0.0.0.0 | String | Set the IP address that Spark should 
listen on. If not called the default address is '0.0.0.0'.
-| minThreads |  |  | int | Minimum number of threads in Spark thread-pool 
(shared globally)
-| maxThreads |  |  | int | Maximum number of threads in Spark thread-pool 
(shared globally)
-| timeOutMillis |  |  | int | Thread idle timeout in millis where threads that 
has been idle for a longer period will be terminated from the thread pool
-| keystoreFile |  |  | String | Configures connection to be secure to use the 
keystore file
-| keystorePassword |  |  | String | Configures connection to be secure to use 
the keystore password
-| truststoreFile |  |  | String | Configures connection to be secure to use 
the truststore file
-| truststorePassword |  |  | String | Configures connection to be secure to 
use the truststore password
-| sparkConfiguration |  |  | SparkConfiguration | To use the shared 
SparkConfiguration
-| sparkBinding |  |  | SparkBinding | To use a custom SparkBinding to map 
to/from Camel message.
+| port | consumer | 4567 | int | Port number. Will by default use 4567
+| ipAddress | consumer | 0.0.0.0 | String | Set the IP address that Spark 
should listen on. If not called the default address is '0.0.0.0'.
+| minThreads | advanced |  | int | Minimum number of threads in Spark 
thread-pool (shared globally)
+| maxThreads | advanced |  | int | Maximum number of threads in Spark 
thread-pool (shared globally)
+| timeOutMillis | advanced |  | int | Thread idle timeout in millis where 
threads that has been idle for a longer period will be terminated from the 
thread pool
+| keystoreFile | security |  | String | Configures connection to be secure to 
use the keystore file
+| keystorePassword | security |  | String | Configures connection to be secure 
to use the keystore password
+| truststoreFile | security |  | String | Configures connection to be secure 
to use the truststore file
+| truststorePassword | security |  | String | Configures connection to be 
secure to use the truststore password
+| sparkConfiguration | advanced |  | SparkConfiguration | To use the shared 
SparkConfiguration
+| sparkBinding | advanced |  | SparkBinding | To use a custom SparkBinding to 
map to/from Camel message.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-spark/src/main/docs/spark-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/docs/spark-component.adoc 
b/components/camel-spark/src/main/docs/spark-component.adoc
index 5597249..94aa68d 100644
--- a/components/camel-spark/src/main/docs/spark-component.adoc
+++ b/components/camel-spark/src/main/docs/spark-component.adoc
@@ -69,8 +69,8 @@ The Apache Spark component supports 2 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| rdd |  |  | JavaRDDLike | RDD to compute against.
-| rddCallback |  |  | RddCallback | Function performing action against an RDD.
+| rdd | producer |  | JavaRDDLike | RDD to compute against.
+| rddCallback | producer |  | RddCallback | Function performing action against 
an RDD.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-splunk/src/main/docs/splunk-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-splunk/src/main/docs/splunk-component.adoc 
b/components/camel-splunk/src/main/docs/splunk-component.adoc
index 7215abe..e34f8a3 100644
--- a/components/camel-splunk/src/main/docs/splunk-component.adoc
+++ b/components/camel-splunk/src/main/docs/splunk-component.adoc
@@ -104,7 +104,7 @@ The Splunk component supports 1 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| splunkConfigurationFactory |  |  | SplunkConfigurationFactory | To use the 
SplunkConfigurationFactory
+| splunkConfigurationFactory | advanced |  | SplunkConfigurationFactory | To 
use the SplunkConfigurationFactory
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-spring-batch/src/main/docs/spring-batch-component.adoc
----------------------------------------------------------------------
diff --git 
a/components/camel-spring-batch/src/main/docs/spring-batch-component.adoc 
b/components/camel-spring-batch/src/main/docs/spring-batch-component.adoc
index 466a943..a6047ab 100644
--- a/components/camel-spring-batch/src/main/docs/spring-batch-component.adoc
+++ b/components/camel-spring-batch/src/main/docs/spring-batch-component.adoc
@@ -52,8 +52,8 @@ The Spring Batch component supports 2 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| jobLauncher |  |  | JobLauncher | Explicitly specifies a JobLauncher to be 
used.
-| jobRegistry |  |  | JobRegistry | Explicitly specifies a JobRegistry to be 
used.
+| jobLauncher | producer |  | JobLauncher | Explicitly specifies a JobLauncher 
to be used.
+| jobRegistry | producer |  | JobRegistry | Explicitly specifies a JobRegistry 
to be used.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-spring/src/main/docs/spring-event-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/docs/spring-event-component.adoc 
b/components/camel-spring/src/main/docs/spring-event-component.adoc
index 42d65a4..c7a6286 100644
--- a/components/camel-spring/src/main/docs/spring-event-component.adoc
+++ b/components/camel-spring/src/main/docs/spring-event-component.adoc
@@ -37,7 +37,7 @@ The Spring Event component supports 1 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| applicationContext |  |  | ApplicationContext | The Spring ApplicationContext
+| applicationContext | common |  | ApplicationContext | The Spring 
ApplicationContext
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-sql/src/main/docs/sql-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc 
b/components/camel-sql/src/main/docs/sql-component.adoc
index a7be726..940dec9 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -119,8 +119,8 @@ The SQL component supports 2 options which are listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| dataSource |  |  | DataSource | Sets the DataSource to use to communicate 
with the database.
-| usePlaceholder |  | true | boolean | Sets whether to use placeholder and 
replace all placeholder characters with sign in the SQL queries. This option is 
default true
+| dataSource | common |  | DataSource | Sets the DataSource to use to 
communicate with the database.
+| usePlaceholder | advanced | true | boolean | Sets whether to use placeholder 
and replace all placeholder characters with sign in the SQL queries. This 
option is default true
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-sql/src/main/docs/sql-stored-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/docs/sql-stored-component.adoc 
b/components/camel-sql/src/main/docs/sql-stored-component.adoc
index 1b9944c..6ac4c34 100644
--- a/components/camel-sql/src/main/docs/sql-stored-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-stored-component.adoc
@@ -77,7 +77,7 @@ The SQL StoredProcedure component supports 1 options which 
are listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| dataSource |  |  | DataSource | Sets the DataSource to use to communicate 
with the database.
+| dataSource | producer |  | DataSource | Sets the DataSource to use to 
communicate with the database.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-ssh/src/main/docs/ssh-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc 
b/components/camel-ssh/src/main/docs/ssh-component.adoc
index b7cc63c..60fddbc 100644
--- a/components/camel-ssh/src/main/docs/ssh-component.adoc
+++ b/components/camel-ssh/src/main/docs/ssh-component.adoc
@@ -44,17 +44,17 @@ The SSH component supports 11 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| configuration |  |  | SshConfiguration | To use the shared SSH configuration
-| host |  |  | String | Sets the hostname of the remote SSH server.
-| port |  |  | int | Sets the port number for the remote SSH server.
-| username |  |  | String | Sets the username to use in logging into the 
remote SSH server.
-| password |  |  | String | Sets the password to use in connecting to remote 
SSH server. Requires keyPairProvider to be set to null.
-| pollCommand |  |  | String | Sets the command string to send to the remote 
SSH server during every poll cycle. Only works with camel-ssh component being 
used as a consumer i.e. from(ssh://...). You may need to end your command with 
a newline and that must be URL encoded 0A
-| keyPairProvider |  |  | KeyPairProvider | Sets the KeyPairProvider reference 
to use when connecting using Certificates to the remote SSH Server.
-| keyType |  |  | String | Sets the key type to pass to the KeyPairProvider as 
part of authentication. KeyPairProvider.loadKey(...) will be passed this value. 
Defaults to ssh-rsa.
-| timeout |  |  | long | Sets the timeout in milliseconds to wait in 
establishing the remote SSH server connection. Defaults to 30000 milliseconds.
-| certFilename |  |  | String | Sets the resource path of the certificate to 
use for Authentication.
-| certResource |  |  | String | Sets the resource path of the certificate to 
use for Authentication. Will use ResourceHelperKeyPairProvider to resolve file 
based certificate and depends on keyType setting.
+| configuration | advanced |  | SshConfiguration | To use the shared SSH 
configuration
+| host | common |  | String | Sets the hostname of the remote SSH server.
+| port | common |  | int | Sets the port number for the remote SSH server.
+| username | security |  | String | Sets the username to use in logging into 
the remote SSH server.
+| password | security |  | String | Sets the password to use in connecting to 
remote SSH server. Requires keyPairProvider to be set to null.
+| pollCommand | common |  | String | Sets the command string to send to the 
remote SSH server during every poll cycle. Only works with camel-ssh component 
being used as a consumer i.e. from(ssh://...). You may need to end your command 
with a newline and that must be URL encoded 0A
+| keyPairProvider | security |  | KeyPairProvider | Sets the KeyPairProvider 
reference to use when connecting using Certificates to the remote SSH Server.
+| keyType | security |  | String | Sets the key type to pass to the 
KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...) will be 
passed this value. Defaults to ssh-rsa.
+| timeout | common |  | long | Sets the timeout in milliseconds to wait in 
establishing the remote SSH server connection. Defaults to 30000 milliseconds.
+| certFilename | security |  | String | Sets the resource path of the 
certificate to use for Authentication.
+| certResource | security |  | String | Sets the resource path of the 
certificate to use for Authentication. Will use ResourceHelperKeyPairProvider 
to resolve file based certificate and depends on keyType setting.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-stomp/src/main/docs/stomp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-stomp/src/main/docs/stomp-component.adoc 
b/components/camel-stomp/src/main/docs/stomp-component.adoc
index 163cb0c..234b503 100644
--- a/components/camel-stomp/src/main/docs/stomp-component.adoc
+++ b/components/camel-stomp/src/main/docs/stomp-component.adoc
@@ -48,11 +48,11 @@ The Stomp component supports 5 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| configuration |  |  | StompConfiguration | To use the shared stomp 
configuration
-| brokerURL |  |  | String | The URI of the Stomp broker to connect to
-| login |  |  | String | The username
-| passcode |  |  | String | The password
-| host |  |  | String | The virtual host
+| configuration | advanced |  | StompConfiguration | To use the shared stomp 
configuration
+| brokerURL | common |  | String | The URI of the Stomp broker to connect to
+| login | security |  | String | The username
+| passcode | security |  | String | The password
+| host | common |  | String | The virtual host
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-telegram/src/main/docs/telegram-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-telegram/src/main/docs/telegram-component.adoc 
b/components/camel-telegram/src/main/docs/telegram-component.adoc
index ccb9ff1..218e5db 100644
--- a/components/camel-telegram/src/main/docs/telegram-component.adoc
+++ b/components/camel-telegram/src/main/docs/telegram-component.adoc
@@ -57,7 +57,7 @@ The Telegram component supports 1 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| authorizationToken |  |  | String | The default Telegram authorization token 
to be used when the information is not provided in the endpoints.
+| authorizationToken | security |  | String | The default Telegram 
authorization token to be used when the information is not provided in the 
endpoints.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-twitter/src/main/docs/twitter-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/docs/twitter-component.adoc 
b/components/camel-twitter/src/main/docs/twitter-component.adoc
index d9168bb..7efb727 100644
--- a/components/camel-twitter/src/main/docs/twitter-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-component.adoc
@@ -66,14 +66,14 @@ The Twitter component supports 8 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| accessToken |  |  | String | The access token
-| accessTokenSecret |  |  | String | The access token secret
-| consumerKey |  |  | String | The consumer key
-| consumerSecret |  |  | String | The consumer secret
-| httpProxyHost |  |  | String | The http proxy host which can be used for the 
camel-twitter.
-| httpProxyUser |  |  | String | The http proxy user which can be used for the 
camel-twitter.
-| httpProxyPassword |  |  | String | The http proxy password which can be used 
for the camel-twitter.
-| httpProxyPort |  |  | int | The http proxy port which can be used for the 
camel-twitter.
+| accessToken | security |  | String | The access token
+| accessTokenSecret | security |  | String | The access token secret
+| consumerKey | security |  | String | The consumer key
+| consumerSecret | security |  | String | The consumer secret
+| httpProxyHost | proxy |  | String | The http proxy host which can be used 
for the camel-twitter.
+| httpProxyUser | proxy |  | String | The http proxy user which can be used 
for the camel-twitter.
+| httpProxyPassword | proxy |  | String | The http proxy password which can be 
used for the camel-twitter.
+| httpProxyPort | proxy |  | int | The http proxy port which can be used for 
the camel-twitter.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-undertow/src/main/docs/undertow-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc 
b/components/camel-undertow/src/main/docs/undertow-component.adoc
index 262daf6..633dac8 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -52,8 +52,8 @@ The Undertow component supports 2 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| undertowHttpBinding |  |  | UndertowHttpBinding | To use a custom 
HttpBinding to control the mapping between Camel message and HttpClient.
-| sslContextParameters |  |  | SSLContextParameters | To configure security 
using SSLContextParameters
+| undertowHttpBinding | advanced |  | UndertowHttpBinding | To use a custom 
HttpBinding to control the mapping between Camel message and HttpClient.
+| sslContextParameters | security |  | SSLContextParameters | To configure 
security using SSLContextParameters
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-velocity/src/main/docs/velocity-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-velocity/src/main/docs/velocity-component.adoc 
b/components/camel-velocity/src/main/docs/velocity-component.adoc
index 7a2de50..911fd35 100644
--- a/components/camel-velocity/src/main/docs/velocity-component.adoc
+++ b/components/camel-velocity/src/main/docs/velocity-component.adoc
@@ -51,7 +51,7 @@ The Velocity component supports 1 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| velocityEngine |  |  | VelocityEngine | To use the VelocityEngine otherwise 
a new engine is created
+| velocityEngine | advanced |  | VelocityEngine | To use the VelocityEngine 
otherwise a new engine is created
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-vertx/src/main/docs/vertx-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-vertx/src/main/docs/vertx-component.adoc 
b/components/camel-vertx/src/main/docs/vertx-component.adoc
index 1d8ea2c..6deb4c0 100644
--- a/components/camel-vertx/src/main/docs/vertx-component.adoc
+++ b/components/camel-vertx/src/main/docs/vertx-component.adoc
@@ -50,12 +50,12 @@ The Vert.x component supports 6 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| vertxFactory |  |  | VertxFactory | To use a custom VertxFactory 
implementation
-| host |  |  | String | Hostname for creating an embedded clustered EventBus
-| port |  |  | int | Port for creating an embedded clustered EventBus
-| vertxOptions |  |  | VertxOptions | Options to use for creating vertx
-| vertx |  |  | Vertx | To use the given vertx EventBus instead of creating a 
new embedded EventBus
-| timeout |  | 60 | int | Timeout in seconds to wait for clustered Vertx 
EventBus to be ready. The default value is 60.
+| vertxFactory | advanced |  | VertxFactory | To use a custom VertxFactory 
implementation
+| host | common |  | String | Hostname for creating an embedded clustered 
EventBus
+| port | common |  | int | Port for creating an embedded clustered EventBus
+| vertxOptions | common |  | VertxOptions | Options to use for creating vertx
+| vertx | common |  | Vertx | To use the given vertx EventBus instead of 
creating a new embedded EventBus
+| timeout | common | 60 | int | Timeout in seconds to wait for clustered Vertx 
EventBus to be ready. The default value is 60.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-websocket/src/main/docs/websocket-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/docs/websocket-component.adoc 
b/components/camel-websocket/src/main/docs/websocket-component.adoc
index 0a3d2c8..efe199f 100644
--- a/components/camel-websocket/src/main/docs/websocket-component.adoc
+++ b/components/camel-websocket/src/main/docs/websocket-component.adoc
@@ -46,18 +46,18 @@ The Jetty Websocket component supports 12 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| staticResources |  |  | String | Set a resource path for static resources 
(such as .html files etc). The resources can be loaded from classpath if you 
prefix with classpath: otherwise the resources is loaded from file system or 
from JAR files. For example to load from root classpath use classpath:. or 
classpath:WEB-INF/static If not configured (eg null) then no static resource is 
in use.
-| host |  | 0.0.0.0 | String | The hostname. The default value is 0.0.0.0
-| port |  | 9292 | Integer | The port number. The default value is 9292
-| sslKeyPassword |  |  | String | The password for the keystore when using SSL.
-| sslPassword |  |  | String | The password when using SSL.
-| sslKeystore |  |  | String | The path to the keystore.
-| enableJmx |  | false | boolean | If this option is true Jetty JMX support 
will be enabled for this endpoint. See Jetty JMX support for more details.
-| minThreads |  |  | Integer | To set a value for minimum number of threads in 
server thread pool. MaxThreads/minThreads or threadPool fields are required due 
to switch to Jetty9. The default values for minThreads is 1.
-| maxThreads |  |  | Integer | To set a value for maximum number of threads in 
server thread pool. MaxThreads/minThreads or threadPool fields are required due 
to switch to Jetty9. The default values for maxThreads is 1 2 noCores.
-| threadPool |  |  | ThreadPool | To use a custom thread pool for the server. 
MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
-| sslContextParameters |  |  | SSLContextParameters | To configure security 
using SSLContextParameters
-| socketFactory |  |  | Map | To configure a map which contains custom 
WebSocketFactory for sub protocols. The key in the map is the sub protocol. The 
default key is reserved for the default implementation.
+| staticResources | consumer |  | String | Set a resource path for static 
resources (such as .html files etc). The resources can be loaded from classpath 
if you prefix with classpath: otherwise the resources is loaded from file 
system or from JAR files. For example to load from root classpath use 
classpath:. or classpath:WEB-INF/static If not configured (eg null) then no 
static resource is in use.
+| host | common | 0.0.0.0 | String | The hostname. The default value is 0.0.0.0
+| port | common | 9292 | Integer | The port number. The default value is 9292
+| sslKeyPassword | security |  | String | The password for the keystore when 
using SSL.
+| sslPassword | security |  | String | The password when using SSL.
+| sslKeystore | security |  | String | The path to the keystore.
+| enableJmx | advanced | false | boolean | If this option is true Jetty JMX 
support will be enabled for this endpoint. See Jetty JMX support for more 
details.
+| minThreads | advanced |  | Integer | To set a value for minimum number of 
threads in server thread pool. MaxThreads/minThreads or threadPool fields are 
required due to switch to Jetty9. The default values for minThreads is 1.
+| maxThreads | advanced |  | Integer | To set a value for maximum number of 
threads in server thread pool. MaxThreads/minThreads or threadPool fields are 
required due to switch to Jetty9. The default values for maxThreads is 1 2 
noCores.
+| threadPool | advanced |  | ThreadPool | To use a custom thread pool for the 
server. MaxThreads/minThreads or threadPool fields are required due to switch 
to Jetty9.
+| sslContextParameters | security |  | SSLContextParameters | To configure 
security using SSLContextParameters
+| socketFactory | common |  | Map | To configure a map which contains custom 
WebSocketFactory for sub protocols. The key in the map is the sub protocol. The 
default key is reserved for the default implementation.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
----------------------------------------------------------------------
diff --git 
a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc 
b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
index 930e778..c9280a0 100644
--- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
@@ -243,8 +243,8 @@ The XML Security component supports 2 options which are 
listed below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| signerConfiguration |  |  | XmlSignerConfiguration | To use a shared 
XmlSignerConfiguration configuration to use as base for configuring endpoints.
-| verifierConfiguration |  |  | XmlVerifierConfiguration | To use a shared 
XmlVerifierConfiguration configuration to use as base for configuring endpoints.
+| signerConfiguration | advanced |  | XmlSignerConfiguration | To use a shared 
XmlSignerConfiguration configuration to use as base for configuring endpoints.
+| verifierConfiguration | advanced |  | XmlVerifierConfiguration | To use a 
shared XmlVerifierConfiguration configuration to use as base for configuring 
endpoints.
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-yammer/src/main/docs/yammer-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/docs/yammer-component.adoc 
b/components/camel-yammer/src/main/docs/yammer-component.adoc
index cafa080..c5e65d4 100644
--- a/components/camel-yammer/src/main/docs/yammer-component.adoc
+++ b/components/camel-yammer/src/main/docs/yammer-component.adoc
@@ -55,10 +55,10 @@ The Yammer component supports 4 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| consumerKey |  |  | String | The consumer key
-| consumerSecret |  |  | String | The consumer secret
-| accessToken |  |  | String | The access token
-| config |  |  | YammerConfiguration | To use a shared yammer configuration
+| consumerKey | security |  | String | The consumer key
+| consumerSecret | security |  | String | The consumer secret
+| accessToken | security |  | String | The access token
+| config | advanced |  | YammerConfiguration | To use a shared yammer 
configuration
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc 
b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
index 1293990..d6de98b 100644
--- a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
+++ b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
@@ -63,7 +63,7 @@ The ZooKeeper component supports 1 options which are listed 
below.
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |=======================================================================
 | Name | Group | Default | Java Type | Description
-| configuration |  |  | ZooKeeperConfiguration | To use a shared 
ZooKeeperConfiguration
+| configuration | advanced |  | ZooKeeperConfiguration | To use a shared 
ZooKeeperConfiguration
 |=======================================================================
 {% endraw %}
 // component options: END

http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
----------------------------------------------------------------------
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
index 4474339..5c3e5a5 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/model/ComponentOption.java
@@ -48,7 +48,7 @@ public final class ComponentOption {
         this.documentation = documentation;
         this.deprecated = deprecated;
         this.secret = secret;
-        this.label = group;
+        this.group = group;
         this.label = label;
         this.enumType = enumType;
         this.enums = enums;

Reply via email to