This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 18539e194cf CAMEL-20397: fix incorrect details regarding JMS 1.1 and
2.0
18539e194cf is described below
commit 18539e194cf4785dcd1d08218a7651f8f2c49f40
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Thu Feb 8 16:19:47 2024 +0100
CAMEL-20397: fix incorrect details regarding JMS 1.1 and 2.0
- clientId is optional for JMS 2.0
---
.../apache/camel/catalog/components/activemq.json | 4 ++--
.../org/apache/camel/catalog/components/amqp.json | 4 ++--
.../org/apache/camel/catalog/components/jms.json | 4 ++--
.../apache/camel/component/activemq/activemq.json | 4 ++--
.../org/apache/camel/component/amqp/amqp.json | 4 ++--
.../org/apache/camel/component/jms/jms.json | 4 ++--
.../camel-jms/src/main/docs/jms-component.adoc | 22 +++++++++++++++++-----
.../camel/component/jms/JmsConfiguration.java | 7 ++-----
8 files changed, 31 insertions(+), 22 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
index 124a81a39fc..ab2a1e41a9c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
@@ -24,7 +24,7 @@
},
"componentProperties": {
"brokerURL": { "index": 0, "kind": "property", "displayName": "Broker
URL", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "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": { "index": 1, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
+ "clientId": { "index": 1, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
"connectionFactory": { "index": 2, "kind": "property", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 componen [...]
"disableReplyTo": { "index": 3, "kind": "property", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 r [...]
"durableSubscriptionName": { "index": 4, "kind": "property",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 [...]
@@ -151,7 +151,7 @@
"properties": {
"destinationType": { "index": 0, "kind": "path", "displayName":
"Destination Type", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "queue", "topic",
"temp-queue", "temp-topic" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "queue", "description": "The kind of
destination to use" },
"destinationName": { "index": 1, "kind": "path", "displayName":
"Destination Name", "group": "common", "label": "", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Name of the queue or topic to use as destination" },
- "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
+ "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
"connectionFactory": { "index": 3, "kind": "parameter", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 compone [...]
"disableReplyTo": { "index": 4, "kind": "parameter", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 [...]
"durableSubscriptionName": { "index": 5, "kind": "parameter",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 mus [...]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/amqp.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/amqp.json
index 66743e4b8e5..2bd440c8504 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/amqp.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/amqp.json
@@ -23,7 +23,7 @@
"remote": true
},
"componentProperties": {
- "clientId": { "index": 0, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
+ "clientId": { "index": 0, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
"connectionFactory": { "index": 1, "kind": "property", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 componen [...]
"disableReplyTo": { "index": 2, "kind": "property", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 r [...]
"durableSubscriptionName": { "index": 3, "kind": "property",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 [...]
@@ -148,7 +148,7 @@
"properties": {
"destinationType": { "index": 0, "kind": "path", "displayName":
"Destination Type", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "queue", "topic",
"temp-queue", "temp-topic" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "queue", "description": "The kind of
destination to use" },
"destinationName": { "index": 1, "kind": "path", "displayName":
"Destination Name", "group": "common", "label": "", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Name of the queue or topic to use as destination" },
- "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
+ "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
"connectionFactory": { "index": 3, "kind": "parameter", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 compone [...]
"disableReplyTo": { "index": 4, "kind": "parameter", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 [...]
"durableSubscriptionName": { "index": 5, "kind": "parameter",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 mus [...]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
index 5f610be423d..f76ff88583e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
@@ -23,7 +23,7 @@
"remote": true
},
"componentProperties": {
- "clientId": { "index": 0, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
+ "clientId": { "index": 0, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
"connectionFactory": { "index": 1, "kind": "property", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 componen [...]
"disableReplyTo": { "index": 2, "kind": "property", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 r [...]
"durableSubscriptionName": { "index": 3, "kind": "property",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 [...]
@@ -147,7 +147,7 @@
"properties": {
"destinationType": { "index": 0, "kind": "path", "displayName":
"Destination Type", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "queue", "topic",
"temp-queue", "temp-topic" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "queue", "description": "The kind of
destination to use" },
"destinationName": { "index": 1, "kind": "path", "displayName":
"Destination Name", "group": "common", "label": "", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Name of the queue or topic to use as destination" },
- "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
+ "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
"connectionFactory": { "index": 3, "kind": "parameter", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 compone [...]
"disableReplyTo": { "index": 4, "kind": "parameter", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 [...]
"durableSubscriptionName": { "index": 5, "kind": "parameter",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 mus [...]
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 124a81a39fc..ab2a1e41a9c 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
@@ -24,7 +24,7 @@
},
"componentProperties": {
"brokerURL": { "index": 0, "kind": "property", "displayName": "Broker
URL", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "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": { "index": 1, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
+ "clientId": { "index": 1, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
"connectionFactory": { "index": 2, "kind": "property", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 componen [...]
"disableReplyTo": { "index": 3, "kind": "property", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 r [...]
"durableSubscriptionName": { "index": 4, "kind": "property",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 [...]
@@ -151,7 +151,7 @@
"properties": {
"destinationType": { "index": 0, "kind": "path", "displayName":
"Destination Type", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "queue", "topic",
"temp-queue", "temp-topic" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "queue", "description": "The kind of
destination to use" },
"destinationName": { "index": 1, "kind": "path", "displayName":
"Destination Name", "group": "common", "label": "", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Name of the queue or topic to use as destination" },
- "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
+ "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
"connectionFactory": { "index": 3, "kind": "parameter", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 compone [...]
"disableReplyTo": { "index": 4, "kind": "parameter", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 [...]
"durableSubscriptionName": { "index": 5, "kind": "parameter",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 mus [...]
diff --git
a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
index 66743e4b8e5..2bd440c8504 100644
---
a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
+++
b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
@@ -23,7 +23,7 @@
"remote": true
},
"componentProperties": {
- "clientId": { "index": 0, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
+ "clientId": { "index": 0, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
"connectionFactory": { "index": 1, "kind": "property", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 componen [...]
"disableReplyTo": { "index": 2, "kind": "property", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 r [...]
"durableSubscriptionName": { "index": 3, "kind": "property",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 [...]
@@ -148,7 +148,7 @@
"properties": {
"destinationType": { "index": 0, "kind": "path", "displayName":
"Destination Type", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "queue", "topic",
"temp-queue", "temp-topic" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "queue", "description": "The kind of
destination to use" },
"destinationName": { "index": 1, "kind": "path", "displayName":
"Destination Name", "group": "common", "label": "", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Name of the queue or topic to use as destination" },
- "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
+ "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
"connectionFactory": { "index": 3, "kind": "parameter", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 compone [...]
"disableReplyTo": { "index": 4, "kind": "parameter", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 [...]
"durableSubscriptionName": { "index": 5, "kind": "parameter",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 mus [...]
diff --git
a/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
b/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
index 5f610be423d..f76ff88583e 100644
---
a/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
+++
b/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
@@ -23,7 +23,7 @@
"remote": true
},
"componentProperties": {
- "clientId": { "index": 0, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
+ "clientId": { "index": 0, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connecti [...]
"connectionFactory": { "index": 1, "kind": "property", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 componen [...]
"disableReplyTo": { "index": 2, "kind": "property", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 r [...]
"durableSubscriptionName": { "index": 3, "kind": "property",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 [...]
@@ -147,7 +147,7 @@
"properties": {
"destinationType": { "index": 0, "kind": "path", "displayName":
"Destination Type", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "queue", "topic",
"temp-queue", "temp-topic" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "queue", "description": "The kind of
destination to use" },
"destinationName": { "index": 1, "kind": "path", "displayName":
"Destination Name", "group": "common", "label": "", "required": true, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Name of the queue or topic to use as destination" },
- "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
+ "clientId": { "index": 2, "kind": "parameter", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": 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
connect [...]
"connectionFactory": { "index": 3, "kind": "parameter", "displayName":
"Connection Factory", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated":
false, "autowired": 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 compone [...]
"disableReplyTo": { "index": 4, "kind": "parameter", "displayName":
"Disable Reply To", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 [...]
"durableSubscriptionName": { "index": 5, "kind": "parameter",
"displayName": "Durable Subscription Name", "group": "common", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": 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 mus [...]
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc
b/components/camel-jms/src/main/docs/jms-component.adoc
index 95ea0a1a928..9d1b1cfe891 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -132,15 +132,27 @@ level accordingly to:
So you can say the default setting is conservative. Consider using
`cacheLevelName=CACHE_CONSUMER` if you are using non-XA transactions.
-=== Durable Subscriptions
+=== Durable Subscriptions with JMS 1.1
If you wish to use durable topic subscriptions, you need to specify both
`clientId` and `durableSubscriptionName`. The value of the `clientId`
must be unique and can only be used by a single JMS connection instance
-in your entire network. You may prefer to use
-http://activemq.apache.org/virtual-destinations.html[Virtual Topics]
-instead to avoid this limitation. More background on durable messaging
-http://activemq.apache.org/how-do-durable-queues-and-topics-work.html[here].
+in your entire network.
+
+[NOTE]
+====
+If you are using the https://activemq.apache.org/components/classic/[Apache
ActiveMQ Classic] or https://activemq.apache.org/components/artemis/[Apache
ActiveMQ Artemis],
+you may prefer to use a feature called Virtual Topic. This should remove the
necessity of having a unique `clientId`.
+
+You can consult the specific documentation for
https://activemq.apache.org/components/artemis/migration-documentation/VirtualTopics.html[Artemis]
+or for https://activemq.apache.org/virtual-destinations.html[ActiveMQ Classic]
for details about how to leverage this feature.
+
+You can find more details about durable messaging for ActiveMQ Classic
http://activemq.apache.org/how-do-durable-queues-and-topics-work.html[here].
+====
+
+==== Durable Subscriptions with JMS 2.0
+
+If you wish to use durable topic subscriptions, you need to specify the
`durableSubscriptionName`.
=== Message Header Mapping
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index 433e386bc6e..8684340cfdf 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -129,8 +129,7 @@ public class JmsConfiguration implements Cloneable {
+ " may be moved at a dead letter queue on the JMS
broker. To avoid this its recommended to enable this option.")
private boolean acceptMessagesWhileStopping;
@UriParam(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 only required for durable
topic subscriptions."
- + " If using Apache ActiveMQ you may prefer to use
Virtual Topics instead.")
+ + " It is typically only required for durable
topic subscriptions with JMS 1.1.")
private String clientId;
@UriParam(description = "The durable subscriber name for specifying
durable topic subscriptions. The clientId option must be configured as well.")
private String durableSubscriptionName;
@@ -975,9 +974,7 @@ public class JmsConfiguration implements Cloneable {
/**
* 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.
- * <p>
- * If using Apache ActiveMQ you may prefer to use Virtual Topics instead.
+ * single JMS connection instance. It is typically only required for
durable topic subscriptions with JMS 1.1.
*/
public void setClientId(String consumerClientId) {
this.clientId = consumerClientId;
