This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push: new 3d07c2e Regen 3d07c2e is described below commit 3d07c2e6d1cff81d851430b35f3b2306ad41018f Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Aug 5 21:31:13 2020 +0200 Regen --- .../springboot/catalog/components/activemq.json | 2 ++ .../camel/springboot/catalog/components/amqp.json | 2 ++ .../springboot/catalog/components/aws2-sts.json | 22 +++++++++--------- .../camel/springboot/catalog/components/jms.json | 2 ++ .../springboot/catalog/components/pgevent.json | 2 +- components-starter/README.adoc | 2 +- .../src/main/docs/activemq-starter.adoc | 3 ++- .../springboot/ActiveMQComponentConfiguration.java | 27 ++++++++++++++++++++++ .../src/main/docs/amqp-starter.adoc | 3 ++- .../springboot/AMQPComponentConfiguration.java | 27 ++++++++++++++++++++++ .../src/main/docs/aws2-sts-starter.adoc | 10 ++++---- .../sts/springboot/STS2ComponentConfiguration.java | 14 +++++------ .../src/main/docs/jms-starter.adoc | 3 ++- .../jms/springboot/JmsComponentConfiguration.java | 27 ++++++++++++++++++++++ docs/modules/ROOT/pages/activemq-starter.adoc | 3 ++- docs/modules/ROOT/pages/amqp-starter.adoc | 3 ++- docs/modules/ROOT/pages/aws2-sts-starter.adoc | 10 ++++---- docs/modules/ROOT/pages/jms-starter.adoc | 3 ++- docs/modules/ROOT/pages/list.adoc | 2 +- 19 files changed, 130 insertions(+), 37 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json index fee3579..4d41abf 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json @@ -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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json index 91f344b..9ac8d2b 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sts.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sts.json index 7db374c..57607e5 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sts.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sts.json @@ -3,7 +3,7 @@ "kind": "component", "name": "aws2-sts", "title": "AWS 2 Security Token Service (STS)", - "description": "Manage AWS ECS cluster instances using AWS SDK version 2.x.", + "description": "Manage AWS STS cluster instances using AWS SDK version 2.x.", "deprecated": false, "firstVersion": "3.5.0", "label": "cloud,management", @@ -26,11 +26,11 @@ "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...] "operation": { "kind": "property", "displayName": "Operation", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws2.sts.STS2Operations", "enum": [ "assumeRole" ], "deprecated": false, "deprecationNote": "", "secret": false, "defaultValue": "assumeRole", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "The operation to perform" }, "pojoRequest": { "kind": "property", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "If we want to use a POJO request as body or not" }, - "proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the ECS client" }, - "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the ECS client" }, - "proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the ECS client" }, - "region": { "kind": "property", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east [...] - "stsClient": { "kind": "property", "displayName": "Sts Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.sts.StsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To use a existing configured AWS ECS as client" }, + "proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the STS client" }, + "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the STS client" }, + "proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the STS client" }, + "region": { "kind": "property", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "aws-global", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "The region in which STS client needs to work. When using this parameter, the configuration will expect the lowercase name of t [...] + "stsClient": { "kind": "property", "displayName": "Sts Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.sts.StsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To use a existing configured AWS STS as client" }, "trustAllCertificates": { "kind": "property", "displayName": "Trust All Certificates", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" }, "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }, "accessKey": { "kind": "property", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key" }, @@ -42,11 +42,11 @@ "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the [...] "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws2.sts.STS2Operations", "enum": [ "assumeRole" ], "deprecated": false, "deprecationNote": "", "secret": false, "defaultValue": "assumeRole", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "The operation to perform" }, "pojoRequest": { "kind": "parameter", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "If we want to use a POJO request as body or not" }, - "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the ECS client" }, - "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the ECS client" }, - "proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the ECS client" }, - "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-eas [...] - "stsClient": { "kind": "parameter", "displayName": "Sts Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.sts.StsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To use a existing configured AWS ECS as client" }, + "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the STS client" }, + "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the STS client" }, + "proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the STS client" }, + "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "aws-global", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "The region in which STS client needs to work. When using this parameter, the configuration will expect the lowercase name of [...] + "stsClient": { "kind": "parameter", "displayName": "Sts Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.sts.StsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "To use a existing configured AWS STS as client" }, "trustAllCertificates": { "kind": "parameter", "displayName": "Trust All Certificates", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.sts.STS2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" }, "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }, "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json index 1b2c376..97d09e0 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.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-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pgevent.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pgevent.json index f7e4292..d9d7c72 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pgevent.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pgevent.json @@ -28,7 +28,7 @@ "properties": { "host": { "kind": "path", "displayName": "Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "localhost", "description": "To connect using hostname and port to the database." }, "port": { "kind": "path", "displayName": "Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "5432", "description": "To connect using hostname and port to the database." }, - "database": { "kind": "path", "displayName": "Database", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The database name" }, + "database": { "kind": "path", "displayName": "Database", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The database name. The database name can take any characters because it is sent as a quoted identifier. It is part of the endpoint URI, so diacritical marks and non-Latin letters have to be URL encoded." }, "channel": { "kind": "path", "displayName": "Channel", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The channel name" }, "datasource": { "kind": "parameter", "displayName": "Datasource", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.sql.DataSource", "deprecated": false, "secret": false, "description": "To connect using the given javax.sql.DataSource instead of using hostname and port." }, "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...] diff --git a/components-starter/README.adoc b/components-starter/README.adoc index 505b395..0af20ff 100644 --- a/components-starter/README.adoc +++ b/components-starter/README.adoc @@ -111,7 +111,7 @@ Number of Camel components: 336 in 269 JAR artifacts (3 deprecated) `aws2-s3://bucketNameOrArn` | 3.2 | Store and retrieve objects from AWS S3 Storage Service using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-sts-component.html[AWS 2 Security Token Service (STS)] (camel-aws2-sts-starter) + -`aws2-sts:label` | 3.5 | Manage AWS ECS cluster instances using AWS SDK version 2.x. +`aws2-sts:label` | 3.5 | Manage AWS STS cluster instances using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-ses-component.html[AWS 2 Simple Email Service (SES)] (camel-aws2-ses-starter) + `aws2-ses:from` | 3.1 | Send e-mails through AWS SES service using AWS SDK version 2.x. diff --git a/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc b/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc index a89550a..c5532c7 100644 --- a/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc +++ b/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc @@ -17,7 +17,7 @@ When using activemq with Spring Boot make sure to use the following Maven depend ---- -The component supports 100 options, which are listed below. +The component supports 101 options, which are listed below. @@ -112,6 +112,7 @@ The component supports 100 options, which are listed below. | *camel.component.activemq.test-connection-on-startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | Boolean | *camel.component.activemq.time-to-live* | When sending messages, specifies the time-to-live of the message (in milliseconds). | -1 | Long | *camel.component.activemq.transacted* | Specifies whether to use transacted mode | false | Boolean +| *camel.component.activemq.transacted-in-out* | 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 conte [...] | *camel.component.activemq.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String | *camel.component.activemq.transaction-name* | The name of the transaction to use. | | String | *camel.component.activemq.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer diff --git a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java index 31a3d0b..489b973 100644 --- a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java +++ b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java @@ -743,6 +743,25 @@ public class ActiveMQComponentConfiguration */ private Boolean transacted = false; /** + * 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 = false; + /** * If true, Camel will create a JmsTransactionManager, if there is no * transactionManager injected when option transacted=true. */ @@ -1537,6 +1556,14 @@ public class ActiveMQComponentConfiguration this.transacted = transacted; } + public Boolean getTransactedInOut() { + return transactedInOut; + } + + public void setTransactedInOut(Boolean transactedInOut) { + this.transactedInOut = transactedInOut; + } + public Boolean getLazyCreateTransactionManager() { return lazyCreateTransactionManager; } diff --git a/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc b/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc index c842cb9..e27a80f 100644 --- a/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc +++ b/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc @@ -17,7 +17,7 @@ When using amqp with Spring Boot make sure to use the following Maven dependency ---- -The component supports 97 options, which are listed below. +The component supports 98 options, which are listed below. @@ -112,6 +112,7 @@ The component supports 97 options, which are listed below. | *camel.component.amqp.test-connection-on-startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | Boolean | *camel.component.amqp.time-to-live* | When sending messages, specifies the time-to-live of the message (in milliseconds). | -1 | Long | *camel.component.amqp.transacted* | Specifies whether to use transacted mode | false | Boolean +| *camel.component.amqp.transacted-in-out* | 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, [...] | *camel.component.amqp.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String | *camel.component.amqp.transaction-name* | The name of the transaction to use. | | String | *camel.component.amqp.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer diff --git a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java index 6786d1d..294e7cb 100644 --- a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java +++ b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java @@ -718,6 +718,25 @@ public class AMQPComponentConfiguration */ private Boolean transacted = false; /** + * 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 = false; + /** * If true, Camel will create a JmsTransactionManager, if there is no * transactionManager injected when option transacted=true. */ @@ -1488,6 +1507,14 @@ public class AMQPComponentConfiguration this.transacted = transacted; } + public Boolean getTransactedInOut() { + return transactedInOut; + } + + public void setTransactedInOut(Boolean transactedInOut) { + this.transactedInOut = transactedInOut; + } + public Boolean getLazyCreateTransactionManager() { return lazyCreateTransactionManager; } diff --git a/components-starter/camel-aws2-sts-starter/src/main/docs/aws2-sts-starter.adoc b/components-starter/camel-aws2-sts-starter/src/main/docs/aws2-sts-starter.adoc index 9b08e7f..fac6608 100644 --- a/components-starter/camel-aws2-sts-starter/src/main/docs/aws2-sts-starter.adoc +++ b/components-starter/camel-aws2-sts-starter/src/main/docs/aws2-sts-starter.adoc @@ -32,12 +32,12 @@ The component supports 15 options, which are listed below. | *camel.component.aws2-sts.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...] | *camel.component.aws2-sts.operation* | The operation to perform | | STS2Operations | *camel.component.aws2-sts.pojo-request* | If we want to use a POJO request as body or not | false | Boolean -| *camel.component.aws2-sts.proxy-host* | To define a proxy host when instantiating the ECS client | | String -| *camel.component.aws2-sts.proxy-port* | To define a proxy port when instantiating the ECS client | | Integer -| *camel.component.aws2-sts.proxy-protocol* | To define a proxy protocol when instantiating the ECS client | | Protocol -| *camel.component.aws2-sts.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String +| *camel.component.aws2-sts.proxy-host* | To define a proxy host when instantiating the STS client | | String +| *camel.component.aws2-sts.proxy-port* | To define a proxy port when instantiating the STS client | | Integer +| *camel.component.aws2-sts.proxy-protocol* | To define a proxy protocol when instantiating the STS client | | Protocol +| *camel.component.aws2-sts.region* | The region in which STS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | aws-global | String | *camel.component.aws2-sts.secret-key* | Amazon AWS Secret Key | | String -| *camel.component.aws2-sts.sts-client* | To use a existing configured AWS ECS as client. The option is a software.amazon.awssdk.services.sts.StsClient type. | | String +| *camel.component.aws2-sts.sts-client* | To use a existing configured AWS STS as client. The option is a software.amazon.awssdk.services.sts.StsClient type. | | String | *camel.component.aws2-sts.trust-all-certificates* | If we want to trust all certificates in case of overriding the endpoint | false | Boolean |=== // spring-boot-auto-configure options: END diff --git a/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConfiguration.java b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConfiguration.java index 828dd79..cbb167e 100644 --- a/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConfiguration.java +++ b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import software.amazon.awssdk.core.Protocol; /** - * Manage AWS ECS cluster instances using AWS SDK version 2.x. + * Manage AWS STS cluster instances using AWS SDK version 2.x. * * Generated by camel-package-maven-plugin - do not edit this file! */ @@ -70,25 +70,25 @@ public class STS2ComponentConfiguration */ private Boolean pojoRequest = false; /** - * To define a proxy host when instantiating the ECS client + * To define a proxy host when instantiating the STS client */ private String proxyHost; /** - * To define a proxy port when instantiating the ECS client + * To define a proxy port when instantiating the STS client */ private Integer proxyPort; /** - * To define a proxy protocol when instantiating the ECS client + * To define a proxy protocol when instantiating the STS client */ private Protocol proxyProtocol = Protocol.HTTPS; /** - * The region in which ECS client needs to work. When using this parameter, + * The region in which STS client needs to work. When using this parameter, * the configuration will expect the lowercase name of the region (for * example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() */ - private String region; + private String region = "aws-global"; /** - * To use a existing configured AWS ECS as client. The option is a + * To use a existing configured AWS STS as client. The option is a * software.amazon.awssdk.services.sts.StsClient type. */ private String stsClient; diff --git a/components-starter/camel-jms-starter/src/main/docs/jms-starter.adoc b/components-starter/camel-jms-starter/src/main/docs/jms-starter.adoc index c8b0164..d04151e 100644 --- a/components-starter/camel-jms-starter/src/main/docs/jms-starter.adoc +++ b/components-starter/camel-jms-starter/src/main/docs/jms-starter.adoc @@ -17,7 +17,7 @@ When using jms with Spring Boot make sure to use the following Maven dependency ---- -The component supports 96 options, which are listed below. +The component supports 97 options, which are listed below. @@ -111,6 +111,7 @@ The component supports 96 options, which are listed below. | *camel.component.jms.test-connection-on-startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | Boolean | *camel.component.jms.time-to-live* | When sending messages, specifies the time-to-live of the message (in milliseconds). | -1 | Long | *camel.component.jms.transacted* | Specifies whether to use transacted mode | false | Boolean +| *camel.component.jms.transacted-in-out* | 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, t [...] | *camel.component.jms.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String | *camel.component.jms.transaction-name* | The name of the transaction to use. | | String | *camel.component.jms.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer diff --git a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java index c51047e..9788eaf 100644 --- a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java +++ b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java @@ -711,6 +711,25 @@ public class JmsComponentConfiguration */ private Boolean transacted = false; /** + * 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 = false; + /** * If true, Camel will create a JmsTransactionManager, if there is no * transactionManager injected when option transacted=true. */ @@ -1473,6 +1492,14 @@ public class JmsComponentConfiguration this.transacted = transacted; } + public Boolean getTransactedInOut() { + return transactedInOut; + } + + public void setTransactedInOut(Boolean transactedInOut) { + this.transactedInOut = transactedInOut; + } + public Boolean getLazyCreateTransactionManager() { return lazyCreateTransactionManager; } diff --git a/docs/modules/ROOT/pages/activemq-starter.adoc b/docs/modules/ROOT/pages/activemq-starter.adoc index a89550a..c5532c7 100644 --- a/docs/modules/ROOT/pages/activemq-starter.adoc +++ b/docs/modules/ROOT/pages/activemq-starter.adoc @@ -17,7 +17,7 @@ When using activemq with Spring Boot make sure to use the following Maven depend ---- -The component supports 100 options, which are listed below. +The component supports 101 options, which are listed below. @@ -112,6 +112,7 @@ The component supports 100 options, which are listed below. | *camel.component.activemq.test-connection-on-startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | Boolean | *camel.component.activemq.time-to-live* | When sending messages, specifies the time-to-live of the message (in milliseconds). | -1 | Long | *camel.component.activemq.transacted* | Specifies whether to use transacted mode | false | Boolean +| *camel.component.activemq.transacted-in-out* | 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 conte [...] | *camel.component.activemq.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String | *camel.component.activemq.transaction-name* | The name of the transaction to use. | | String | *camel.component.activemq.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer diff --git a/docs/modules/ROOT/pages/amqp-starter.adoc b/docs/modules/ROOT/pages/amqp-starter.adoc index c842cb9..e27a80f 100644 --- a/docs/modules/ROOT/pages/amqp-starter.adoc +++ b/docs/modules/ROOT/pages/amqp-starter.adoc @@ -17,7 +17,7 @@ When using amqp with Spring Boot make sure to use the following Maven dependency ---- -The component supports 97 options, which are listed below. +The component supports 98 options, which are listed below. @@ -112,6 +112,7 @@ The component supports 97 options, which are listed below. | *camel.component.amqp.test-connection-on-startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | Boolean | *camel.component.amqp.time-to-live* | When sending messages, specifies the time-to-live of the message (in milliseconds). | -1 | Long | *camel.component.amqp.transacted* | Specifies whether to use transacted mode | false | Boolean +| *camel.component.amqp.transacted-in-out* | 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, [...] | *camel.component.amqp.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String | *camel.component.amqp.transaction-name* | The name of the transaction to use. | | String | *camel.component.amqp.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer diff --git a/docs/modules/ROOT/pages/aws2-sts-starter.adoc b/docs/modules/ROOT/pages/aws2-sts-starter.adoc index 9b08e7f..fac6608 100644 --- a/docs/modules/ROOT/pages/aws2-sts-starter.adoc +++ b/docs/modules/ROOT/pages/aws2-sts-starter.adoc @@ -32,12 +32,12 @@ The component supports 15 options, which are listed below. | *camel.component.aws2-sts.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...] | *camel.component.aws2-sts.operation* | The operation to perform | | STS2Operations | *camel.component.aws2-sts.pojo-request* | If we want to use a POJO request as body or not | false | Boolean -| *camel.component.aws2-sts.proxy-host* | To define a proxy host when instantiating the ECS client | | String -| *camel.component.aws2-sts.proxy-port* | To define a proxy port when instantiating the ECS client | | Integer -| *camel.component.aws2-sts.proxy-protocol* | To define a proxy protocol when instantiating the ECS client | | Protocol -| *camel.component.aws2-sts.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String +| *camel.component.aws2-sts.proxy-host* | To define a proxy host when instantiating the STS client | | String +| *camel.component.aws2-sts.proxy-port* | To define a proxy port when instantiating the STS client | | Integer +| *camel.component.aws2-sts.proxy-protocol* | To define a proxy protocol when instantiating the STS client | | Protocol +| *camel.component.aws2-sts.region* | The region in which STS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | aws-global | String | *camel.component.aws2-sts.secret-key* | Amazon AWS Secret Key | | String -| *camel.component.aws2-sts.sts-client* | To use a existing configured AWS ECS as client. The option is a software.amazon.awssdk.services.sts.StsClient type. | | String +| *camel.component.aws2-sts.sts-client* | To use a existing configured AWS STS as client. The option is a software.amazon.awssdk.services.sts.StsClient type. | | String | *camel.component.aws2-sts.trust-all-certificates* | If we want to trust all certificates in case of overriding the endpoint | false | Boolean |=== // spring-boot-auto-configure options: END diff --git a/docs/modules/ROOT/pages/jms-starter.adoc b/docs/modules/ROOT/pages/jms-starter.adoc index c8b0164..d04151e 100644 --- a/docs/modules/ROOT/pages/jms-starter.adoc +++ b/docs/modules/ROOT/pages/jms-starter.adoc @@ -17,7 +17,7 @@ When using jms with Spring Boot make sure to use the following Maven dependency ---- -The component supports 96 options, which are listed below. +The component supports 97 options, which are listed below. @@ -111,6 +111,7 @@ The component supports 96 options, which are listed below. | *camel.component.jms.test-connection-on-startup* | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | Boolean | *camel.component.jms.time-to-live* | When sending messages, specifies the time-to-live of the message (in milliseconds). | -1 | Long | *camel.component.jms.transacted* | Specifies whether to use transacted mode | false | Boolean +| *camel.component.jms.transacted-in-out* | 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, t [...] | *camel.component.jms.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String | *camel.component.jms.transaction-name* | The name of the transaction to use. | | String | *camel.component.jms.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc index 505b395..0af20ff 100644 --- a/docs/modules/ROOT/pages/list.adoc +++ b/docs/modules/ROOT/pages/list.adoc @@ -111,7 +111,7 @@ Number of Camel components: 336 in 269 JAR artifacts (3 deprecated) `aws2-s3://bucketNameOrArn` | 3.2 | Store and retrieve objects from AWS S3 Storage Service using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-sts-component.html[AWS 2 Security Token Service (STS)] (camel-aws2-sts-starter) + -`aws2-sts:label` | 3.5 | Manage AWS ECS cluster instances using AWS SDK version 2.x. +`aws2-sts:label` | 3.5 | Manage AWS STS cluster instances using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-ses-component.html[AWS 2 Simple Email Service (SES)] (camel-aws2-ses-starter) + `aws2-ses:from` | 3.1 | Send e-mails through AWS SES service using AWS SDK version 2.x.