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 e0874d7 CAMEL-15377: camel-jms - Add back transactedInOut option e0874d7 is described below commit e0874d7b8c33edef02d47acb8cce3b5548a76e93 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Aug 5 19:27:56 2020 +0200 CAMEL-15377: camel-jms - Add back transactedInOut option --- .../apache/camel/catalog/components/activemq.json | 2 + .../org/apache/camel/catalog/components/amqp.json | 2 + .../org/apache/camel/catalog/components/jms.json | 4 +- .../camel/catalog/docs/activemq-component.adoc | 6 +- .../apache/camel/catalog/docs/amqp-component.adoc | 6 +- .../apache/camel/catalog/docs/jms-component.adoc | 4 +- .../apache/camel/component/activemq/activemq.json | 2 + .../src/main/docs/activemq-component.adoc | 6 +- .../org/apache/camel/component/amqp/amqp.json | 2 + .../camel-amqp/src/main/docs/amqp-component.adoc | 6 +- .../org/apache/camel/component/jms/jms.json | 4 +- .../camel-jms/src/main/docs/jms-component.adoc | 4 +- .../camel/component/jms/JmsConfiguration.java | 25 ++- .../dsl/ActivemqComponentBuilderFactory.java | 29 ++++ .../component/dsl/AmqpComponentBuilderFactory.java | 29 ++++ .../component/dsl/JmsComponentBuilderFactory.java | 17 +- .../endpoint/dsl/AMQPEndpointBuilderFactory.java | 172 +++++++++++++++++++++ .../dsl/ActiveMQEndpointBuilderFactory.java | 172 +++++++++++++++++++++ .../endpoint/dsl/JmsEndpointBuilderFactory.java | 102 +++++++++++- .../modules/ROOT/pages/activemq-component.adoc | 6 +- .../modules/ROOT/pages/amqp-component.adoc | 6 +- .../modules/ROOT/pages/jms-component.adoc | 4 +- 22 files changed, 576 insertions(+), 34 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 040403e..5dacfa8 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 @@ -116,6 +116,7 @@ "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, + "transactedInOut": { "kind": "property", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "property", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is n [...] "transactionManager": { "kind": "property", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "property", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, @@ -214,6 +215,7 @@ "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, + "transactedInOut": { "kind": "parameter", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "parameter", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is [...] "transactionManager": { "kind": "parameter", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "parameter", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, 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 d46b0ce..6588268 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 @@ -113,6 +113,7 @@ "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, + "transactedInOut": { "kind": "property", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "property", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is n [...] "transactionManager": { "kind": "property", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "property", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, @@ -211,6 +212,7 @@ "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, + "transactedInOut": { "kind": "parameter", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "parameter", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is [...] "transactionManager": { "kind": "parameter", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "parameter", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, 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 4f2334d..517eb0e 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 @@ -113,7 +113,7 @@ "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, - "transactedInOut": { "kind": "property", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode" }, + "transactedInOut": { "kind": "property", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "property", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is n [...] "transactionManager": { "kind": "property", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "property", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, @@ -212,7 +212,7 @@ "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, - "transactedInOut": { "kind": "parameter", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode" }, + "transactedInOut": { "kind": "parameter", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "parameter", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is [...] "transactionManager": { "kind": "parameter", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "parameter", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/activemq-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/activemq-component.adoc index 66fb9ab..9818e4c 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/activemq-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/activemq-component.adoc @@ -52,7 +52,7 @@ activemq:foo == Component options // component options: START -The ActiveMQ component supports 99 options, which are listed below. +The ActiveMQ component supports 100 options, which are listed below. @@ -154,6 +154,7 @@ The ActiveMQ component supports 99 options, which are listed below. | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String @@ -184,7 +185,7 @@ with the following path and query parameters: |=== -=== Query Parameters (94 parameters): +=== Query Parameters (95 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -280,6 +281,7 @@ with the following path and query parameters: | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/amqp-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/amqp-component.adoc index 42ed601..3a0b191 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/amqp-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/amqp-component.adoc @@ -44,7 +44,7 @@ xref:jms-component.adoc[JMS] component after the destination name. // component options: START -The AMQP component supports 96 options, which are listed below. +The AMQP component supports 97 options, which are listed below. @@ -143,6 +143,7 @@ The AMQP component supports 96 options, which are listed below. | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String @@ -176,7 +177,7 @@ with the following path and query parameters: |=== -=== Query Parameters (94 parameters): +=== Query Parameters (95 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -272,6 +273,7 @@ with the following path and query parameters: | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jms-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jms-component.adoc index b852efb..65e30e2 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jms-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jms-component.adoc @@ -284,7 +284,7 @@ The JMS component supports 96 options, which are listed below. | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean -| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String @@ -425,7 +425,7 @@ with the following path and query parameters: | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean -| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String 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 040403e..5dacfa8 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 @@ -116,6 +116,7 @@ "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, + "transactedInOut": { "kind": "property", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "property", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is n [...] "transactionManager": { "kind": "property", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "property", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, @@ -214,6 +215,7 @@ "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, + "transactedInOut": { "kind": "parameter", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "parameter", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is [...] "transactionManager": { "kind": "parameter", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "parameter", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, diff --git a/components/camel-activemq/src/main/docs/activemq-component.adoc b/components/camel-activemq/src/main/docs/activemq-component.adoc index 66fb9ab..9818e4c 100644 --- a/components/camel-activemq/src/main/docs/activemq-component.adoc +++ b/components/camel-activemq/src/main/docs/activemq-component.adoc @@ -52,7 +52,7 @@ activemq:foo == Component options // component options: START -The ActiveMQ component supports 99 options, which are listed below. +The ActiveMQ component supports 100 options, which are listed below. @@ -154,6 +154,7 @@ The ActiveMQ component supports 99 options, which are listed below. | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String @@ -184,7 +185,7 @@ with the following path and query parameters: |=== -=== Query Parameters (94 parameters): +=== Query Parameters (95 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -280,6 +281,7 @@ with the following path and query parameters: | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String 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 d46b0ce..6588268 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 @@ -113,6 +113,7 @@ "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, + "transactedInOut": { "kind": "property", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "property", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is n [...] "transactionManager": { "kind": "property", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "property", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, @@ -211,6 +212,7 @@ "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, + "transactedInOut": { "kind": "parameter", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "parameter", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is [...] "transactionManager": { "kind": "parameter", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "parameter", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc index 42ed601..3a0b191 100644 --- a/components/camel-amqp/src/main/docs/amqp-component.adoc +++ b/components/camel-amqp/src/main/docs/amqp-component.adoc @@ -44,7 +44,7 @@ xref:jms-component.adoc[JMS] component after the destination name. // component options: START -The AMQP component supports 96 options, which are listed below. +The AMQP component supports 97 options, which are listed below. @@ -143,6 +143,7 @@ The AMQP component supports 96 options, which are listed below. | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String @@ -176,7 +177,7 @@ with the following path and query parameters: |=== -=== Query Parameters (94 parameters): +=== Query Parameters (95 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -272,6 +273,7 @@ with the following path and query parameters: | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String 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 4f2334d..517eb0e 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 @@ -113,7 +113,7 @@ "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, - "transactedInOut": { "kind": "property", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode" }, + "transactedInOut": { "kind": "property", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "property", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is n [...] "transactionManager": { "kind": "property", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "property", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, @@ -212,7 +212,7 @@ "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." }, "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" }, - "transactedInOut": { "kind": "parameter", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode" }, + "transactedInOut": { "kind": "parameter", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, [...] "lazyCreateTransactionManager": { "kind": "parameter", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If true, Camel will create a JmsTransactionManager, if there is [...] "transactionManager": { "kind": "parameter", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." }, "transactionName": { "kind": "parameter", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The name of the transaction to use." }, diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc index b852efb..65e30e2 100644 --- a/components/camel-jms/src/main/docs/jms-component.adoc +++ b/components/camel-jms/src/main/docs/jms-component.adoc @@ -284,7 +284,7 @@ The JMS component supports 96 options, which are listed below. | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean -| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String @@ -425,7 +425,7 @@ with the following path and query parameters: | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean -| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String 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 504e55b..68f32fb 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 @@ -249,7 +249,22 @@ public class JmsConfiguration implements Cloneable { description = "Specifies whether to use transacted mode") private boolean transacted; @UriParam(label = "transaction", - description = "Specifies whether InOut operations (request reply) default to using transacted mode") + description = "Specifies whether InOut operations (request reply) default to using transacted mode" + + " If this flag is set to true, then Spring JmsTemplate will have" + + " sessionTransacted set to true, and the acknowledgeMode as transacted" + + " on the JmsTemplate used for InOut operations." + + " Note from Spring JMS: that within a JTA transaction, the parameters passed to" + + " createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context," + + " the container makes its own decisions on these values. Analogously, these" + + " parameters are not taken into account within a locally managed transaction" + + " either, since Spring JMS operates on an existing JMS Session in this case." + + " Setting this flag to true will use a short local JMS transaction" + + " when running outside of a managed transaction, and a synchronized local" + + " JMS transaction in case of a managed transaction (other than an XA" + + " transaction) being present. This has the effect of a local JMS" + + " transaction being managed alongside the main transaction (which might" + + " be a native JDBC transaction), with the JMS transaction committing" + + " right after the main transaction.") private boolean transactedInOut; @UriParam(defaultValue = "true", label = "transaction,advanced", description = "If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true.") @@ -1374,6 +1389,10 @@ public class JmsConfiguration implements Cloneable { this.transacted = transacted; } + public boolean isTransactedInOut() { + return transactedInOut; + } + /** * Specifies whether InOut operations (request reply) default to using transacted mode. * @@ -1394,10 +1413,6 @@ public class JmsConfiguration implements Cloneable { * be a native JDBC transaction), with the JMS transaction committing * right after the main transaction. */ - public boolean isTransactedInOut() { - return transactedInOut; - } - public void setTransactedInOut(boolean transactedInOut) { this.transactedInOut = transactedInOut; } 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 1a19701..416c4b5 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 @@ -1579,6 +1579,34 @@ public interface ActivemqComponentBuilderFactory { return this; } /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default ActivemqComponentBuilder transactedInOut(boolean transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } + /** * If true, Camel will create a JmsTransactionManager, if there is no * transactionManager injected when option transacted=true. * @@ -1750,6 +1778,7 @@ public interface ActivemqComponentBuilderFactory { case "password": getOrCreateConfiguration((ActiveMQComponent) component).setPassword((java.lang.String) value); return true; case "username": getOrCreateConfiguration((ActiveMQComponent) component).setUsername((java.lang.String) value); return true; case "transacted": getOrCreateConfiguration((ActiveMQComponent) component).setTransacted((boolean) value); return true; + case "transactedInOut": getOrCreateConfiguration((ActiveMQComponent) component).setTransactedInOut((boolean) value); return true; case "lazyCreateTransactionManager": getOrCreateConfiguration((ActiveMQComponent) component).setLazyCreateTransactionManager((boolean) value); return true; case "transactionManager": getOrCreateConfiguration((ActiveMQComponent) component).setTransactionManager((org.springframework.transaction.PlatformTransactionManager) value); return true; case "transactionName": getOrCreateConfiguration((ActiveMQComponent) component).setTransactionName((java.lang.String) value); return true; diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java index afca029..9180e41 100644 --- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java +++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java @@ -1515,6 +1515,34 @@ public interface AmqpComponentBuilderFactory { return this; } /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default AmqpComponentBuilder transactedInOut(boolean transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } + /** * If true, Camel will create a JmsTransactionManager, if there is no * transactionManager injected when option transacted=true. * @@ -1682,6 +1710,7 @@ public interface AmqpComponentBuilderFactory { case "password": getOrCreateConfiguration((AMQPComponent) component).setPassword((java.lang.String) value); return true; case "username": getOrCreateConfiguration((AMQPComponent) component).setUsername((java.lang.String) value); return true; case "transacted": getOrCreateConfiguration((AMQPComponent) component).setTransacted((boolean) value); return true; + case "transactedInOut": getOrCreateConfiguration((AMQPComponent) component).setTransactedInOut((boolean) value); return true; case "lazyCreateTransactionManager": getOrCreateConfiguration((AMQPComponent) component).setLazyCreateTransactionManager((boolean) value); return true; case "transactionManager": getOrCreateConfiguration((AMQPComponent) component).setTransactionManager((org.springframework.transaction.PlatformTransactionManager) value); return true; case "transactionName": getOrCreateConfiguration((AMQPComponent) component).setTransactionName((java.lang.String) value); return true; diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java index 5ec686d..0193b44 100644 --- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java +++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java @@ -1500,7 +1500,22 @@ public interface JmsComponentBuilderFactory { } /** * Specifies whether InOut operations (request reply) default to using - * transacted mode. + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. * * The option is a: <code>boolean</code> type. * diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java index 2421abd..d6f8e9e 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java @@ -652,6 +652,64 @@ public interface AMQPEndpointBuilderFactory { doSetProperty("transacted", transacted); return this; } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default AMQPEndpointConsumerBuilder transactedInOut( + boolean transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option will be converted to a <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default AMQPEndpointConsumerBuilder transactedInOut( + String transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } } /** @@ -2776,6 +2834,64 @@ public interface AMQPEndpointBuilderFactory { doSetProperty("transacted", transacted); return this; } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default AMQPEndpointProducerBuilder transactedInOut( + boolean transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option will be converted to a <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default AMQPEndpointProducerBuilder transactedInOut( + String transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } } /** @@ -4349,6 +4465,62 @@ public interface AMQPEndpointBuilderFactory { doSetProperty("transacted", transacted); return this; } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default AMQPEndpointBuilder transactedInOut(boolean transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option will be converted to a <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default AMQPEndpointBuilder transactedInOut(String transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } } /** diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java index 4b585d7..c4a5dcf 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java @@ -658,6 +658,64 @@ public interface ActiveMQEndpointBuilderFactory { doSetProperty("transacted", transacted); return this; } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default ActiveMQEndpointConsumerBuilder transactedInOut( + boolean transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option will be converted to a <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default ActiveMQEndpointConsumerBuilder transactedInOut( + String transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } } /** @@ -2789,6 +2847,64 @@ public interface ActiveMQEndpointBuilderFactory { doSetProperty("transacted", transacted); return this; } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default ActiveMQEndpointProducerBuilder transactedInOut( + boolean transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option will be converted to a <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default ActiveMQEndpointProducerBuilder transactedInOut( + String transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } } /** @@ -4365,6 +4481,62 @@ public interface ActiveMQEndpointBuilderFactory { doSetProperty("transacted", transacted); return this; } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option is a: <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default ActiveMQEndpointBuilder transactedInOut(boolean transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } + /** + * Specifies whether InOut operations (request reply) default to using + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. + * + * The option will be converted to a <code>boolean</code> type. + * + * Default: false + * Group: transaction + */ + default ActiveMQEndpointBuilder transactedInOut(String transactedInOut) { + doSetProperty("transactedInOut", transactedInOut); + return this; + } } /** diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java index 8513812..5617bf9 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java @@ -653,7 +653,22 @@ public interface JmsEndpointBuilderFactory { } /** * Specifies whether InOut operations (request reply) default to using - * transacted mode. + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. * * The option is a: <code>boolean</code> type. * @@ -667,7 +682,22 @@ public interface JmsEndpointBuilderFactory { } /** * Specifies whether InOut operations (request reply) default to using - * transacted mode. + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. * * The option will be converted to a <code>boolean</code> type. * @@ -2804,7 +2834,22 @@ public interface JmsEndpointBuilderFactory { } /** * Specifies whether InOut operations (request reply) default to using - * transacted mode. + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. * * The option is a: <code>boolean</code> type. * @@ -2818,7 +2863,22 @@ public interface JmsEndpointBuilderFactory { } /** * Specifies whether InOut operations (request reply) default to using - * transacted mode. + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. * * The option will be converted to a <code>boolean</code> type. * @@ -4405,7 +4465,22 @@ public interface JmsEndpointBuilderFactory { } /** * Specifies whether InOut operations (request reply) default to using - * transacted mode. + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. * * The option is a: <code>boolean</code> type. * @@ -4418,7 +4493,22 @@ public interface JmsEndpointBuilderFactory { } /** * Specifies whether InOut operations (request reply) default to using - * transacted mode. + * transacted mode If this flag is set to true, then Spring JmsTemplate + * will have sessionTransacted set to true, and the acknowledgeMode as + * transacted on the JmsTemplate used for InOut operations. Note from + * Spring JMS: that within a JTA transaction, the parameters passed to + * createQueue, createTopic methods are not taken into account. + * Depending on the Java EE transaction context, the container makes its + * own decisions on these values. Analogously, these parameters are not + * taken into account within a locally managed transaction either, since + * Spring JMS operates on an existing JMS Session in this case. Setting + * this flag to true will use a short local JMS transaction when running + * outside of a managed transaction, and a synchronized local JMS + * transaction in case of a managed transaction (other than an XA + * transaction) being present. This has the effect of a local JMS + * transaction being managed alongside the main transaction (which might + * be a native JDBC transaction), with the JMS transaction committing + * right after the main transaction. * * The option will be converted to a <code>boolean</code> type. * diff --git a/docs/components/modules/ROOT/pages/activemq-component.adoc b/docs/components/modules/ROOT/pages/activemq-component.adoc index c761cf1..9fccdc3 100644 --- a/docs/components/modules/ROOT/pages/activemq-component.adoc +++ b/docs/components/modules/ROOT/pages/activemq-component.adoc @@ -54,7 +54,7 @@ activemq:foo == Component options // component options: START -The ActiveMQ component supports 99 options, which are listed below. +The ActiveMQ component supports 100 options, which are listed below. @@ -156,6 +156,7 @@ The ActiveMQ component supports 99 options, which are listed below. | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String @@ -186,7 +187,7 @@ with the following path and query parameters: |=== -=== Query Parameters (94 parameters): +=== Query Parameters (95 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -282,6 +283,7 @@ with the following path and query parameters: | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc b/docs/components/modules/ROOT/pages/amqp-component.adoc index d488c77..5de0854 100644 --- a/docs/components/modules/ROOT/pages/amqp-component.adoc +++ b/docs/components/modules/ROOT/pages/amqp-component.adoc @@ -46,7 +46,7 @@ xref:jms-component.adoc[JMS] component after the destination name. // component options: START -The AMQP component supports 96 options, which are listed below. +The AMQP component supports 97 options, which are listed below. @@ -145,6 +145,7 @@ The AMQP component supports 96 options, which are listed below. | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String @@ -178,7 +179,7 @@ with the following path and query parameters: |=== -=== Query Parameters (94 parameters): +=== Query Parameters (95 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -274,6 +275,7 @@ with the following path and query parameters: | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String diff --git a/docs/components/modules/ROOT/pages/jms-component.adoc b/docs/components/modules/ROOT/pages/jms-component.adoc index 2947e70..0466c08 100644 --- a/docs/components/modules/ROOT/pages/jms-component.adoc +++ b/docs/components/modules/ROOT/pages/jms-component.adoc @@ -286,7 +286,7 @@ The JMS component supports 96 options, which are listed below. | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean -| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String @@ -427,7 +427,7 @@ with the following path and query parameters: | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean -| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode | false | boolean +| *transactedInOut* (transaction) | Specifies whether InOut operations (request reply) default to using transacted mode If this flag is set to true, then Spring JmsTemplate will have sessionTransacted set to true, and the acknowledgeMode as transacted on the JmsTemplate used for InOut operations. Note from Spring JMS: that within a JTA transaction, the parameters passed to createQueue, createTopic methods are not taken into account. Depending on the Java EE transaction context, the conta [...] | *lazyCreateTransactionManager* (transaction) | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | boolean | *transactionManager* (transaction) | The Spring transaction manager to use. | | PlatformTransactionManager | *transactionName* (transaction) | The name of the transaction to use. | | String