You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/08/05 18:10:26 UTC
[camel] branch camel-2.25.x updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.25.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.25.x by this push:
new e37e039 Regen
e37e039 is described below
commit e37e03961455dc04dd8de2207db9047f1bd53973
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 5 20:09:18 2020 +0200
Regen
---
.../camel-amqp/src/main/docs/amqp-component.adoc | 3 ++-
.../camel-chunk/src/main/docs/chunk-component.adoc | 3 ++-
.../src/main/docs/freemarker-component.adoc | 3 ++-
.../camel-jms/src/main/docs/jms-component.adoc | 7 +++---
.../camel-jolt/src/main/docs/jolt-component.adoc | 3 ++-
.../src/main/docs/json-validator-component.adoc | 3 ++-
.../src/main/docs/mustache-component.adoc | 3 ++-
.../camel-mvel/src/main/docs/mvel-component.adoc | 3 ++-
.../camel-mvel/src/main/docs/mvel-language.adoc | 3 ++-
.../src/main/docs/string-template-component.adoc | 3 ++-
.../src/main/docs/velocity-component.adoc | 3 ++-
.../modules/ROOT/pages/amqp-component.adoc | 3 ++-
.../modules/ROOT/pages/chunk-component.adoc | 9 +++++---
.../modules/ROOT/pages/freemarker-component.adoc | 9 +++++---
.../modules/ROOT/pages/jms-component.adoc | 7 +++---
.../modules/ROOT/pages/jolt-component.adoc | 3 ++-
.../ROOT/pages/json-validator-component.adoc | 3 ++-
.../modules/ROOT/pages/mina-component.adoc | 2 +-
.../modules/ROOT/pages/mustache-component.adoc | 9 +++++---
.../modules/ROOT/pages/mvel-component.adoc | 9 +++++---
.../modules/ROOT/pages/mvel-language.adoc | 3 ++-
.../modules/ROOT/pages/sql-component.adoc | 19 ++++++++++++++++
.../ROOT/pages/string-template-component.adoc | 9 +++++---
.../modules/ROOT/pages/telegram-component.adoc | 17 +++++++-------
.../modules/ROOT/pages/velocity-component.adoc | 9 +++++---
.../src/main/resources/camel-connector-schema.json | 2 +-
.../src/main/resources/camel-connector.json | 4 ++--
.../jms/springboot/JmsComponentConfiguration.java | 26 +++++++++++++++++-----
28 files changed, 124 insertions(+), 56 deletions(-)
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 730f991..6d27db9 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -153,7 +153,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (91 parameters):
+=== Query Parameters (92 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -246,6 +246,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
| *lazyCreateTransaction Manager* (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. | | PlatformTransaction Manager
| *transactionName* (transaction) | The name of the transaction to use. | | String
diff --git a/components/camel-chunk/src/main/docs/chunk-component.adoc b/components/camel-chunk/src/main/docs/chunk-component.adoc
index 9ea4011..3cb67a6 100644
--- a/components/camel-chunk/src/main/docs/chunk-component.adoc
+++ b/components/camel-chunk/src/main/docs/chunk-component.adoc
@@ -105,13 +105,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.chunk.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.chunk.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.chunk.enabled* | Enable chunk component | true | Boolean
| *camel.component.chunk.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-freemarker/src/main/docs/freemarker-component.adoc b/components/camel-freemarker/src/main/docs/freemarker-component.adoc
index 01d7ce8..d926c16 100644
--- a/components/camel-freemarker/src/main/docs/freemarker-component.adoc
+++ b/components/camel-freemarker/src/main/docs/freemarker-component.adoc
@@ -109,13 +109,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.freemarker.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.freemarker.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.freemarker.configuration* | To use an existing freemarker.template.Configuration instance as the configuration. The option is a freemarker.template.Configuration type. | | String
| *camel.component.freemarker.enabled* | Enable freemarker component | true | Boolean
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index 6c3264f..7ac4d1c 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -320,7 +320,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (91 parameters):
+=== Query Parameters (92 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -413,6 +413,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 cont [...]
| *lazyCreateTransaction Manager* (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. | | PlatformTransaction Manager
| *transactionName* (transaction) | The name of the transaction to use. | | String
@@ -538,6 +539,7 @@ The component supports 172 options, which are listed below.
| *camel.component.jms.configuration.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.configuration.time-to-live* | When sending messages, specifies the time-to-live of the message (in milliseconds). | -1 | Long
| *camel.component.jms.configuration.transacted* | Specifies whether to use transacted mode | false | Boolean
+| *camel.component.jms.configuration.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 transac [...]
| *camel.component.jms.configuration.transaction-manager* | The Spring transaction manager to use. | | PlatformTransaction Manager
| *camel.component.jms.configuration.transaction-name* | The name of the transaction to use. | | String
| *camel.component.jms.configuration.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
@@ -613,7 +615,6 @@ The component supports 172 options, which are listed below.
| *camel.component.jms.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
| *camel.component.jms.wait-for-provision-correlation-to-be-updated-counter* | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | Integer
| *camel.component.jms.wait-for-provision-correlation-to-be-updated-thread-sleeping-time* | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | Long
-| *camel.component.jms.configuration.transacted-in-out* | *Deprecated* | | Boolean
|===
// spring-boot-auto-configure options: END
@@ -1543,4 +1544,4 @@ wmq.setDestinationResolver(new DestinationResolver() {
return wmqSession.createQueue("queue:///" + destinationName + "?targetClient=1");
}
});
-----------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
+----------------------------------------------------------------------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/docs/jolt-component.adoc b/components/camel-jolt/src/main/docs/jolt-component.adoc
index 012a5bf..f2f817b 100644
--- a/components/camel-jolt/src/main/docs/jolt-component.adoc
+++ b/components/camel-jolt/src/main/docs/jolt-component.adoc
@@ -80,12 +80,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (6 parameters):
+=== Query Parameters (7 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *allowTemplateFromHeader* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
| *inputType* (producer) | Specifies if the input is hydrated JSON or a JSON String. | Hydrated | JoltInputOutputType
diff --git a/components/camel-json-validator/src/main/docs/json-validator-component.adoc b/components/camel-json-validator/src/main/docs/json-validator-component.adoc
index 5c43bad..3fdea00 100644
--- a/components/camel-json-validator/src/main/docs/json-validator-component.adoc
+++ b/components/camel-json-validator/src/main/docs/json-validator-component.adoc
@@ -61,12 +61,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (7 parameters):
+=== Query Parameters (8 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
| *failOnNullBody* (producer) | Whether to fail if no body exists. | true | boolean
| *failOnNullHeader* (producer) | Whether to fail if no header exists when validating against a header. | true | boolean
diff --git a/components/camel-mustache/src/main/docs/mustache-component.adoc b/components/camel-mustache/src/main/docs/mustache-component.adoc
index 68f2415..7304223 100644
--- a/components/camel-mustache/src/main/docs/mustache-component.adoc
+++ b/components/camel-mustache/src/main/docs/mustache-component.adoc
@@ -110,13 +110,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.mustache.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.mustache.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.mustache.enabled* | Enable mustache component | true | Boolean
| *camel.component.mustache.mustache-factory* | To use a custom MustacheFactory. The option is a com.github.mustachejava.MustacheFactory type. | | String
diff --git a/components/camel-mvel/src/main/docs/mvel-component.adoc b/components/camel-mvel/src/main/docs/mvel-component.adoc
index 0315a06..6e7503a 100644
--- a/components/camel-mvel/src/main/docs/mvel-component.adoc
+++ b/components/camel-mvel/src/main/docs/mvel-component.adoc
@@ -103,13 +103,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.mvel.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.mvel.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.mvel.enabled* | Enable mvel component | true | Boolean
| *camel.component.mvel.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-mvel/src/main/docs/mvel-language.adoc b/components/camel-mvel/src/main/docs/mvel-language.adoc
index 8a1f3f1..1e166fc 100644
--- a/components/camel-mvel/src/main/docs/mvel-language.adoc
+++ b/components/camel-mvel/src/main/docs/mvel-language.adoc
@@ -53,13 +53,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.mvel.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.mvel.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.mvel.enabled* | Enable mvel component | true | Boolean
| *camel.component.mvel.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-stringtemplate/src/main/docs/string-template-component.adoc b/components/camel-stringtemplate/src/main/docs/string-template-component.adoc
index 6d41301..0e27f0f 100644
--- a/components/camel-stringtemplate/src/main/docs/string-template-component.adoc
+++ b/components/camel-stringtemplate/src/main/docs/string-template-component.adoc
@@ -103,13 +103,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.string-template.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.string-template.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.string-template.enabled* | Enable string-template component | true | Boolean
| *camel.component.string-template.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-velocity/src/main/docs/velocity-component.adoc b/components/camel-velocity/src/main/docs/velocity-component.adoc
index ddc16c4..a9ca81d 100644
--- a/components/camel-velocity/src/main/docs/velocity-component.adoc
+++ b/components/camel-velocity/src/main/docs/velocity-component.adoc
@@ -108,13 +108,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.velocity.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.velocity.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.velocity.enabled* | Enable velocity component | true | Boolean
| *camel.component.velocity.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc b/docs/components/modules/ROOT/pages/amqp-component.adoc
index 31c08c1..bcb92c5 100644
--- a/docs/components/modules/ROOT/pages/amqp-component.adoc
+++ b/docs/components/modules/ROOT/pages/amqp-component.adoc
@@ -154,7 +154,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (91 parameters):
+=== Query Parameters (92 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -247,6 +247,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
| *lazyCreateTransaction Manager* (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. | | PlatformTransaction Manager
| *transactionName* (transaction) | The name of the transaction to use. | | String
diff --git a/docs/components/modules/ROOT/pages/chunk-component.adoc b/docs/components/modules/ROOT/pages/chunk-component.adoc
index e320974..c505d11 100644
--- a/docs/components/modules/ROOT/pages/chunk-component.adoc
+++ b/docs/components/modules/ROOT/pages/chunk-component.adoc
@@ -39,7 +39,7 @@ format, `?option=value&option=value&...`
// component options: START
-The Chunk component supports 2 options, which are listed below.
+The Chunk component supports 3 options, which are listed below.
@@ -47,6 +47,7 @@ The Chunk component supports 2 options, which are listed below.
|===
| Name | Description | Default | Type
| *allowTemplateFrom Header* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
|===
// component options: END
@@ -72,12 +73,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (8 parameters):
+=== Query Parameters (9 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *allowTemplateFromHeader* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
| *encoding* (producer) | Define the encoding of the body | | String
@@ -104,13 +106,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.chunk.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.chunk.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.chunk.enabled* | Enable chunk component | true | Boolean
| *camel.component.chunk.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/docs/components/modules/ROOT/pages/freemarker-component.adoc b/docs/components/modules/ROOT/pages/freemarker-component.adoc
index ff60df7..dfbd750 100644
--- a/docs/components/modules/ROOT/pages/freemarker-component.adoc
+++ b/docs/components/modules/ROOT/pages/freemarker-component.adoc
@@ -42,7 +42,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Freemarker component supports 3 options, which are listed below.
+The Freemarker component supports 4 options, which are listed below.
@@ -51,6 +51,7 @@ The Freemarker component supports 3 options, which are listed below.
| Name | Description | Default | Type
| *configuration* (advanced) | To use an existing freemarker.template.Configuration instance as the configuration. | | Configuration
| *allowTemplateFrom Header* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
|===
// component options: END
@@ -78,12 +79,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (6 parameters):
+=== Query Parameters (7 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *allowTemplateFromHeader* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
| *configuration* (producer) | Sets the Freemarker configuration to use | | Configuration
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
@@ -108,13 +110,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.freemarker.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.freemarker.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.freemarker.configuration* | To use an existing freemarker.template.Configuration instance as the configuration. The option is a freemarker.template.Configuration type. | | String
| *camel.component.freemarker.enabled* | Enable freemarker component | true | Boolean
diff --git a/docs/components/modules/ROOT/pages/jms-component.adoc b/docs/components/modules/ROOT/pages/jms-component.adoc
index 49e6d06..962f063 100644
--- a/docs/components/modules/ROOT/pages/jms-component.adoc
+++ b/docs/components/modules/ROOT/pages/jms-component.adoc
@@ -321,7 +321,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (91 parameters):
+=== Query Parameters (92 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -414,6 +414,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 cont [...]
| *lazyCreateTransaction Manager* (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. | | PlatformTransaction Manager
| *transactionName* (transaction) | The name of the transaction to use. | | String
@@ -539,6 +540,7 @@ The component supports 172 options, which are listed below.
| *camel.component.jms.configuration.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.configuration.time-to-live* | When sending messages, specifies the time-to-live of the message (in milliseconds). | -1 | Long
| *camel.component.jms.configuration.transacted* | Specifies whether to use transacted mode | false | Boolean
+| *camel.component.jms.configuration.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 transac [...]
| *camel.component.jms.configuration.transaction-manager* | The Spring transaction manager to use. | | PlatformTransaction Manager
| *camel.component.jms.configuration.transaction-name* | The name of the transaction to use. | | String
| *camel.component.jms.configuration.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
@@ -614,7 +616,6 @@ The component supports 172 options, which are listed below.
| *camel.component.jms.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
| *camel.component.jms.wait-for-provision-correlation-to-be-updated-counter* | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | Integer
| *camel.component.jms.wait-for-provision-correlation-to-be-updated-thread-sleeping-time* | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | Long
-| *camel.component.jms.configuration.transacted-in-out* | *Deprecated* | | Boolean
|===
// spring-boot-auto-configure options: END
@@ -1544,4 +1545,4 @@ wmq.setDestinationResolver(new DestinationResolver() {
return wmqSession.createQueue("queue:///" + destinationName + "?targetClient=1");
}
});
-----------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
+----------------------------------------------------------------------------------------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/jolt-component.adoc b/docs/components/modules/ROOT/pages/jolt-component.adoc
index d0c6ad3..7ffd2f0 100644
--- a/docs/components/modules/ROOT/pages/jolt-component.adoc
+++ b/docs/components/modules/ROOT/pages/jolt-component.adoc
@@ -81,12 +81,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (6 parameters):
+=== Query Parameters (7 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *allowTemplateFromHeader* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
| *inputType* (producer) | Specifies if the input is hydrated JSON or a JSON String. | Hydrated | JoltInputOutputType
diff --git a/docs/components/modules/ROOT/pages/json-validator-component.adoc b/docs/components/modules/ROOT/pages/json-validator-component.adoc
index 5fb1340..9543b8c 100644
--- a/docs/components/modules/ROOT/pages/json-validator-component.adoc
+++ b/docs/components/modules/ROOT/pages/json-validator-component.adoc
@@ -62,12 +62,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (7 parameters):
+=== Query Parameters (8 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
| *failOnNullBody* (producer) | Whether to fail if no body exists. | true | boolean
| *failOnNullHeader* (producer) | Whether to fail if no header exists when validating against a header. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/mina-component.adoc b/docs/components/modules/ROOT/pages/mina-component.adoc
index c1f8d66..0f5869d 100644
--- a/docs/components/modules/ROOT/pages/mina-component.adoc
+++ b/docs/components/modules/ROOT/pages/mina-component.adoc
@@ -9,7 +9,7 @@
*Deprecated*
WARNING: This component is deprecated as the Apache Mina 1.x project is EOL.
-Instead use xref:mina2-component.adoc[Mina 2] or xref:mina2-component.adoc[Mina 2] instead.
+Instead use xref:mina2-component.adoc[Mina 2] or xref:netty-component.adoc[Netty] instead.
The *mina:* component is a transport for working with
http://mina.apache.org/[Apache MINA]
diff --git a/docs/components/modules/ROOT/pages/mustache-component.adoc b/docs/components/modules/ROOT/pages/mustache-component.adoc
index 923d439..f57a8b7 100644
--- a/docs/components/modules/ROOT/pages/mustache-component.adoc
+++ b/docs/components/modules/ROOT/pages/mustache-component.adoc
@@ -40,7 +40,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Mustache component supports 3 options, which are listed below.
+The Mustache component supports 4 options, which are listed below.
@@ -49,6 +49,7 @@ The Mustache component supports 3 options, which are listed below.
| Name | Description | Default | Type
| *mustacheFactory* (advanced) | To use a custom MustacheFactory | | MustacheFactory
| *allowTemplateFrom Header* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
|===
// component options: END
@@ -79,12 +80,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (6 parameters):
+=== Query Parameters (7 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *allowTemplateFromHeader* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
| *encoding* (producer) | Character encoding of the resource content. | | String
@@ -109,13 +111,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.mustache.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.mustache.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.mustache.enabled* | Enable mustache component | true | Boolean
| *camel.component.mustache.mustache-factory* | To use a custom MustacheFactory. The option is a com.github.mustachejava.MustacheFactory type. | | String
diff --git a/docs/components/modules/ROOT/pages/mvel-component.adoc b/docs/components/modules/ROOT/pages/mvel-component.adoc
index dfc7232..ac686e4 100644
--- a/docs/components/modules/ROOT/pages/mvel-component.adoc
+++ b/docs/components/modules/ROOT/pages/mvel-component.adoc
@@ -40,7 +40,7 @@ You can append query options to the URI in the following format,
// component options: START
-The MVEL component supports 2 options, which are listed below.
+The MVEL component supports 3 options, which are listed below.
@@ -48,6 +48,7 @@ The MVEL component supports 2 options, which are listed below.
|===
| Name | Description | Default | Type
| *allowTemplateFrom Header* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
|===
// component options: END
@@ -74,12 +75,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (4 parameters):
+=== Query Parameters (5 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *allowTemplateFromHeader* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
| *encoding* (producer) | Character encoding of the resource content. | | String
@@ -102,13 +104,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.mvel.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.mvel.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.mvel.enabled* | Enable mvel component | true | Boolean
| *camel.component.mvel.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/docs/components/modules/ROOT/pages/mvel-language.adoc b/docs/components/modules/ROOT/pages/mvel-language.adoc
index 23ecf8b..f64bcce 100644
--- a/docs/components/modules/ROOT/pages/mvel-language.adoc
+++ b/docs/components/modules/ROOT/pages/mvel-language.adoc
@@ -54,13 +54,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.mvel.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.mvel.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.mvel.enabled* | Enable mvel component | true | Boolean
| *camel.component.mvel.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/docs/components/modules/ROOT/pages/sql-component.adoc b/docs/components/modules/ROOT/pages/sql-component.adoc
index 0fca84b..9789fe3 100644
--- a/docs/components/modules/ROOT/pages/sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/sql-component.adoc
@@ -647,6 +647,25 @@ CREATE TABLE aggregation_completed (
);
-----
+**Note:** There is a new version called `JdbcAggregationRepositoryNew` which supports the optimistic locking
+also on a dstributed environment (multiple JVMs or independent threads). This new implementation is built on
+top of the old and needs an additional `version` column:
+
+[source,sql]
+-----
+CREATE TABLE aggregation (
+ id varchar(255) NOT NULL,
+ exchange blob NOT NULL,
+ version BIGINT NOT NULL,
+ constraint aggregation_pk PRIMARY KEY (id)
+);
+CREATE TABLE aggregation_completed (
+ id varchar(255) NOT NULL,
+ exchange blob NOT NULL,
+ version BIGINT NOT NULL,
+ constraint aggregation_completed_pk PRIMARY KEY (id)
+);
+-----
== Storing body and headers as text
diff --git a/docs/components/modules/ROOT/pages/string-template-component.adoc b/docs/components/modules/ROOT/pages/string-template-component.adoc
index e6c6b81..0ac852c 100644
--- a/docs/components/modules/ROOT/pages/string-template-component.adoc
+++ b/docs/components/modules/ROOT/pages/string-template-component.adoc
@@ -40,7 +40,7 @@ You can append query options to the URI in the following format,
// component options: START
-The String Template component supports 2 options, which are listed below.
+The String Template component supports 3 options, which are listed below.
@@ -48,6 +48,7 @@ The String Template component supports 2 options, which are listed below.
|===
| Name | Description | Default | Type
| *allowTemplateFrom Header* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
|===
// component options: END
@@ -73,12 +74,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (5 parameters):
+=== Query Parameters (6 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *allowTemplateFromHeader* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
| *delimiterStart* (producer) | The variable start delimiter | < | char
@@ -102,13 +104,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.string-template.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.string-template.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.string-template.enabled* | Enable string-template component | true | Boolean
| *camel.component.string-template.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/docs/components/modules/ROOT/pages/telegram-component.adoc b/docs/components/modules/ROOT/pages/telegram-component.adoc
index c7952b4..6fd474d 100644
--- a/docs/components/modules/ROOT/pages/telegram-component.adoc
+++ b/docs/components/modules/ROOT/pages/telegram-component.adoc
@@ -80,7 +80,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (24 parameters):
+=== Query Parameters (25 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -88,6 +88,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *proxyHost* (common) | The proxyHost which could be used when sending out the message. | | String
| *proxyPort* (common) | The proxyPort which could be used when sending out the message. | | Integer
+| *proxyType* (common) | The proxyType which could be used when sending out the message. | HTTP | TelegramProxyType
| *bridgeErrorHandler* (consumer) | 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 by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *limit* (consumer) | Limit on the number of updates that can be received in a single polling request. | 100 | Integer
| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
@@ -355,16 +356,16 @@ from("telegram:bots/123456789:insertYourAuthorizationTokenHere")
OutgoingTextMessage msg = new OutgoingTextMessage();
msg.setText("Choose one option!");
-
+
InlineKeyboardButton buttonOptionOneI = InlineKeyboardButton.builder()
.text("Option One - I").build();
-
+
InlineKeyboardButton buttonOptionOneII = InlineKeyboardButton.builder()
.text("Option One - II").build();
-
+
InlineKeyboardButton buttonOptionTwoI = InlineKeyboardButton.builder()
.text("Option Two - I").build();
-
+
ReplyKeyboardMarkup replyMarkup = ReplyKeyboardMarkup.builder()
.keyboard()
.addRow(Arrays.asList(buttonOptionOneI, buttonOptionOneII))
@@ -372,7 +373,7 @@ from("telegram:bots/123456789:insertYourAuthorizationTokenHere")
.close()
.oneTimeKeyboard(true)
.build();
-
+
msg.setReplyKeyboardMarkup(replyMarkup);
exchange.getIn().setBody(msg);
@@ -389,11 +390,11 @@ from("telegram:bots/123456789:insertYourAuthorizationTokenHere")
OutgoingTextMessage msg = new OutgoingTextMessage();
msg.setText("Your answer was accepted!");
-
+
ReplyKeyboardMarkup replyMarkup = ReplyKeyboardMarkup.builder()
.removeKeyboard(true)
.build();
-
+
msg.setReplyKeyboardMarkup(replyMarkup);
exchange.getIn().setBody(msg);
diff --git a/docs/components/modules/ROOT/pages/velocity-component.adoc b/docs/components/modules/ROOT/pages/velocity-component.adoc
index 5f0818c..30a0fa1 100644
--- a/docs/components/modules/ROOT/pages/velocity-component.adoc
+++ b/docs/components/modules/ROOT/pages/velocity-component.adoc
@@ -42,7 +42,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Velocity component supports 3 options, which are listed below.
+The Velocity component supports 4 options, which are listed below.
@@ -51,6 +51,7 @@ The Velocity component supports 3 options, which are listed below.
| Name | Description | Default | Type
| *velocityEngine* (advanced) | To use the VelocityEngine otherwise a new engine is created | | VelocityEngine
| *allowTemplateFrom Header* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
|===
// component options: END
@@ -77,12 +78,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (6 parameters):
+=== Query Parameters (7 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *allowContextMapAll* (producer) | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | boolean
| *allowTemplateFromHeader* (producer) | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | boolean
| *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
| *encoding* (producer) | Character encoding of the resource content. | | String
@@ -107,13 +109,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.velocity.allow-context-map-all* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | Boolean
| *camel.component.velocity.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean
| *camel.component.velocity.enabled* | Enable velocity component | true | Boolean
| *camel.component.velocity.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
index 9639bec..f66447e 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
@@ -14,7 +14,7 @@
"javaType":"org.myfoo.connector.MyFooComponent",
"groupId":"org.apache.camel",
"artifactId":"myfoo-connector",
- "version":"2.25.2-SNAPSHOT"
+ "version":"2.25.3-SNAPSHOT"
},
"componentProperties":{
diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector.json b/platforms/myfoo-connector/src/main/resources/camel-connector.json
index da03815..e5cd921 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector.json
@@ -2,14 +2,14 @@
"baseScheme" : "timer",
"baseGroupId" : "org.apache.camel",
"baseArtifactId" : "camel-core",
- "baseVersion" : "2.25.2-SNAPSHOT",
+ "baseVersion" : "2.25.3-SNAPSHOT",
"baseJavaType" : "org.apache.camel.component.timer.TimerComponent",
"name" : "MyFoo",
"scheme" : "my-foo",
"javaType" : "org.myfoo.connector.MyFooComponent",
"groupId" : "org.myfoo",
"artifactId" : "myfoo-connector",
- "version" : "2.25.2-SNAPSHOT",
+ "version" : "2.25.3-SNAPSHOT",
"description" : "Something cool",
"labels" : [ "foo", "timer" ],
"pattern" : "From",
diff --git a/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
index 3235cc0..777ebdc 100644
--- a/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
@@ -31,7 +31,6 @@ import org.apache.camel.component.jms.MessageListenerContainerFactory;
import org.apache.camel.component.jms.ReplyToType;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
import org.springframework.core.task.TaskExecutor;
import org.springframework.jms.core.JmsOperations;
import org.springframework.jms.support.converter.MessageConverter;
@@ -1573,8 +1572,26 @@ public class JmsComponentConfiguration
* Specifies whether to use transacted mode
*/
private Boolean transacted = false;
- @Deprecated
- private Boolean transactedInOut;
+ /**
+ * 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.
@@ -2345,13 +2362,10 @@ public class JmsComponentConfiguration
this.transacted = transacted;
}
- @Deprecated
- @DeprecatedConfigurationProperty
public Boolean getTransactedInOut() {
return transactedInOut;
}
- @Deprecated
public void setTransactedInOut(Boolean transactedInOut) {
this.transactedInOut = transactedInOut;
}