This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/master by this push:
     new 538555a  Regen
538555a is described below

commit 538555af4d3d05917c83a99a26def08f6c360adb
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue May 5 09:46:31 2020 +0200

    Regen
---
 .../springboot/catalog/components/activemq.json    | 10 ++--
 .../src/main/docs/activemq-starter.adoc            |  6 +--
 .../springboot/ActiveMQComponentConfiguration.java | 62 +++++++++++-----------
 docs/modules/ROOT/pages/activemq-starter.adoc      |  6 +--
 4 files changed, 43 insertions(+), 41 deletions(-)

diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
index 0203b73..ba963bd 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
@@ -21,17 +21,15 @@
     "lenientProperties": false
   },
   "componentProperties": {
-    "brokerURL": { "kind": "property", "displayName": "Broker URL", "group": 
"common", "required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "secret": false, "description": "Sets the broker URL to 
use to connect to ActiveMQ" },
+    "brokerURL": { "kind": "property", "displayName": "Broker URL", "group": 
"common", "label": "common", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret": 
false, "description": "Sets the broker URL to use to connect to ActiveMQ. If 
none configured then localhost:61616 is used by default (however can be 
overridden by configuration from environment variables)" },
     "clientId": { "kind": "property", "displayName": "Client Id", "group": 
"common", "label": "", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "secret": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "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 onl [...]
-    "configuration": { "kind": "property", "displayName": "Configuration", 
"group": "common", "required": false, "type": "object", "javaType": 
"org.apache.camel.component.jms.JmsConfiguration", "deprecated": false, 
"secret": false, "description": "Configuration of ActiveMQ" },
     "connectionFactory": { "kind": "property", "displayName": "Connection 
Factory", "group": "common", "label": "", "required": false, "type": "object", 
"javaType": "javax.jms.ConnectionFactory", "deprecated": false, "secret": 
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", 
"configurationField": "configuration", "description": "The connection factory 
to be use. A connection factory must be configured either on the component or 
endpoint." },
     "disableReplyTo": { "kind": "property", "displayName": "Disable Reply To", 
"group": "common", "label": "", "required": false, "type": "boolean", 
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": 
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", 
"configurationField": "configuration", "description": "Specifies whether Camel 
ignores the JMSReplyTo header in messages. If true, Camel does not send a reply 
back to the destination spe [...]
     "durableSubscriptionName": { "kind": "property", "displayName": "Durable 
Subscription Name", "group": "common", "label": "", "required": false, "type": 
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false, 
"configurationClass": "org.apache.camel.component.jms.JmsConfiguration", 
"configurationField": "configuration", "description": "The durable subscriber 
name for specifying durable topic subscriptions. The clientId option must be 
configured as well." },
     "jmsMessageType": { "kind": "property", "displayName": "Jms Message Type", 
"group": "common", "label": "", "required": false, "type": "object", 
"javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", 
"Map", "Object", "Stream", "Text" ], "deprecated": false, "secret": false, 
"configurationClass": "org.apache.camel.component.jms.JmsConfiguration", 
"configurationField": "configuration", "description": "Allows you to force the 
use of a specific javax.jms.Message i [...]
     "testConnectionOnStartup": { "kind": "property", "displayName": "Test 
Connection On Startup", "group": "common", "label": "", "required": false, 
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, 
"defaultValue": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "Specifies whether to test the connection on 
startup. This ensures that when Camel starts that all the JMS consum [...]
-    "trustAllPackages": { "kind": "property", "displayName": "Trust All 
Packages", "group": "common", "required": false, "type": "boolean", "javaType": 
"boolean", "deprecated": false, "secret": false, "defaultValue": false, 
"description": "Define if all Java packages are trusted or not (for Java object 
JMS message types). Notice its not recommended practice to send Java serialized 
objects over network. Setting this to true can expose security risks, so use 
this with care." },
-    "usePooledConnection": { "kind": "property", "displayName": "Use Pooled 
Connection", "group": "common", "required": false, "type": "boolean", 
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": 
true, "description": "Enables or disables whether a PooledConnectionFactory 
will be used so that when messages are sent to ActiveMQ from outside of a 
message consuming thread, pooling will be used rather than the default with the 
Spring JmsTemplate which will create a  [...]
-    "useSingleConnection": { "kind": "property", "displayName": "Use Single 
Connection", "group": "common", "required": false, "type": "boolean", 
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": 
false, "description": "Enables or disables whether a Spring 
SingleConnectionFactory will be used so that when messages are sent to ActiveMQ 
from outside of a message consuming thread, pooling will be used rather than 
the default with the Spring JmsTemplate which will c [...]
+    "usePooledConnection": { "kind": "property", "displayName": "Use Pooled 
Connection", "group": "common", "label": "common", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", 
"secret": false, "defaultValue": "true", "description": "Enables or disables 
whether a PooledConnectionFactory will be used so that when messages are sent 
to ActiveMQ from outside of a message consuming thread, pooling will be used 
rather than the default with [...]
+    "useSingleConnection": { "kind": "property", "displayName": "Use Single 
Connection", "group": "common", "label": "common", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", 
"secret": false, "defaultValue": "false", "description": "Enables or disables 
whether a Spring SingleConnectionFactory will be used so that when messages are 
sent to ActiveMQ from outside of a message consuming thread, pooling will be 
used rather than the defa [...]
     "acknowledgementModeName": { "kind": "property", "displayName": 
"Acknowledgement Mode Name", "group": "consumer", "label": "consumer", 
"required": false, "type": "string", "javaType": "java.lang.String", "enum": [ 
"SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", 
"DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "secret": false, "defaultValue": 
"AUTO_ACKNOWLEDGE", "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", [...]
     "asyncConsumer": { "kind": "property", "displayName": "Async Consumer", 
"group": "consumer", "label": "consumer", "required": false, "type": "boolean", 
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": 
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", 
"configurationField": "configuration", "description": "Whether the JmsConsumer 
processes the Exchange asynchronously. If enabled then the JmsConsumer may 
pickup the next message f [...]
     "autoStartup": { "kind": "property", "displayName": "Auto Startup", 
"group": "consumer", "label": "consumer", "required": false, "type": "boolean", 
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": 
"true", "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "Specifies whether the consumer container 
should auto-startup." },
@@ -86,6 +84,7 @@
     "asyncStartListener": { "kind": "property", "displayName": "Async Start 
Listener", "group": "advanced", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "secret": false, 
"defaultValue": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "Whether to startup the JmsConsumer message 
listener asynchronously, when starting a route. For example if a JmsCo [...]
     "asyncStopListener": { "kind": "property", "displayName": "Async Stop 
Listener", "group": "advanced", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "secret": false, 
"defaultValue": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "Whether to stop the JmsConsumer message 
listener asynchronously, when stopping a route." },
     "basicPropertyBinding": { "kind": "property", "displayName": "Basic 
Property Binding", "group": "advanced", "label": "advanced", "required": false, 
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, 
"defaultValue": false, "description": "Whether the component should use basic 
property binding (Camel 2.x) or the newer property binding with additional 
capabilities" },
+    "configuration": { "kind": "property", "displayName": "Configuration", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.apache.camel.component.jms.JmsConfiguration", "deprecated": 
false, "secret": false, "description": "To use a shared JMS configuration" },
     "destinationResolver": { "kind": "property", "displayName": "Destination 
Resolver", "group": "advanced", "label": "advanced", "required": false, "type": 
"object", "javaType": 
"org.springframework.jms.support.destination.DestinationResolver", 
"deprecated": false, "secret": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "A pluggable 
org.springframework.jms.support.destination.DestinationResolver that [...]
     "errorHandler": { "kind": "property", "displayName": "Error Handler", 
"group": "advanced", "label": "advanced", "required": false, "type": "object", 
"javaType": "org.springframework.util.ErrorHandler", "deprecated": false, 
"secret": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "Specifies a 
org.springframework.util.ErrorHandler to be invoked in case of any uncaught 
exceptions thrown while processi [...]
     "exceptionListener": { "kind": "property", "displayName": "Exception 
Listener", "group": "advanced", "label": "advanced", "required": false, "type": 
"object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, 
"secret": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "Specifies the JMS Exception Listener that is 
to be notified of any underlying JMS exceptions." },
@@ -107,6 +106,7 @@
     "requestTimeoutCheckerInterval": { "kind": "property", "displayName": 
"Request Timeout Checker Interval", "group": "advanced", "label": "advanced", 
"required": false, "type": "integer", "javaType": "long", "deprecated": false, 
"secret": false, "defaultValue": "1000", "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "Configures how often Camel should check for 
timed out Exchanges when doing request\/reply ov [...]
     "transferException": { "kind": "property", "displayName": "Transfer 
Exception", "group": "advanced", "label": "advanced", "required": false, 
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, 
"defaultValue": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "If enabled and you are using Request Reply 
messaging (InOut) and an Exchange failed on the consumer side, then the c [...]
     "transferExchange": { "kind": "property", "displayName": "Transfer 
Exchange", "group": "advanced", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "secret": false, 
"defaultValue": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "You can transfer the exchange over the wire 
instead of just the body and headers. The following fields are transferred [...]
+    "trustAllPackages": { "kind": "property", "displayName": "Trust All 
Packages", "group": "advanced", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", 
"secret": false, "defaultValue": "false", "description": "Define if all Java 
packages are trusted or not (for Java object JMS message types). Notice its not 
recommended practice to send Java serialized objects over network. Setting this 
to true can expose securi [...]
     "useMessageIDAsCorrelationID": { "kind": "property", "displayName": "Use 
Message IDAs Correlation ID", "group": "advanced", "label": "advanced", 
"required": false, "type": "boolean", "javaType": "boolean", "deprecated": 
false, "secret": false, "defaultValue": false, "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "Specifies whether JMSMessageID should always 
be used as JMSCorrelationID for InOut messages." },
     "waitForProvisionCorrelationToBeUpdatedCounter": { "kind": "property", 
"displayName": "Wait For Provision Correlation To Be Updated Counter", "group": 
"advanced", "label": "advanced", "required": false, "type": "integer", 
"javaType": "int", "deprecated": false, "secret": false, "defaultValue": "50", 
"configurationClass": "org.apache.camel.component.jms.JmsConfiguration", 
"configurationField": "configuration", "description": "Number of times to wait 
for provisional correlation id to b [...]
     "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": { "kind": 
"property", "displayName": "Wait For Provision Correlation To Be Updated Thread 
Sleeping Time", "group": "advanced", "label": "advanced", "required": false, 
"type": "integer", "javaType": "long", "deprecated": false, "secret": false, 
"defaultValue": "100", "configurationClass": 
"org.apache.camel.component.jms.JmsConfiguration", "configurationField": 
"configuration", "description": "Interval in millis to sleep each  [...]
diff --git 
a/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc 
b/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
index 3fe1d0b..cfa21ee 100644
--- 
a/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
+++ 
b/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
@@ -39,12 +39,12 @@ The component supports 100 options, which are listed below.
 | *camel.component.activemq.async-stop-listener* | Whether to stop the 
JmsConsumer message listener asynchronously, when stopping a route. | false | 
Boolean
 | *camel.component.activemq.auto-startup* | Specifies whether the consumer 
container should auto-startup. | true | Boolean
 | *camel.component.activemq.basic-property-binding* | Whether the component 
should use basic property binding (Camel 2.x) or the newer property binding 
with additional capabilities | false | Boolean
-| *camel.component.activemq.broker-url* | Sets the broker URL to use to 
connect to ActiveMQ |  | String
+| *camel.component.activemq.broker-url* | Sets the broker URL to use to 
connect to ActiveMQ. If none configured then localhost:61616 is used by default 
(however can be overridden by configuration from environment variables) |  | 
String
 | *camel.component.activemq.cache-level* | Sets the cache level by ID for the 
underlying JMS resources. See cacheLevelName option for more details. |  | 
Integer
 | *camel.component.activemq.cache-level-name* | 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. | CACHE_AUTO | String
 | *camel.component.activemq.client-id* | 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. |  | String
 | *camel.component.activemq.concurrent-consumers* | 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. | 1 | Integer
-| *camel.component.activemq.configuration* | Configuration of ActiveMQ. The 
option is a org.apache.camel.component.jms.JmsConfiguration type. |  | String
+| *camel.component.activemq.configuration* | To use a shared JMS 
configuration. The option is a org.apache.camel.component.jms.JmsConfiguration 
type. |  | String
 | *camel.component.activemq.connection-factory* | The connection factory to be 
use. A connection factory must be configured either on the component or 
endpoint. The option is a javax.jms.ConnectionFactory type. |  | String
 | *camel.component.activemq.consumer-type* | The consumer type to use, which 
can be one of: Simple, Default, or Custom. The consumer type determines which 
Spring JMS listener to use. Default will use 
org.springframework.jms.listener.DefaultMessageListenerContainer, Simple will 
use org.springframework.jms.listener.SimpleMessageListenerContainer. When 
Custom is specified, the MessageListenerContainerFactory defined by the 
messageListenerContainerFactory option will determine what org.sprin [...]
 | *camel.component.activemq.correlation-property* | When using InOut exchange 
pattern use this JMS property instead of JMSCorrelationID JMS property to 
correlate messages. If set messages will be correlated solely on the value of 
this property JMSCorrelationID property will be ignored and not set by Camel. | 
 | String
@@ -119,7 +119,7 @@ The component supports 100 options, which are listed below.
 | *camel.component.activemq.transfer-exchange* | 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 p [...]
 | *camel.component.activemq.trust-all-packages* | Define if all Java packages 
are trusted or not (for Java object JMS message types). Notice its not 
recommended practice to send Java serialized objects over network. Setting this 
to true can expose security risks, so use this with care. | false | Boolean
 | *camel.component.activemq.use-message-id-as-correlation-id* | Specifies 
whether JMSMessageID should always be used as JMSCorrelationID for InOut 
messages. | false | Boolean
-| *camel.component.activemq.use-pooled-connection* | Enables or disables 
whether a PooledConnectionFactory will be used so that when messages are sent 
to ActiveMQ from outside of a message consuming thread, pooling will be used 
rather than the default with the Spring JmsTemplate which will create a new 
connection, session, producer for each message then close them all down again. 
The default value is true. | false | Boolean
+| *camel.component.activemq.use-pooled-connection* | Enables or disables 
whether a PooledConnectionFactory will be used so that when messages are sent 
to ActiveMQ from outside of a message consuming thread, pooling will be used 
rather than the default with the Spring JmsTemplate which will create a new 
connection, session, producer for each message then close them all down again. 
The default value is true. | true | Boolean
 | *camel.component.activemq.use-single-connection* | Enables or disables 
whether a Spring SingleConnectionFactory will be used so that when messages are 
sent to ActiveMQ from outside of a message consuming thread, pooling will be 
used rather than the default with the Spring JmsTemplate which will create a 
new connection, session, producer for each message then close them all down 
again. The default value is false and a pooled connection is used by default. | 
false | Boolean
 | *camel.component.activemq.username* | Username to use with the 
ConnectionFactory. You can also configure username/password directly on the 
ConnectionFactory. |  | String
 | 
*camel.component.activemq.wait-for-provision-correlation-to-be-updated-counter* 
| 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. | 50 | Integer
diff --git 
a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
 
b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
index 635e0f1..6171ec2 100644
--- 
a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
+++ 
b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
@@ -45,7 +45,9 @@ public class ActiveMQComponentConfiguration
      */
     private Boolean enabled;
     /**
-     * Sets the broker URL to use to connect to ActiveMQ
+     * Sets the broker URL to use to connect to ActiveMQ. If none configured
+     * then localhost:61616 is used by default (however can be overridden by
+     * configuration from environment variables)
      */
     private String brokerUrl;
     /**
@@ -56,11 +58,6 @@ public class ActiveMQComponentConfiguration
      */
     private String clientId;
     /**
-     * Configuration of ActiveMQ. The option is a
-     * org.apache.camel.component.jms.JmsConfiguration type.
-     */
-    private String configuration;
-    /**
      * The connection factory to be use. A connection factory must be 
configured
      * either on the component or endpoint. The option is a
      * javax.jms.ConnectionFactory type.
@@ -98,13 +95,6 @@ public class ActiveMQComponentConfiguration
      */
     private Boolean testConnectionOnStartup = false;
     /**
-     * Define if all Java packages are trusted or not (for Java object JMS
-     * message types). Notice its not recommended practice to send Java
-     * serialized objects over network. Setting this to true can expose 
security
-     * risks, so use this with care.
-     */
-    private Boolean trustAllPackages = false;
-    /**
      * Enables or disables whether a PooledConnectionFactory will be used so
      * that when messages are sent to ActiveMQ from outside of a message
      * consuming thread, pooling will be used rather than the default with the
@@ -112,7 +102,7 @@ public class ActiveMQComponentConfiguration
      * for each message then close them all down again. The default value is
      * true.
      */
-    private Boolean usePooledConnection = false;
+    private Boolean usePooledConnection = true;
     /**
      * Enables or disables whether a Spring SingleConnectionFactory will be 
used
      * so that when messages are sent to ActiveMQ from outside of a message
@@ -531,6 +521,11 @@ public class ActiveMQComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
+     * To use a shared JMS configuration. The option is a
+     * org.apache.camel.component.jms.JmsConfiguration type.
+     */
+    private String configuration;
+    /**
      * A pluggable
      * org.springframework.jms.support.destination.DestinationResolver that
      * allows you to use your own resolver (for example, to lookup the real
@@ -694,6 +689,13 @@ public class ActiveMQComponentConfiguration
      */
     private Boolean transferExchange = false;
     /**
+     * Define if all Java packages are trusted or not (for Java object JMS
+     * message types). Notice its not recommended practice to send Java
+     * serialized objects over network. Setting this to true can expose 
security
+     * risks, so use this with care.
+     */
+    private Boolean trustAllPackages = false;
+    /**
      * Specifies whether JMSMessageID should always be used as JMSCorrelationID
      * for InOut messages.
      */
@@ -775,14 +777,6 @@ public class ActiveMQComponentConfiguration
         this.clientId = clientId;
     }
 
-    public String getConfiguration() {
-        return configuration;
-    }
-
-    public void setConfiguration(String configuration) {
-        this.configuration = configuration;
-    }
-
     public String getConnectionFactory() {
         return connectionFactory;
     }
@@ -823,14 +817,6 @@ public class ActiveMQComponentConfiguration
         this.testConnectionOnStartup = testConnectionOnStartup;
     }
 
-    public Boolean getTrustAllPackages() {
-        return trustAllPackages;
-    }
-
-    public void setTrustAllPackages(Boolean trustAllPackages) {
-        this.trustAllPackages = trustAllPackages;
-    }
-
     public Boolean getUsePooledConnection() {
         return usePooledConnection;
     }
@@ -1287,6 +1273,14 @@ public class ActiveMQComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
+    public String getConfiguration() {
+        return configuration;
+    }
+
+    public void setConfiguration(String configuration) {
+        this.configuration = configuration;
+    }
+
     public String getDestinationResolver() {
         return destinationResolver;
     }
@@ -1458,6 +1452,14 @@ public class ActiveMQComponentConfiguration
         this.transferExchange = transferExchange;
     }
 
+    public Boolean getTrustAllPackages() {
+        return trustAllPackages;
+    }
+
+    public void setTrustAllPackages(Boolean trustAllPackages) {
+        this.trustAllPackages = trustAllPackages;
+    }
+
     public Boolean getUseMessageIdAsCorrelationId() {
         return useMessageIdAsCorrelationId;
     }
diff --git a/docs/modules/ROOT/pages/activemq-starter.adoc 
b/docs/modules/ROOT/pages/activemq-starter.adoc
index 3fe1d0b..cfa21ee 100644
--- a/docs/modules/ROOT/pages/activemq-starter.adoc
+++ b/docs/modules/ROOT/pages/activemq-starter.adoc
@@ -39,12 +39,12 @@ The component supports 100 options, which are listed below.
 | *camel.component.activemq.async-stop-listener* | Whether to stop the 
JmsConsumer message listener asynchronously, when stopping a route. | false | 
Boolean
 | *camel.component.activemq.auto-startup* | Specifies whether the consumer 
container should auto-startup. | true | Boolean
 | *camel.component.activemq.basic-property-binding* | Whether the component 
should use basic property binding (Camel 2.x) or the newer property binding 
with additional capabilities | false | Boolean
-| *camel.component.activemq.broker-url* | Sets the broker URL to use to 
connect to ActiveMQ |  | String
+| *camel.component.activemq.broker-url* | Sets the broker URL to use to 
connect to ActiveMQ. If none configured then localhost:61616 is used by default 
(however can be overridden by configuration from environment variables) |  | 
String
 | *camel.component.activemq.cache-level* | Sets the cache level by ID for the 
underlying JMS resources. See cacheLevelName option for more details. |  | 
Integer
 | *camel.component.activemq.cache-level-name* | 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. | CACHE_AUTO | String
 | *camel.component.activemq.client-id* | 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. |  | String
 | *camel.component.activemq.concurrent-consumers* | 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. | 1 | Integer
-| *camel.component.activemq.configuration* | Configuration of ActiveMQ. The 
option is a org.apache.camel.component.jms.JmsConfiguration type. |  | String
+| *camel.component.activemq.configuration* | To use a shared JMS 
configuration. The option is a org.apache.camel.component.jms.JmsConfiguration 
type. |  | String
 | *camel.component.activemq.connection-factory* | The connection factory to be 
use. A connection factory must be configured either on the component or 
endpoint. The option is a javax.jms.ConnectionFactory type. |  | String
 | *camel.component.activemq.consumer-type* | The consumer type to use, which 
can be one of: Simple, Default, or Custom. The consumer type determines which 
Spring JMS listener to use. Default will use 
org.springframework.jms.listener.DefaultMessageListenerContainer, Simple will 
use org.springframework.jms.listener.SimpleMessageListenerContainer. When 
Custom is specified, the MessageListenerContainerFactory defined by the 
messageListenerContainerFactory option will determine what org.sprin [...]
 | *camel.component.activemq.correlation-property* | When using InOut exchange 
pattern use this JMS property instead of JMSCorrelationID JMS property to 
correlate messages. If set messages will be correlated solely on the value of 
this property JMSCorrelationID property will be ignored and not set by Camel. | 
 | String
@@ -119,7 +119,7 @@ The component supports 100 options, which are listed below.
 | *camel.component.activemq.transfer-exchange* | 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 p [...]
 | *camel.component.activemq.trust-all-packages* | Define if all Java packages 
are trusted or not (for Java object JMS message types). Notice its not 
recommended practice to send Java serialized objects over network. Setting this 
to true can expose security risks, so use this with care. | false | Boolean
 | *camel.component.activemq.use-message-id-as-correlation-id* | Specifies 
whether JMSMessageID should always be used as JMSCorrelationID for InOut 
messages. | false | Boolean
-| *camel.component.activemq.use-pooled-connection* | Enables or disables 
whether a PooledConnectionFactory will be used so that when messages are sent 
to ActiveMQ from outside of a message consuming thread, pooling will be used 
rather than the default with the Spring JmsTemplate which will create a new 
connection, session, producer for each message then close them all down again. 
The default value is true. | false | Boolean
+| *camel.component.activemq.use-pooled-connection* | Enables or disables 
whether a PooledConnectionFactory will be used so that when messages are sent 
to ActiveMQ from outside of a message consuming thread, pooling will be used 
rather than the default with the Spring JmsTemplate which will create a new 
connection, session, producer for each message then close them all down again. 
The default value is true. | true | Boolean
 | *camel.component.activemq.use-single-connection* | Enables or disables 
whether a Spring SingleConnectionFactory will be used so that when messages are 
sent to ActiveMQ from outside of a message consuming thread, pooling will be 
used rather than the default with the Spring JmsTemplate which will create a 
new connection, session, producer for each message then close them all down 
again. The default value is false and a pooled connection is used by default. | 
false | Boolean
 | *camel.component.activemq.username* | Username to use with the 
ConnectionFactory. You can also configure username/password directly on the 
ConnectionFactory. |  | String
 | 
*camel.component.activemq.wait-for-provision-correlation-to-be-updated-counter* 
| 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. | 50 | Integer

Reply via email to