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 2016/12/21 22:09:19 UTC
[5/5] camel git commit: CAMEL-10636: Component options docs - Include
more details like endpoint options.
CAMEL-10636: Component options docs - Include more details like endpoint options.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e4c6ab4e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e4c6ab4e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e4c6ab4e
Branch: refs/heads/master
Commit: e4c6ab4e3ac0ce80c2430fe333bbd0a88de65826
Parents: 88431c8
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 21 23:09:02 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 21 23:09:02 2016 +0100
----------------------------------------------------------------------
camel-core/src/main/docs/direct-component.adoc | 4 +-
.../src/main/docs/direct-vm-component.adoc | 8 +-
camel-core/src/main/docs/log-component.adoc | 2 +-
.../src/main/docs/properties-component.adoc | 32 ++--
camel-core/src/main/docs/rest-component.adoc | 6 +-
.../src/main/docs/scheduler-component.adoc | 2 +-
camel-core/src/main/docs/seda-component.adoc | 6 +-
camel-core/src/main/docs/stub-component.adoc | 6 +-
.../src/main/docs/validator-component.adoc | 2 +-
camel-core/src/main/docs/vm-component.adoc | 6 +-
camel-core/src/main/docs/xslt-component.adoc | 10 +-
.../PropertiesComponentConfiguration.java | 12 +-
.../src/main/docs/ahc-ws-component.adoc | 12 +-
.../camel-ahc/src/main/docs/ahc-component.adoc | 12 +-
.../src/main/docs/amqp-component.adoc | 148 +++++++++----------
.../src/main/docs/apns-component.adoc | 2 +-
.../docs/atmosphere-websocket-component.adoc | 14 +-
.../src/main/docs/avro-component.adoc | 2 +-
.../src/main/docs/beanstalk-component.adoc | 2 +-
.../camel-box/src/main/docs/box-component.adoc | 2 +-
.../src/main/docs/braintree-component.adoc | 2 +-
.../src/main/docs/cache-component.adoc | 6 +-
.../src/main/docs/cometd-component.adoc | 12 +-
.../src/main/docs/crypto-component.adoc | 2 +-
.../camel-cxf/src/main/docs/cxf-component.adoc | 4 +-
.../src/main/docs/cxfrs-component.adoc | 2 +-
.../src/main/docs/disruptor-component.adoc | 14 +-
.../src/main/docs/docker-component.adoc | 2 +-
.../camel-ejb/src/main/docs/ejb-component.adoc | 4 +-
.../src/main/docs/elasticsearch-component.adoc | 2 +-
.../src/main/docs/elsql-component.adoc | 8 +-
.../src/main/docs/eventadmin-component.adoc | 2 +-
.../src/main/docs/facebook-component.adoc | 2 +-
.../src/main/docs/flink-component.adoc | 8 +-
.../src/main/docs/freemarker-component.adoc | 2 +-
.../src/main/docs/ganglia-component.adoc | 2 +-
.../main/docs/google-calendar-component.adoc | 4 +-
.../src/main/docs/google-drive-component.adoc | 4 +-
.../src/main/docs/google-mail-component.adoc | 4 +-
.../src/main/docs/google-pubsub-component.adoc | 2 +-
.../src/main/docs/guava-eventbus-component.adoc | 4 +-
.../src/main/docs/hazelcast-component.adoc | 2 +-
.../src/main/docs/hbase-component.adoc | 4 +-
.../src/main/docs/hdfs-component.adoc | 2 +-
.../src/main/docs/hdfs2-component.adoc | 2 +-
.../src/main/docs/http-component.adoc | 12 +-
.../src/main/docs/http4-component.adoc | 26 ++--
.../src/main/docs/ibatis-component.adoc | 6 +-
.../src/main/docs/jclouds-component.adoc | 4 +-
.../src/main/docs/jdbc-component.adoc | 2 +-
.../src/main/docs/jetty-component.adoc | 62 ++++----
.../src/main/docs/jgroups-component.adoc | 6 +-
.../camel-jms/src/main/docs/jms-component.adoc | 148 +++++++++----------
.../src/main/docs/jolt-component.adoc | 2 +-
.../camel-jpa/src/main/docs/jpa-component.adoc | 8 +-
.../camel-jsch/src/main/docs/scp-component.adoc | 2 +-
.../src/main/docs/jt400-component.adoc | 2 +-
.../src/main/docs/kafka-component.adoc | 2 +-
.../src/main/docs/kestrel-component.adoc | 2 +-
.../src/main/docs/linkedin-component.adoc | 2 +-
.../src/main/docs/lucene-component.adoc | 2 +-
.../src/main/docs/lumberjack-component.adoc | 2 +-
.../src/main/docs/mail-component.adoc | 4 +-
.../src/main/docs/metrics-component.adoc | 2 +-
.../src/main/docs/mina-component.adoc | 2 +-
.../src/main/docs/mina2-component.adoc | 2 +-
.../src/main/docs/mqtt-component.adoc | 6 +-
.../camel-msv/src/main/docs/msv-component.adoc | 4 +-
.../src/main/docs/mustache-component.adoc | 2 +-
.../src/main/docs/mybatis-component.adoc | 4 +-
.../src/main/docs/nagios-component.adoc | 2 +-
.../src/main/docs/netty-http-component.adoc | 10 +-
.../src/main/docs/netty-component.adoc | 4 +-
.../src/main/docs/netty4-http-component.adoc | 12 +-
.../src/main/docs/netty4-component.adoc | 6 +-
.../src/main/docs/olingo2-component.adoc | 2 +-
.../src/main/docs/openshift-component.adoc | 8 +-
.../src/main/docs/paho-component.adoc | 6 +-
.../src/main/docs/paxlogging-component.adoc | 2 +-
.../src/main/docs/quartz-component.adoc | 14 +-
.../src/main/docs/quartz2-component.adoc | 18 +--
.../src/main/docs/quickfix-component.adoc | 10 +-
.../src/main/docs/restlet-component.adoc | 40 ++---
.../src/main/docs/salesforce-component.adoc | 32 ++--
.../src/main/docs/xquery-component.adoc | 2 +-
.../src/main/docs/servicenow-component.adoc | 14 +-
.../src/main/docs/servlet-component.adoc | 14 +-
.../src/main/docs/sjms-batch-component.adoc | 4 +-
.../src/main/docs/sjms-component.adoc | 18 +--
.../src/main/docs/slack-component.adoc | 2 +-
.../src/main/docs/smpp-component.adoc | 2 +-
.../src/main/docs/spark-rest-component.adoc | 22 +--
.../src/main/docs/spark-component.adoc | 4 +-
.../src/main/docs/splunk-component.adoc | 2 +-
.../src/main/docs/spring-batch-component.adoc | 4 +-
.../src/main/docs/spring-event-component.adoc | 2 +-
.../camel-sql/src/main/docs/sql-component.adoc | 4 +-
.../src/main/docs/sql-stored-component.adoc | 2 +-
.../camel-ssh/src/main/docs/ssh-component.adoc | 22 +--
.../src/main/docs/stomp-component.adoc | 10 +-
.../src/main/docs/telegram-component.adoc | 2 +-
.../src/main/docs/twitter-component.adoc | 16 +-
.../src/main/docs/undertow-component.adoc | 4 +-
.../src/main/docs/velocity-component.adoc | 2 +-
.../src/main/docs/vertx-component.adoc | 12 +-
.../src/main/docs/websocket-component.adoc | 24 +--
.../src/main/docs/xmlsecurity-component.adoc | 4 +-
.../src/main/docs/yammer-component.adoc | 8 +-
.../src/main/docs/zookeeper-component.adoc | 2 +-
.../camel/tools/apt/model/ComponentOption.java | 2 +-
110 files changed, 539 insertions(+), 539 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/direct-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/direct-component.adoc b/camel-core/src/main/docs/direct-component.adoc
index 984b20d..62071b1 100644
--- a/camel-core/src/main/docs/direct-component.adoc
+++ b/camel-core/src/main/docs/direct-component.adoc
@@ -41,8 +41,8 @@ The Direct component supports 2 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| block | | false | boolean | If sending a message to a direct endpoint which has no active consumer then we can tell the producer to block and wait for the consumer to become active.
-| timeout | | 30000 | long | The timeout value to use if block is enabled.
+| block | producer | false | boolean | If sending a message to a direct endpoint which has no active consumer then we can tell the producer to block and wait for the consumer to become active.
+| timeout | producer | 30000 | long | The timeout value to use if block is enabled.
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/direct-vm-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/direct-vm-component.adoc b/camel-core/src/main/docs/direct-vm-component.adoc
index 5e7710a..8d67bd4 100644
--- a/camel-core/src/main/docs/direct-vm-component.adoc
+++ b/camel-core/src/main/docs/direct-vm-component.adoc
@@ -54,10 +54,10 @@ The Direct VM component supports 4 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| block | | false | boolean | If sending a message to a direct endpoint which has no active consumer then we can tell the producer to block and wait for the consumer to become active.
-| timeout | | 30000 | long | The timeout value to use if block is enabled.
-| headerFilterStrategy | | | HeaderFilterStrategy | Sets a HeaderFilterStrategy that will only be applied on producer endpoints (on both directions: request and response). Default value: none.
-| propagateProperties | | true | boolean | Whether to propagate or not properties from the producer side to the consumer side and vice versa. Default value: true.
+| block | producer | false | boolean | If sending a message to a direct endpoint which has no active consumer then we can tell the producer to block and wait for the consumer to become active.
+| timeout | producer | 30000 | long | The timeout value to use if block is enabled.
+| headerFilterStrategy | common | | HeaderFilterStrategy | Sets a HeaderFilterStrategy that will only be applied on producer endpoints (on both directions: request and response). Default value: none.
+| propagateProperties | advanced | true | boolean | Whether to propagate or not properties from the producer side to the consumer side and vice versa. Default value: true.
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/log-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/log-component.adoc b/camel-core/src/main/docs/log-component.adoc
index 43c9d76..0148c1e 100644
--- a/camel-core/src/main/docs/log-component.adoc
+++ b/camel-core/src/main/docs/log-component.adoc
@@ -68,7 +68,7 @@ The Log component supports 1 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| exchangeFormatter | | | ExchangeFormatter | Sets a custom ExchangeFormatter to convert the Exchange to a String suitable for logging. If not specified we default to DefaultExchangeFormatter.
+| exchangeFormatter | advanced | | ExchangeFormatter | Sets a custom ExchangeFormatter to convert the Exchange to a String suitable for logging. If not specified we default to DefaultExchangeFormatter.
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/properties-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/properties-component.adoc b/camel-core/src/main/docs/properties-component.adoc
index badab12..e10cd33 100644
--- a/camel-core/src/main/docs/properties-component.adoc
+++ b/camel-core/src/main/docs/properties-component.adoc
@@ -28,22 +28,22 @@ The Properties component supports 16 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| locations | | | List | A list of locations to load properties. This option will override any default locations and only use the locations from this option.
-| location | | | String | A list of locations to load properties. You can use comma to separate multiple locations. This option will override any default locations and only use the locations from this option.
-| encoding | | | String | Encoding to use when loading properties file from the file system or classpath. If no encoding has been set then the properties files is loaded using ISO-8859-1 encoding (latin-1) as documented by link java.util.Propertiesload(java.io.InputStream)
-| propertiesResolver | | | PropertiesResolver | To use a custom PropertiesResolver
-| propertiesParser | | | PropertiesParser | To use a custom PropertiesParser
-| cache | | false | boolean | Whether or not to cache loaded properties. The default value is true.
-| propertyPrefix | | | String | Optional prefix prepended to property names before resolution.
-| propertySuffix | | | String | Optional suffix appended to property names before resolution.
-| fallbackToUnaugmentedProperty | | false | boolean | If true first attempt resolution of property name augmented with propertyPrefix and propertySuffix before falling back the plain property name specified. If false only the augmented property name is searched.
-| defaultFallbackEnabled | | false | boolean | If false the component does not attempt to find a default for the key by looking after the colon separator.
-| ignoreMissingLocation | | false | boolean | Whether to silently ignore if a location cannot be located such as a properties file not found.
-| prefixToken | | | String | Sets the value of the prefix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_PREFIX_TOKEN).
-| suffixToken | | | String | Sets the value of the suffix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_SUFFIX_TOKEN).
-| initialProperties | | | Properties | Sets initial properties which will be used before any locations are resolved.
-| overrideProperties | | | Properties | Sets a special list of override properties that take precedence and will use first if a property exist.
-| systemPropertiesMode | | | int | Sets the system property mode.
+| locations | common | | List | A list of locations to load properties. This option will override any default locations and only use the locations from this option.
+| location | common | | String | A list of locations to load properties. You can use comma to separate multiple locations. This option will override any default locations and only use the locations from this option.
+| encoding | common | | String | Encoding to use when loading properties file from the file system or classpath. If no encoding has been set then the properties files is loaded using ISO-8859-1 encoding (latin-1) as documented by link java.util.Propertiesload(java.io.InputStream)
+| propertiesResolver | common | | PropertiesResolver | To use a custom PropertiesResolver
+| propertiesParser | common | | PropertiesParser | To use a custom PropertiesParser
+| cache | common | true | boolean | Whether or not to cache loaded properties. The default value is true.
+| propertyPrefix | common | | String | Optional prefix prepended to property names before resolution.
+| propertySuffix | common | | String | Optional suffix appended to property names before resolution.
+| fallbackToUnaugmentedProperty | common | true | boolean | If true first attempt resolution of property name augmented with propertyPrefix and propertySuffix before falling back the plain property name specified. If false only the augmented property name is searched.
+| defaultFallbackEnabled | common | true | boolean | If false the component does not attempt to find a default for the key by looking after the colon separator.
+| ignoreMissingLocation | common | false | boolean | Whether to silently ignore if a location cannot be located such as a properties file not found.
+| prefixToken | common | {{ | String | Sets the value of the prefix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_PREFIX_TOKEN).
+| suffixToken | common | }} | String | Sets the value of the suffix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_SUFFIX_TOKEN).
+| initialProperties | common | | Properties | Sets initial properties which will be used before any locations are resolved.
+| overrideProperties | common | | Properties | Sets a special list of override properties that take precedence and will use first if a property exist.
+| systemPropertiesMode | common | 2 | int | Sets the system property mode.
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/rest-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/rest-component.adoc b/camel-core/src/main/docs/rest-component.adoc
index 791ddbb..40c0258 100644
--- a/camel-core/src/main/docs/rest-component.adoc
+++ b/camel-core/src/main/docs/rest-component.adoc
@@ -32,9 +32,9 @@ The REST component supports 3 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| componentName | | | String | The Camel Rest component to use for the REST transport such as restlet spark-rest. If no component has been explicit configured then Camel will lookup if there is a Camel component that integrates with the Rest DSL or if a org.apache.camel.spi.RestConsumerFactory (consumer) or org.apache.camel.spi.RestProducerFactory (producer) is registered in the registry. If either one is found then that is being used.
-| apiDoc | | | String | The swagger api doc resource to use. The resource is loaded from classpath by default and must be in JSon format.
-| host | | | String | Host and port of HTTP service to use (override host in swagger schema)
+| componentName | common | | String | The Camel Rest component to use for the REST transport such as restlet spark-rest. If no component has been explicit configured then Camel will lookup if there is a Camel component that integrates with the Rest DSL or if a org.apache.camel.spi.RestConsumerFactory (consumer) or org.apache.camel.spi.RestProducerFactory (producer) is registered in the registry. If either one is found then that is being used.
+| apiDoc | producer | | String | The swagger api doc resource to use. The resource is loaded from classpath by default and must be in JSon format.
+| host | producer | | String | Host and port of HTTP service to use (override host in swagger schema)
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/scheduler-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/scheduler-component.adoc b/camel-core/src/main/docs/scheduler-component.adoc
index 989225e..c56a400 100644
--- a/camel-core/src/main/docs/scheduler-component.adoc
+++ b/camel-core/src/main/docs/scheduler-component.adoc
@@ -45,7 +45,7 @@ The Scheduler component supports 1 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| concurrentTasks | | 1 | int | Number of threads used by the scheduling thread pool. Is by default using a single thread
+| concurrentTasks | scheduler | 1 | int | Number of threads used by the scheduling thread pool. Is by default using a single thread
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/seda-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/seda-component.adoc b/camel-core/src/main/docs/seda-component.adoc
index 00307d0..bbf1f7c 100644
--- a/camel-core/src/main/docs/seda-component.adoc
+++ b/camel-core/src/main/docs/seda-component.adoc
@@ -50,9 +50,9 @@ The SEDA component supports 3 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| queueSize | | | int | Sets the default maximum capacity of the SEDA queue (i.e. the number of messages it can hold).
-| concurrentConsumers | | 1 | int | Sets the default number of concurrent threads processing exchanges.
-| defaultQueueFactory | | | Exchange> | Sets the default queue factory.
+| queueSize | advanced | | int | Sets the default maximum capacity of the SEDA queue (i.e. the number of messages it can hold).
+| concurrentConsumers | consumer | 1 | int | Sets the default number of concurrent threads processing exchanges.
+| defaultQueueFactory | advanced | | Exchange> | Sets the default queue factory.
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/stub-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/stub-component.adoc b/camel-core/src/main/docs/stub-component.adoc
index e7bf421..b17f692 100644
--- a/camel-core/src/main/docs/stub-component.adoc
+++ b/camel-core/src/main/docs/stub-component.adoc
@@ -42,9 +42,9 @@ The Stub component supports 3 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| queueSize | | | int | Sets the default maximum capacity of the SEDA queue (i.e. the number of messages it can hold).
-| concurrentConsumers | | 1 | int | Sets the default number of concurrent threads processing exchanges.
-| defaultQueueFactory | | | Exchange> | Sets the default queue factory.
+| queueSize | advanced | | int | Sets the default maximum capacity of the SEDA queue (i.e. the number of messages it can hold).
+| concurrentConsumers | consumer | 1 | int | Sets the default number of concurrent threads processing exchanges.
+| defaultQueueFactory | advanced | | Exchange> | Sets the default queue factory.
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/validator-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/validator-component.adoc b/camel-core/src/main/docs/validator-component.adoc
index 8ac1e35..5124fcd 100644
--- a/camel-core/src/main/docs/validator-component.adoc
+++ b/camel-core/src/main/docs/validator-component.adoc
@@ -64,7 +64,7 @@ The Validator component supports 1 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| resourceResolverFactory | | | ValidatorResourceResolverFactory | To use a custom LSResourceResolver which depends on a dynamic endpoint resource URI
+| resourceResolverFactory | advanced | | ValidatorResourceResolverFactory | To use a custom LSResourceResolver which depends on a dynamic endpoint resource URI
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/vm-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/vm-component.adoc b/camel-core/src/main/docs/vm-component.adoc
index 3939353..8da46a0 100644
--- a/camel-core/src/main/docs/vm-component.adoc
+++ b/camel-core/src/main/docs/vm-component.adoc
@@ -73,9 +73,9 @@ The VM component supports 3 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| queueSize | | | int | Sets the default maximum capacity of the SEDA queue (i.e. the number of messages it can hold).
-| concurrentConsumers | | 1 | int | Sets the default number of concurrent threads processing exchanges.
-| defaultQueueFactory | | | Exchange> | Sets the default queue factory.
+| queueSize | advanced | | int | Sets the default maximum capacity of the SEDA queue (i.e. the number of messages it can hold).
+| concurrentConsumers | consumer | 1 | int | Sets the default number of concurrent threads processing exchanges.
+| defaultQueueFactory | advanced | | Exchange> | Sets the default queue factory.
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/camel-core/src/main/docs/xslt-component.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/xslt-component.adoc b/camel-core/src/main/docs/xslt-component.adoc
index af88602..d2fe262 100644
--- a/camel-core/src/main/docs/xslt-component.adoc
+++ b/camel-core/src/main/docs/xslt-component.adoc
@@ -79,11 +79,11 @@ The XSLT component supports 5 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| xmlConverter | | | XmlConverter | To use a custom implementation of org.apache.camel.converter.jaxp.XmlConverter
-| uriResolverFactory | | | XsltUriResolverFactory | To use a custom javax.xml.transform.URIResolver which depends on a dynamic endpoint resource URI or which is a subclass of XsltUriResolver. Do not use in combination with uriResolver. See also link setUriResolver(URIResolver).
-| uriResolver | | | URIResolver | To use a custom javax.xml.transform.URIResolver. Do not use in combination with uriResolverFactory. See also link setUriResolverFactory(XsltUriResolverFactory).
-| contentCache | | true | boolean | Cache for the resource content (the stylesheet file) when it is loaded. If set to false Camel will reload the stylesheet file on each message processing. This is good for development. A cached stylesheet can be forced to reload at runtime via JMX using the clearCachedStylesheet operation.
-| saxon | | false | boolean | Whether to use Saxon as the transformerFactoryClass. If enabled then the class net.sf.saxon.TransformerFactoryImpl. You would need to add Saxon to the classpath.
+| xmlConverter | advanced | | XmlConverter | To use a custom implementation of org.apache.camel.converter.jaxp.XmlConverter
+| uriResolverFactory | advanced | | XsltUriResolverFactory | To use a custom javax.xml.transform.URIResolver which depends on a dynamic endpoint resource URI or which is a subclass of XsltUriResolver. Do not use in combination with uriResolver. See also link setUriResolver(URIResolver).
+| uriResolver | advanced | | URIResolver | To use a custom javax.xml.transform.URIResolver. Do not use in combination with uriResolverFactory. See also link setUriResolverFactory(XsltUriResolverFactory).
+| contentCache | producer | true | boolean | Cache for the resource content (the stylesheet file) when it is loaded. If set to false Camel will reload the stylesheet file on each message processing. This is good for development. A cached stylesheet can be forced to reload at runtime via JMX using the clearCachedStylesheet operation.
+| saxon | producer | false | boolean | Whether to use Saxon as the transformerFactoryClass. If enabled then the class net.sf.saxon.TransformerFactoryImpl. You would need to add Saxon to the classpath.
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
index 4d0856f..0f16ccd 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentConfiguration.java
@@ -64,7 +64,7 @@ public class PropertiesComponentConfiguration {
/**
* Whether or not to cache loaded properties. The default value is true.
*/
- private Boolean cache = false;
+ private Boolean cache = true;
/**
* Optional prefix prepended to property names before resolution.
*/
@@ -78,12 +78,12 @@ public class PropertiesComponentConfiguration {
* propertyPrefix and propertySuffix before falling back the plain property
* name specified. If false only the augmented property name is searched.
*/
- private Boolean fallbackToUnaugmentedProperty = false;
+ private Boolean fallbackToUnaugmentedProperty = true;
/**
* If false the component does not attempt to find a default for the key by
* looking after the colon separator.
*/
- private Boolean defaultFallbackEnabled = false;
+ private Boolean defaultFallbackEnabled = true;
/**
* Whether to silently ignore if a location cannot be located such as a
* properties file not found.
@@ -94,13 +94,13 @@ public class PropertiesComponentConfiguration {
* replace. Setting a value of null restores the default token (link link
* DEFAULT_PREFIX_TOKEN).
*/
- private String prefixToken;
+ private String prefixToken = "{{";
/**
* Sets the value of the suffix token used to identify properties to
* replace. Setting a value of null restores the default token (link link
* DEFAULT_SUFFIX_TOKEN).
*/
- private String suffixToken;
+ private String suffixToken = "}}";
/**
* Sets initial properties which will be used before any locations are
* resolved.
@@ -114,7 +114,7 @@ public class PropertiesComponentConfiguration {
/**
* Sets the system property mode.
*/
- private Integer systemPropertiesMode;
+ private Integer systemPropertiesMode = 2;
public List<PropertiesLocation> getLocations() {
return locations;
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
index f82f6e5..fed2543 100644
--- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
+++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
@@ -55,12 +55,12 @@ The AHC Websocket component supports 6 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| client | | | AsyncHttpClient | To use a custom AsyncHttpClient
-| binding | | | AhcBinding | To use a custom AhcBinding which allows to control how to bind between AHC and Camel.
-| clientConfig | | | AsyncHttpClientConfig | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance.
-| sslContextParameters | | | SSLContextParameters | Reference to a org.apache.camel.util.jsse.SSLContextParameters in the Registry. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level.
-| 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.
+| client | advanced | | AsyncHttpClient | To use a custom AsyncHttpClient
+| binding | advanced | | AhcBinding | To use a custom AhcBinding which allows to control how to bind between AHC and Camel.
+| clientConfig | advanced | | AsyncHttpClientConfig | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance.
+| sslContextParameters | security | | SSLContextParameters | Reference to a org.apache.camel.util.jsse.SSLContextParameters in the Registry. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level.
+| 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-ahc/src/main/docs/ahc-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc
index 55a373a..7bc770f 100644
--- a/components/camel-ahc/src/main/docs/ahc-component.adoc
+++ b/components/camel-ahc/src/main/docs/ahc-component.adoc
@@ -102,12 +102,12 @@ The AHC component supports 6 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| client | | | AsyncHttpClient | To use a custom AsyncHttpClient
-| binding | | | AhcBinding | To use a custom AhcBinding which allows to control how to bind between AHC and Camel.
-| clientConfig | | | AsyncHttpClientConfig | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance.
-| sslContextParameters | | | SSLContextParameters | Reference to a org.apache.camel.util.jsse.SSLContextParameters in the Registry. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level.
-| 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.
+| client | advanced | | AsyncHttpClient | To use a custom AsyncHttpClient
+| binding | advanced | | AhcBinding | To use a custom AhcBinding which allows to control how to bind between AHC and Camel.
+| clientConfig | advanced | | AsyncHttpClientConfig | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance.
+| sslContextParameters | security | | SSLContextParameters | Reference to a org.apache.camel.util.jsse.SSLContextParameters in the Registry. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level.
+| 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-amqp/src/main/docs/amqp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc
index d18d80e..28330ac 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -50,80 +50,80 @@ The AMQP component supports 74 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| configuration | | | JmsConfiguration | To use a shared JMS configuration
-| acceptMessagesWhileStopping | | false | boolean | Specifies whether the consumer accept messages while it is stopping. You may consider enabling this option if you start and stop JMS routes at runtime while there are still messages enqueued on the queue. If this option is false and you stop the JMS route then messages may be rejected and the JMS broker would have to attempt redeliveries which yet again may be rejected and eventually the message may be moved at a dead letter queue on the JMS broker. To avoid this its recommended to enable this option.
-| allowReplyManagerQuickStop | | false | boolean | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfigurationisAcceptMessagesWhileStopping is enabled and org.apache.camel.CamelContext is currently being stopped. This quick stop ability is enabled by default in the regular JMS consumers but to enable for reply managers you must enable this flag.
-| acknowledgementMode | | | int | The JMS acknowledgement mode defined as an Integer. Allows you to set vendor-specific extensions to the acknowledgment mode.For the regular modes it is preferable to use the acknowledgementModeName instead.
-| eagerLoadingOfProperties | | false | boolean | Enables eager loading of JMS properties as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties
-| acknowledgementModeName | | AUTO_ACKNOWLEDGE | String | The JMS acknowledgement name which is one of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
-| autoStartup | | true | boolean | Specifies whether the consumer container should auto-startup.
-| cacheLevel | | | int | Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details.
-| cacheLevelName | | CACHE_AUTO | String | Sets the cache level by name for the underlying JMS resources. Possible values are: CACHE_AUTO CACHE_CONNECTION CACHE_CONSUMER CACHE_NONE and CACHE_SESSION. The default setting is CACHE_AUTO. See the Spring documentation and Transactions Cache Levels for more information.
-| replyToCacheLevelName | | | String | Sets the cache level by name for the reply consumer when doing request/reply over JMS. This option only applies when using fixed reply queues (not temporary). Camel will by default use: CACHE_CONSUMER for exclusive or shared w/ replyToSelectorName. And CACHE_SESSION for shared without replyToSelectorName. Some JMS brokers such as IBM WebSphere may require to set the replyToCacheLevelName=CACHE_NONE to work. Note: If using temporary queues then CACHE_NONE is not allowed and you must use a higher value such as CACHE_CONSUMER or CACHE_SESSION.
-| clientId | | | String | Sets the JMS client ID to use. Note that this value if specified must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead.
-| concurrentConsumers | | 1 | int | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener.
-| replyToConcurrentConsumers | | 1 | int | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads.
-| connectionFactory | | | ConnectionFactory | The connection factory to be use. A connection factory must be configured either on the component or endpoint.
-| username | | | String | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory.
-| password | | | String | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory.
-| deliveryPersistent | | true | boolean | Specifies whether persistent delivery is used by default.
-| deliveryMode | | | Integer | Specifies the delivery mode to be used. Possibles values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2.
-| durableSubscriptionName | | | String | The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well.
-| exceptionListener | | | ExceptionListener | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions.
-| errorHandler | | | ErrorHandler | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure than having to code a custom errorHandler.
-| errorHandlerLoggingLevel | | WARN | LoggingLevel | Allows to configure the default errorHandler logging level for logging uncaught exceptions.
-| errorHandlerLogStackTrace | | true | boolean | Allows to control whether stacktraces should be logged or not by the default errorHandler.
-| explicitQosEnabled | | false | boolean | Set if the deliveryMode priority or timeToLive qualities of service should be used when sending messages. This option is based on Spring's JmsTemplate. The deliveryMode priority and timeToLive options are applied to the current endpoint. This contrasts with the preserveMessageQos option which operates at message granularity reading QoS properties exclusively from the Camel In message headers.
-| exposeListenerSession | | false | boolean | Specifies whether the listener session should be exposed when consuming messages.
-| idleTaskExecutionLimit | | 1 | int | Specifies the limit for idle executions of a receive task not having received any message within its execution. If this limit is reached the task will shut down and leave receiving to other executing tasks (in the case of dynamic scheduling; see the maxConcurrentConsumers setting). There is additional doc available from Spring.
-| idleConsumerLimit | | 1 | int | Specify the limit for the number of consumers that are allowed to be idle at any given time.
-| maxConcurrentConsumers | | | int | Specifies the maximum number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToMaxConcurrentConsumers is used to control number of concurrent consumers on the reply message listener.
-| replyToMaxConcurrentConsumers | | | int | Specifies the maximum number of concurrent consumers when using request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads.
-| replyOnTimeoutToMaxConcurrentConsumers | | 1 | int | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS.
-| maxMessagesPerTask | | -1 | int | The number of messages per task. -1 is unlimited. If you use a range for concurrent consumers (eg min max) then this option can be used to set a value to eg 100 to control how fast the consumers will shrink when less work is required.
-| messageConverter | | | MessageConverter | To use a custom Spring org.springframework.jms.support.converter.MessageConverter so you can be in control how to map to/from a javax.jms.Message.
-| mapJmsMessage | | true | boolean | Specifies whether Camel should auto map the received JMS message to a suited payload type such as javax.jms.TextMessage to a String etc.
-| messageIdEnabled | | true | boolean | When sending specifies whether message IDs should be added. This is just an hint to the JMS broker.If the JMS provider accepts this hint these messages must have the message ID set to null; if the provider ignores the hint the message ID must be set to its normal unique value
-| messageTimestampEnabled | | true | boolean | Specifies whether timestamps should be enabled by default on sending messages. This is just an hint to the JMS broker.If the JMS provider accepts this hint these messages must have the timestamp set to zero; if the provider ignores the hint the timestamp must be set to its normal value
-| alwaysCopyMessage | | false | boolean | If true Camel will always make a JMS message copy of the message when it is passed to the producer for sending. Copying the message is needed in some situations such as when a replyToDestinationSelectorName is set (incidentally Camel will set the alwaysCopyMessage option to true if a replyToDestinationSelectorName is set)
-| useMessageIDAsCorrelationID | | false | boolean | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages.
-| priority | | 4 | int | Values greater than 1 specify the message priority when sending (where 0 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect.
-| pubSubNoLocal | | false | boolean | Specifies whether to inhibit the delivery of messages published by its own connection.
-| receiveTimeout | | 1000 | long | The timeout for receiving messages (in milliseconds).
-| recoveryInterval | | 5000 | long | Specifies the interval between recovery attempts i.e. when a connection is being refreshed in milliseconds. The default is 5000 ms that is 5 seconds.
-| subscriptionDurable | | false | boolean | Deprecated: Enabled by default if you specify a durableSubscriptionName and a clientId.
-| taskExecutor | | | TaskExecutor | Allows you to specify a custom task executor for consuming messages.
-| timeToLive | | -1 | long | When sending messages specifies the time-to-live of the message (in milliseconds).
-| transacted | | false | boolean | Specifies whether to use transacted mode
-| lazyCreateTransactionManager | | true | boolean | If true Camel will create a JmsTransactionManager if there is no transactionManager injected when option transacted=true.
-| transactionManager | | | PlatformTransactionManager | The Spring transaction manager to use.
-| transactionName | | | String | The name of the transaction to use.
-| transactionTimeout | | -1 | int | The timeout value of the transaction (in seconds) if using transacted mode.
-| testConnectionOnStartup | | false | boolean | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well.
-| asyncStartListener | | false | boolean | Whether to startup the JmsConsumer message listener asynchronously when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true you will let routes startup while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used then beware that if the connection could not be established then an exception is logged at WARN level and the consumer will not be able to receive messages; You can then restart the route to retry.
-| asyncStopListener | | false | boolean | Whether to stop the JmsConsumer message listener asynchronously when stopping a route.
-| forceSendOriginalMessage | | false | boolean | When using mapJmsMessage=false Camel will create a new JMS message to send to a new JMS destination if you touch the headers (get or set) during the route. Set this option to true to force Camel to send the original JMS message that was received.
-| requestTimeout | | 20000 | long | The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds). The default is 20 seconds. You can include the header CamelJmsRequestTimeout to override this endpoint configured timeout value and thus have per message individual timeout values. See also the requestTimeoutCheckerInterval option.
-| requestTimeoutCheckerInterval | | 1000 | long | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs then you can lower this interval to check more frequently. The timeout is determined by the option requestTimeout.
-| transferExchange | | false | boolean | You can transfer the exchange over the wire instead of just the body and headers. The following fields are transferred: In body Out body Fault body In headers Out headers Fault headers exchange properties exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. You must enable this option on both the producer and consumer side so Camel knows the payloads is an Exchange and not a regular payload.
-| transferException | | false | boolean | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled this option takes precedence. The caught exception is required to be serializable. The original Exception on the consumer side can be wrapped in an outer exception such as org.apache.camel.RuntimeCamelException when returned to the producer.
-| transferFault | | false | boolean | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed with a SOAP fault (not exception) on the consumer side then the fault flag on MessageisFault() will be send back in the response as a JMS header with the key org.apache.camel.component.jms.JmsConstantsJMS_TRANSFER_FAULTJMS_TRANSFER_FAULT. If the client is Camel the returned fault flag will be set on the link org.apache.camel.MessagesetFault(boolean). You may want to enable this when using Camel components that support faults such as SOAP based such as cxf or spring-ws.
-| jmsOperations | | | JmsOperations | Allows you to use your own implementation of the org.springframework.jms.core.JmsOperations interface. Camel uses JmsTemplate as default. Can be used for testing purpose but not used much as stated in the spring API docs.
-| destinationResolver | | | DestinationResolver | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example to lookup the real destination in a JNDI registry).
-| replyToType | | | ReplyToType | Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request/reply over JMS. Possible values are: Temporary Shared or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured then Shared is used by default. This option allows you to use exclusive queues instead of shared ones. See Camel JMS documentation for more details and especially the notes about the implications if running in a clustered environment and the fact that Shared reply queues has lower performance than its alternatives Temporary and Exclusive.
-| preserveMessageQos | | false | boolean | Set to true if you want to send message using the QoS settings specified on the message instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority JMSDeliveryMode and JMSExpiration. You can provide all or only some of them. If not provided Camel will fall back to use the values from the endpoint instead. So when using this option the headers override the values from the endpoint. The explicitQosEnabled option by contrast will only use options set on the endpoint and not values from the message header.
-| asyncConsumer | | false | boolean | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100 strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transacted has been enabled then asyncConsumer=true does not run asynchronously as transaction must be executed synchronously (Camel 3.0 may support async transactions).
-| allowNullBody | | true | boolean | Whether to allow sending messages with no body. If this option is false and the message body is null then an JMSException is thrown.
-| includeSentJMSMessageID | | false | boolean | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination.
-| includeAllJMSXProperties | | false | boolean | Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy then this option does not apply.
-| defaultTaskExecutorType | | | DefaultTaskExecutorType | Specifies what default TaskExecutor type to use in the DefaultMessageListenerContainer for both consumer endpoints and the ReplyTo consumer of producer endpoints. Possible values: SimpleAsync (uses Spring's SimpleAsyncTaskExecutor) or ThreadPool (uses Spring's ThreadPoolTaskExecutor with optimal values - cached threadpool-like). If not set it defaults to the previous behaviour which uses a cached thread pool for consumer endpoints and SimpleAsync for reply consumers. The use of ThreadPool is recommended to reduce thread trash in elastic configurations with dynamically increasing and decreasing concurrent consumers.
-| jmsKeyFormatStrategy | | | JmsKeyFormatStrategy | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides two implementations out of the box: default and passthrough. The default strategy will safely marshal dots and hyphens (. and -). The passthrough strategy leaves the key as is. 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.
-| applicationContext | | | ApplicationContext | Sets the Spring ApplicationContext to use
-| queueBrowseStrategy | | | QueueBrowseStrategy | To use a custom QueueBrowseStrategy when browsing queues
-| 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.
-| waitForProvisionCorrelationToBeUpdatedCounter | | 50 | int | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled.
-| waitForProvisionCorrelationToBeUpdatedThreadSleepingTime | | 100 | long | Interval in millis to sleep each time while waiting for provisional correlation id to be updated.
-| headerFilterStrategy | | | HeaderFilterStrategy | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message.
+| configuration | advanced | | JmsConfiguration | To use a shared JMS configuration
+| acceptMessagesWhileStopping | consumer (advanced) | false | boolean | Specifies whether the consumer accept messages while it is stopping. You may consider enabling this option if you start and stop JMS routes at runtime while there are still messages enqueued on the queue. If this option is false and you stop the JMS route then messages may be rejected and the JMS broker would have to attempt redeliveries which yet again may be rejected and eventually the message may be moved at a dead letter queue on the JMS broker. To avoid this its recommended to enable this option.
+| allowReplyManagerQuickStop | consumer (advanced) | false | boolean | Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfigurationisAcceptMessagesWhileStopping is enabled and org.apache.camel.CamelContext is currently being stopped. This quick stop ability is enabled by default in the regular JMS consumers but to enable for reply managers you must enable this flag.
+| acknowledgementMode | consumer | | int | The JMS acknowledgement mode defined as an Integer. Allows you to set vendor-specific extensions to the acknowledgment mode.For the regular modes it is preferable to use the acknowledgementModeName instead.
+| eagerLoadingOfProperties | consumer (advanced) | false | boolean | Enables eager loading of JMS properties as soon as a message is loaded which generally is inefficient as the JMS properties may not be required but sometimes can catch early any issues with the underlying JMS provider and the use of JMS properties
+| acknowledgementModeName | consumer | AUTO_ACKNOWLEDGE | String | The JMS acknowledgement name which is one of: SESSION_TRANSACTED CLIENT_ACKNOWLEDGE AUTO_ACKNOWLEDGE DUPS_OK_ACKNOWLEDGE
+| autoStartup | consumer | true | boolean | Specifies whether the consumer container should auto-startup.
+| cacheLevel | consumer | | int | Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details.
+| cacheLevelName | consumer | CACHE_AUTO | String | Sets the cache level by name for the underlying JMS resources. Possible values are: CACHE_AUTO CACHE_CONNECTION CACHE_CONSUMER CACHE_NONE and CACHE_SESSION. The default setting is CACHE_AUTO. See the Spring documentation and Transactions Cache Levels for more information.
+| replyToCacheLevelName | producer (advanced) | | String | Sets the cache level by name for the reply consumer when doing request/reply over JMS. This option only applies when using fixed reply queues (not temporary). Camel will by default use: CACHE_CONSUMER for exclusive or shared w/ replyToSelectorName. And CACHE_SESSION for shared without replyToSelectorName. Some JMS brokers such as IBM WebSphere may require to set the replyToCacheLevelName=CACHE_NONE to work. Note: If using temporary queues then CACHE_NONE is not allowed and you must use a higher value such as CACHE_CONSUMER or CACHE_SESSION.
+| clientId | common | | String | Sets the JMS client ID to use. Note that this value if specified must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead.
+| concurrentConsumers | consumer | 1 | int | Specifies the default number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToConcurrentConsumers is used to control number of concurrent consumers on the reply message listener.
+| replyToConcurrentConsumers | producer | 1 | int | Specifies the default number of concurrent consumers when doing request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads.
+| connectionFactory | common | | ConnectionFactory | The connection factory to be use. A connection factory must be configured either on the component or endpoint.
+| username | security | | String | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory.
+| password | security | | String | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory.
+| deliveryPersistent | producer | true | boolean | Specifies whether persistent delivery is used by default.
+| deliveryMode | producer | | Integer | Specifies the delivery mode to be used. Possibles values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2.
+| durableSubscriptionName | common | | String | The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well.
+| exceptionListener | advanced | | ExceptionListener | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions.
+| errorHandler | advanced | | ErrorHandler | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure than having to code a custom errorHandler.
+| errorHandlerLoggingLevel | advanced | WARN | LoggingLevel | Allows to configure the default errorHandler logging level for logging uncaught exceptions.
+| errorHandlerLogStackTrace | advanced | true | boolean | Allows to control whether stacktraces should be logged or not by the default errorHandler.
+| explicitQosEnabled | producer | false | boolean | Set if the deliveryMode priority or timeToLive qualities of service should be used when sending messages. This option is based on Spring's JmsTemplate. The deliveryMode priority and timeToLive options are applied to the current endpoint. This contrasts with the preserveMessageQos option which operates at message granularity reading QoS properties exclusively from the Camel In message headers.
+| exposeListenerSession | consumer (advanced) | false | boolean | Specifies whether the listener session should be exposed when consuming messages.
+| idleTaskExecutionLimit | advanced | 1 | int | Specifies the limit for idle executions of a receive task not having received any message within its execution. If this limit is reached the task will shut down and leave receiving to other executing tasks (in the case of dynamic scheduling; see the maxConcurrentConsumers setting). There is additional doc available from Spring.
+| idleConsumerLimit | advanced | 1 | int | Specify the limit for the number of consumers that are allowed to be idle at any given time.
+| maxConcurrentConsumers | consumer | | int | Specifies the maximum number of concurrent consumers when consuming from JMS (not for request/reply over JMS). See also the maxMessagesPerTask option to control dynamic scaling up/down of threads. When doing request/reply over JMS then the option replyToMaxConcurrentConsumers is used to control number of concurrent consumers on the reply message listener.
+| replyToMaxConcurrentConsumers | producer | | int | Specifies the maximum number of concurrent consumers when using request/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up/down of threads.
+| replyOnTimeoutToMaxConcurrentConsumers | producer | 1 | int | Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request/reply over JMS.
+| maxMessagesPerTask | advanced | -1 | int | The number of messages per task. -1 is unlimited. If you use a range for concurrent consumers (eg min max) then this option can be used to set a value to eg 100 to control how fast the consumers will shrink when less work is required.
+| messageConverter | advanced | | MessageConverter | To use a custom Spring org.springframework.jms.support.converter.MessageConverter so you can be in control how to map to/from a javax.jms.Message.
+| mapJmsMessage | advanced | true | boolean | Specifies whether Camel should auto map the received JMS message to a suited payload type such as javax.jms.TextMessage to a String etc.
+| messageIdEnabled | advanced | true | boolean | When sending specifies whether message IDs should be added. This is just an hint to the JMS broker.If the JMS provider accepts this hint these messages must have the message ID set to null; if the provider ignores the hint the message ID must be set to its normal unique value
+| messageTimestampEnabled | advanced | true | boolean | Specifies whether timestamps should be enabled by default on sending messages. This is just an hint to the JMS broker.If the JMS provider accepts this hint these messages must have the timestamp set to zero; if the provider ignores the hint the timestamp must be set to its normal value
+| alwaysCopyMessage | producer (advanced) | false | boolean | If true Camel will always make a JMS message copy of the message when it is passed to the producer for sending. Copying the message is needed in some situations such as when a replyToDestinationSelectorName is set (incidentally Camel will set the alwaysCopyMessage option to true if a replyToDestinationSelectorName is set)
+| useMessageIDAsCorrelationID | advanced | false | boolean | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages.
+| priority | producer | 4 | int | Values greater than 1 specify the message priority when sending (where 0 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in order for this option to have any effect.
+| pubSubNoLocal | advanced | false | boolean | Specifies whether to inhibit the delivery of messages published by its own connection.
+| receiveTimeout | advanced | 1000 | long | The timeout for receiving messages (in milliseconds).
+| recoveryInterval | advanced | 5000 | long | Specifies the interval between recovery attempts i.e. when a connection is being refreshed in milliseconds. The default is 5000 ms that is 5 seconds.
+| subscriptionDurable | common | false | boolean | Deprecated: Enabled by default if you specify a durableSubscriptionName and a clientId.
+| taskExecutor | consumer (advanced) | | TaskExecutor | Allows you to specify a custom task executor for consuming messages.
+| timeToLive | producer | -1 | long | When sending messages specifies the time-to-live of the message (in milliseconds).
+| transacted | transaction | false | boolean | Specifies whether to use transacted mode
+| lazyCreateTransactionManager | transaction (advanced) | true | boolean | If true Camel will create a JmsTransactionManager if there is no transactionManager injected when option transacted=true.
+| transactionManager | transaction (advanced) | | PlatformTransactionManager | The Spring transaction manager to use.
+| transactionName | transaction (advanced) | | String | The name of the transaction to use.
+| transactionTimeout | transaction (advanced) | -1 | int | The timeout value of the transaction (in seconds) if using transacted mode.
+| testConnectionOnStartup | common | false | boolean | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well.
+| asyncStartListener | advanced | false | boolean | Whether to startup the JmsConsumer message listener asynchronously when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true you will let routes startup while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used then beware that if the connection could not be established then an exception is logged at WARN level and the consumer will not be able to receive messages; You can then restart the route to retry.
+| asyncStopListener | advanced | false | boolean | Whether to stop the JmsConsumer message listener asynchronously when stopping a route.
+| forceSendOriginalMessage | producer (advanced) | false | boolean | When using mapJmsMessage=false Camel will create a new JMS message to send to a new JMS destination if you touch the headers (get or set) during the route. Set this option to true to force Camel to send the original JMS message that was received.
+| requestTimeout | producer | 20000 | long | The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds). The default is 20 seconds. You can include the header CamelJmsRequestTimeout to override this endpoint configured timeout value and thus have per message individual timeout values. See also the requestTimeoutCheckerInterval option.
+| requestTimeoutCheckerInterval | advanced | 1000 | long | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs then you can lower this interval to check more frequently. The timeout is determined by the option requestTimeout.
+| transferExchange | advanced | false | boolean | You can transfer the exchange over the wire instead of just the body and headers. The following fields are transferred: In body Out body Fault body In headers Out headers Fault headers exchange properties exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. You must enable this option on both the producer and consumer side so Camel knows the payloads is an Exchange and not a regular payload.
+| transferException | advanced | false | boolean | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled this option takes precedence. The caught exception is required to be serializable. The original Exception on the consumer side can be wrapped in an outer exception such as org.apache.camel.RuntimeCamelException when returned to the producer.
+| transferFault | advanced | false | boolean | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed with a SOAP fault (not exception) on the consumer side then the fault flag on MessageisFault() will be send back in the response as a JMS header with the key org.apache.camel.component.jms.JmsConstantsJMS_TRANSFER_FAULTJMS_TRANSFER_FAULT. If the client is Camel the returned fault flag will be set on the link org.apache.camel.MessagesetFault(boolean). You may want to enable this when using Camel components that support faults such as SOAP based such as cxf or spring-ws.
+| jmsOperations | advanced | | JmsOperations | Allows you to use your own implementation of the org.springframework.jms.core.JmsOperations interface. Camel uses JmsTemplate as default. Can be used for testing purpose but not used much as stated in the spring API docs.
+| destinationResolver | advanced | | DestinationResolver | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example to lookup the real destination in a JNDI registry).
+| replyToType | producer | | ReplyToType | Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request/reply over JMS. Possible values are: Temporary Shared or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured then Shared is used by default. This option allows you to use exclusive queues instead of shared ones. See Camel JMS documentation for more details and especially the notes about the implications if running in a clustered environment and the fact that Shared reply queues has lower performance than its alternatives Temporary and Exclusive.
+| preserveMessageQos | producer | false | boolean | Set to true if you want to send message using the QoS settings specified on the message instead of the QoS settings on the JMS endpoint. The following three headers are considered JMSPriority JMSDeliveryMode and JMSExpiration. You can provide all or only some of them. If not provided Camel will fall back to use the values from the endpoint instead. So when using this option the headers override the values from the endpoint. The explicitQosEnabled option by contrast will only use options set on the endpoint and not values from the message header.
+| asyncConsumer | consumer | false | boolean | Whether the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pickup the next message from the JMS queue while the previous message is being processed asynchronously (by the Asynchronous Routing Engine). This means that messages may be processed not 100 strictly in order. If disabled (as default) then the Exchange is fully processed before the JmsConsumer will pickup the next message from the JMS queue. Note if transacted has been enabled then asyncConsumer=true does not run asynchronously as transaction must be executed synchronously (Camel 3.0 may support async transactions).
+| allowNullBody | producer (advanced) | true | boolean | Whether to allow sending messages with no body. If this option is false and the message body is null then an JMSException is thrown.
+| includeSentJMSMessageID | producer (advanced) | false | boolean | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination.
+| includeAllJMSXProperties | advanced | false | boolean | Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy then this option does not apply.
+| defaultTaskExecutorType | consumer (advanced) | | DefaultTaskExecutorType | Specifies what default TaskExecutor type to use in the DefaultMessageListenerContainer for both consumer endpoints and the ReplyTo consumer of producer endpoints. Possible values: SimpleAsync (uses Spring's SimpleAsyncTaskExecutor) or ThreadPool (uses Spring's ThreadPoolTaskExecutor with optimal values - cached threadpool-like). If not set it defaults to the previous behaviour which uses a cached thread pool for consumer endpoints and SimpleAsync for reply consumers. The use of ThreadPool is recommended to reduce thread trash in elastic configurations with dynamically increasing and decreasing concurrent consumers.
+| jmsKeyFormatStrategy | advanced | | JmsKeyFormatStrategy | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides two implementations out of the box: default and passthrough. The default strategy will safely marshal dots and hyphens (. and -). The passthrough strategy leaves the key as is. 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.
+| applicationContext | common | | ApplicationContext | Sets the Spring ApplicationContext to use
+| queueBrowseStrategy | advanced | | QueueBrowseStrategy | To use a custom QueueBrowseStrategy when browsing queues
+| 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.
+| waitForProvisionCorrelationToBeUpdatedCounter | advanced | 50 | int | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled.
+| waitForProvisionCorrelationToBeUpdatedThreadSleepingTime | advanced | 100 | long | Interval in millis to sleep each time while waiting for provisional correlation id to be updated.
+| 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-apns/src/main/docs/apns-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-apns/src/main/docs/apns-component.adoc b/components/camel-apns/src/main/docs/apns-component.adoc
index 3800de1..e511a3e 100644
--- a/components/camel-apns/src/main/docs/apns-component.adoc
+++ b/components/camel-apns/src/main/docs/apns-component.adoc
@@ -65,7 +65,7 @@ The APNS component supports 1 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| apnsService | | | ApnsService | *Required* The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService
+| apnsService | common | | ApnsService | *Required* The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
index b38b2e0..afe06a2 100644
--- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
+++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
@@ -46,13 +46,13 @@ The Atmosphere Websocket 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 | common | | String | Default name of servlet to use. The default name is CamelServlet.
+| httpRegistry | common | | HttpRegistry | To use a custom org.apache.camel.component.servlet.HttpRegistry.
+| attachmentMultipartBinding | common | 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-avro/src/main/docs/avro-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-avro/src/main/docs/avro-component.adoc b/components/camel-avro/src/main/docs/avro-component.adoc
index 59792f5..e89d804 100644
--- a/components/camel-avro/src/main/docs/avro-component.adoc
+++ b/components/camel-avro/src/main/docs/avro-component.adoc
@@ -189,7 +189,7 @@ The Avro 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 | | | AvroConfiguration | To use a shared AvroConfiguration to configure options once
+| configuration | advanced | | AvroConfiguration | To use a shared AvroConfiguration to configure options once
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
index 5296d41..135f397 100644
--- a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
+++ b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
@@ -73,7 +73,7 @@ The Beanstalk component supports 1 options which are listed below.
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
-| connectionSettingsFactory | | | ConnectionSettingsFactory | Custom ConnectionSettingsFactory. Specify which ConnectionSettingsFactory to use to make connections to Beanstalkd. Especially useful for unit testing without beanstalkd daemon (you can mock ConnectionSettings)
+| connectionSettingsFactory | common | | ConnectionSettingsFactory | Custom ConnectionSettingsFactory. Specify which ConnectionSettingsFactory to use to make connections to Beanstalkd. Especially useful for unit testing without beanstalkd daemon (you can mock ConnectionSettings)
|=======================================================================
{% endraw %}
// component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/e4c6ab4e/components/camel-box/src/main/docs/box-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-box/src/main/docs/box-component.adoc b/components/camel-box/src/main/docs/box-component.adoc
index b83ad21..bf63453 100644
--- a/components/camel-box/src/main/docs/box-component.adoc
+++ b/components/camel-box/src/main/docs/box-component.adoc
@@ -50,7 +50,7 @@ The Box 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 | | | BoxConfiguration | To use the shared configuration
+| configuration | common | | BoxConfiguration | To use the shared configuration
|=======================================================================
{% endraw %}
// component options: END