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.git
The following commit(s) were added to refs/heads/master by this push:
new d9a5b8b CAMEL-15009: Fixed activemq wrong default in the docs for
usePooledConnection.
d9a5b8b is described below
commit d9a5b8beef4bd9c90449db699cca57abdca2caa9
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue May 5 09:41:48 2020 +0200
CAMEL-15009: Fixed activemq wrong default in the docs for
usePooledConnection.
---
.../apache/camel/component/activemq/activemq.json | 10 ++--
.../src/main/docs/activemq-component.adoc | 8 +--
.../component/activemq/ActiveMQComponent.java | 9 ++-
.../component/activemq/ActiveMQConfiguration.java | 2 -
.../dsl/ActivemqComponentBuilderFactory.java | 68 +++++++++++-----------
5 files changed, 52 insertions(+), 45 deletions(-)
diff --git
a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
index 1b4bbf6..27972d2 100644
---
a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
+++
b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/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":
false, "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/camel-activemq/src/main/docs/activemq-component.adoc
b/components/camel-activemq/src/main/docs/activemq-component.adoc
index 3bde4be..66fb9ab 100644
--- a/components/camel-activemq/src/main/docs/activemq-component.adoc
+++ b/components/camel-activemq/src/main/docs/activemq-component.adoc
@@ -59,16 +59,14 @@ The ActiveMQ component supports 99 options, which are
listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *brokerURL* (common) | Sets the broker URL to use to connect to ActiveMQ |
| String
+| *brokerURL* (common) | 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
| *clientId* (common) | 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
-| *configuration* (common) | Configuration of ActiveMQ | | JmsConfiguration
| *connectionFactory* (common) | The connection factory to be use. A
connection factory must be configured either on the component or endpoint. | |
ConnectionFactory
| *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo
header in messages. If true, Camel does not send a reply back to the
destination specified in the JMSReplyTo header. You can use this option if you
want Camel to consume from a route and you do not want Camel to automatically
send back a reply message because another component in your code handles the
reply message. You can also use this option if you want to use Camel as a proxy
between different message broker [...]
| *durableSubscriptionName* (common) | The durable subscriber name for
specifying durable topic subscriptions. The clientId option must be configured
as well. | | String
| *jmsMessageType* (common) | Allows you to force the use of a specific
javax.jms.Message implementation for sending JMS messages. Possible values are:
Bytes, Map, Object, Stream, Text. By default, Camel would determine which JMS
message type to use from the In body type. This option allows you to specify
it. The value can be one of: Bytes, Map, Object, Stream, Text | |
JmsMessageType
| *testConnectionOnStartup* (common) | 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. |
false | boolean
-| *trustAllPackages* (common) | 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
-| *usePooledConnection* (common) | 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
+| *usePooledConnection* (common) | 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
| *useSingleConnection* (common) | 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
| *acknowledgementModeName* (consumer) | The JMS acknowledgement name, which
is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE,
DUPS_OK_ACKNOWLEDGE. The value can be one of: SESSION_TRANSACTED,
CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE |
String
| *asyncConsumer* (consumer) | 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 transac [...]
@@ -124,6 +122,7 @@ The ActiveMQ component supports 99 options, which are
listed below.
| *asyncStartListener* (advanced) | 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, the [...]
| *asyncStopListener* (advanced) | Whether to stop the JmsConsumer message
listener asynchronously, when stopping a route. | false | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
+| *configuration* (advanced) | To use a shared JMS configuration | |
JmsConfiguration
| *destinationResolver* (advanced) | 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). | | DestinationResolver
| *errorHandler* (advanced) | 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. [...]
| *exceptionListener* (advanced) | Specifies the JMS Exception Listener that
is to be notified of any underlying JMS exceptions. | | ExceptionListener
@@ -145,6 +144,7 @@ The ActiveMQ component supports 99 options, which are
listed below.
| *requestTimeoutCheckerInterval* (advanced) | 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. | 1000 | long
| *transferException* (advanced) | 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 preced [...]
| *transferExchange* (advanced) | 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 E [...]
+| *trustAllPackages* (advanced) | 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
| *useMessageIDAsCorrelationID* (advanced) | Specifies whether JMSMessageID
should always be used as JMSCorrelationID for InOut messages. | false | boolean
| *waitForProvisionCorrelationTo BeUpdatedCounter* (advanced) | 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 | int
| *waitForProvisionCorrelationTo BeUpdatedThreadSleepingTime* (advanced) |
Interval in millis to sleep each time while waiting for provisional correlation
id to be updated. | 100 | long
diff --git
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
index 55e76b7..f69a1d7 100644
---
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
+++
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
@@ -27,6 +27,7 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.jms.JmsConfiguration;
import org.apache.camel.component.jms.JmsEndpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.component.PropertyConfigurerSupport;
import org.apache.camel.util.ObjectHelper;
@@ -90,8 +91,11 @@ public class ActiveMQComponent extends JmsComponent {
}
/**
- * 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)
*/
+ @Metadata(label = "common")
public void setBrokerURL(String brokerURL) {
if (getConfiguration() instanceof ActiveMQConfiguration) {
((ActiveMQConfiguration)getConfiguration()).setBrokerURL(brokerURL);
@@ -103,6 +107,7 @@ public class ActiveMQComponent extends JmsComponent {
* 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.
*/
+ @Metadata(defaultValue = "false", label = "advanced")
public void setTrustAllPackages(boolean trustAllPackages) {
if (getConfiguration() instanceof ActiveMQConfiguration) {
((ActiveMQConfiguration)getConfiguration()).setTrustAllPackages(trustAllPackages);
@@ -125,6 +130,7 @@ public class ActiveMQComponent extends JmsComponent {
* <p/>
* The default value is true.
*/
+ @Metadata(defaultValue = "true", label = "common")
public void setUsePooledConnection(boolean usePooledConnection) {
if (getConfiguration() instanceof ActiveMQConfiguration) {
((ActiveMQConfiguration)getConfiguration()).setUsePooledConnection(usePooledConnection);
@@ -147,6 +153,7 @@ public class ActiveMQComponent extends JmsComponent {
* <p/>
* The default value is false and a pooled connection is used by default.
*/
+ @Metadata(defaultValue = "false", label = "common")
public void setUseSingleConnection(boolean useSingleConnection) {
if (getConfiguration() instanceof ActiveMQConfiguration) {
((ActiveMQConfiguration)getConfiguration()).setUseSingleConnection(useSingleConnection);
diff --git
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
index 7fc9036..f9b6f85 100644
---
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
+++
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
@@ -23,7 +23,6 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.Service;
import org.apache.camel.component.jms.JmsConfiguration;
-import org.apache.camel.spi.Metadata;
import org.springframework.jms.connection.CachingConnectionFactory;
import org.springframework.jms.connection.DelegatingConnectionFactory;
import org.springframework.jms.connection.JmsTransactionManager;
@@ -36,7 +35,6 @@ public class ActiveMQConfiguration extends JmsConfiguration {
private String brokerURL = ActiveMQConnectionFactory.DEFAULT_BROKER_URL;
private volatile boolean customBrokerURL;
private boolean useSingleConnection;
- @Metadata(defaultValue = "true")
private boolean usePooledConnection = true;
private boolean trustAllPackages;
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
index 038eb32..1a19701 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
@@ -51,7 +51,9 @@ public interface ActivemqComponentBuilderFactory {
extends
ComponentBuilder<ActiveMQComponent> {
/**
- * 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).
*
* The option is a: <code>java.lang.String</code> type.
*
@@ -77,19 +79,6 @@ public interface ActivemqComponentBuilderFactory {
return this;
}
/**
- * Configuration of ActiveMQ.
- *
- * The option is a:
- * <code>org.apache.camel.component.jms.JmsConfiguration</code> type.
- *
- * Group: common
- */
- default ActivemqComponentBuilder configuration(
- org.apache.camel.component.jms.JmsConfiguration configuration)
{
- doSetProperty("configuration", configuration);
- return this;
- }
- /**
* The connection factory to be use. A connection factory must be
* configured either on the component or endpoint.
*
@@ -169,22 +158,6 @@ public interface ActivemqComponentBuilderFactory {
return this;
}
/**
- * 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.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: common
- */
- default ActivemqComponentBuilder trustAllPackages(
- boolean trustAllPackages) {
- doSetProperty("trustAllPackages", trustAllPackages);
- return this;
- }
- /**
* 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
@@ -194,7 +167,7 @@ public interface ActivemqComponentBuilderFactory {
*
* The option is a: <code>boolean</code> type.
*
- * Default: false
+ * Default: true
* Group: common
*/
default ActivemqComponentBuilder usePooledConnection(
@@ -1110,6 +1083,19 @@ public interface ActivemqComponentBuilderFactory {
return this;
}
/**
+ * To use a shared JMS configuration.
+ *
+ * The option is a:
+ * <code>org.apache.camel.component.jms.JmsConfiguration</code> type.
+ *
+ * Group: advanced
+ */
+ default ActivemqComponentBuilder configuration(
+ org.apache.camel.component.jms.JmsConfiguration configuration)
{
+ doSetProperty("configuration", configuration);
+ return this;
+ }
+ /**
* A pluggable
* org.springframework.jms.support.destination.DestinationResolver that
* allows you to use your own resolver (for example, to lookup the real
@@ -1456,6 +1442,22 @@ public interface ActivemqComponentBuilderFactory {
return this;
}
/**
+ * 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.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: false
+ * Group: advanced
+ */
+ default ActivemqComponentBuilder trustAllPackages(
+ boolean trustAllPackages) {
+ doSetProperty("trustAllPackages", trustAllPackages);
+ return this;
+ }
+ /**
* Specifies whether JMSMessageID should always be used as
* JMSCorrelationID for InOut messages.
*
@@ -1655,13 +1657,11 @@ public interface ActivemqComponentBuilderFactory {
switch (name) {
case "brokerURL": ((ActiveMQComponent)
component).setBrokerURL((java.lang.String) value); return true;
case "clientId": getOrCreateConfiguration((ActiveMQComponent)
component).setClientId((java.lang.String) value); return true;
- case "configuration": ((ActiveMQComponent)
component).setConfiguration((org.apache.camel.component.jms.JmsConfiguration)
value); return true;
case "connectionFactory":
getOrCreateConfiguration((ActiveMQComponent)
component).setConnectionFactory((javax.jms.ConnectionFactory) value); return
true;
case "disableReplyTo":
getOrCreateConfiguration((ActiveMQComponent)
component).setDisableReplyTo((boolean) value); return true;
case "durableSubscriptionName":
getOrCreateConfiguration((ActiveMQComponent)
component).setDurableSubscriptionName((java.lang.String) value); return true;
case "jmsMessageType":
getOrCreateConfiguration((ActiveMQComponent)
component).setJmsMessageType((org.apache.camel.component.jms.JmsMessageType)
value); return true;
case "testConnectionOnStartup":
getOrCreateConfiguration((ActiveMQComponent)
component).setTestConnectionOnStartup((boolean) value); return true;
- case "trustAllPackages": ((ActiveMQComponent)
component).setTrustAllPackages((boolean) value); return true;
case "usePooledConnection": ((ActiveMQComponent)
component).setUsePooledConnection((boolean) value); return true;
case "useSingleConnection": ((ActiveMQComponent)
component).setUseSingleConnection((boolean) value); return true;
case "acknowledgementModeName":
getOrCreateConfiguration((ActiveMQComponent)
component).setAcknowledgementModeName((java.lang.String) value); return true;
@@ -1718,6 +1718,7 @@ public interface ActivemqComponentBuilderFactory {
case "asyncStartListener":
getOrCreateConfiguration((ActiveMQComponent)
component).setAsyncStartListener((boolean) value); return true;
case "asyncStopListener":
getOrCreateConfiguration((ActiveMQComponent)
component).setAsyncStopListener((boolean) value); return true;
case "basicPropertyBinding": ((ActiveMQComponent)
component).setBasicPropertyBinding((boolean) value); return true;
+ case "configuration": ((ActiveMQComponent)
component).setConfiguration((org.apache.camel.component.jms.JmsConfiguration)
value); return true;
case "destinationResolver":
getOrCreateConfiguration((ActiveMQComponent)
component).setDestinationResolver((org.springframework.jms.support.destination.DestinationResolver)
value); return true;
case "errorHandler": getOrCreateConfiguration((ActiveMQComponent)
component).setErrorHandler((org.springframework.util.ErrorHandler) value);
return true;
case "exceptionListener":
getOrCreateConfiguration((ActiveMQComponent)
component).setExceptionListener((javax.jms.ExceptionListener) value); return
true;
@@ -1739,6 +1740,7 @@ public interface ActivemqComponentBuilderFactory {
case "requestTimeoutCheckerInterval":
getOrCreateConfiguration((ActiveMQComponent)
component).setRequestTimeoutCheckerInterval((long) value); return true;
case "transferException":
getOrCreateConfiguration((ActiveMQComponent)
component).setTransferException((boolean) value); return true;
case "transferExchange":
getOrCreateConfiguration((ActiveMQComponent)
component).setTransferExchange((boolean) value); return true;
+ case "trustAllPackages": ((ActiveMQComponent)
component).setTrustAllPackages((boolean) value); return true;
case "useMessageIDAsCorrelationID":
getOrCreateConfiguration((ActiveMQComponent)
component).setUseMessageIDAsCorrelationID((boolean) value); return true;
case "waitForProvisionCorrelationToBeUpdatedCounter":
getOrCreateConfiguration((ActiveMQComponent)
component).setWaitForProvisionCorrelationToBeUpdatedCounter((int) value);
return true;
case "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime":
getOrCreateConfiguration((ActiveMQComponent)
component).setWaitForProvisionCorrelationToBeUpdatedThreadSleepingTime((long)
value); return true;
