This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c2d129290dd92cc7335259b168dd31b465130330
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Jun 26 06:18:17 2020 +0200
Regen
---
camel-dependencies/pom.xml | 2 +-
.../resources/org/apache/camel/catalog/components/pulsar.json | 2 ++
.../resources/org/apache/camel/catalog/docs/chunk-component.adoc | 2 +-
.../org/apache/camel/catalog/docs/freemarker-component.adoc | 2 +-
.../resources/org/apache/camel/catalog/docs/jolt-component.adoc | 2 +-
.../resources/org/apache/camel/catalog/docs/jslt-component.adoc | 4 ++--
.../org/apache/camel/catalog/docs/mustache-component.adoc | 2 +-
.../resources/org/apache/camel/catalog/docs/mvel-component.adoc | 4 ++--
.../resources/org/apache/camel/catalog/docs/pulsar-component.adoc | 6 ++++--
.../org/apache/camel/catalog/docs/robotframework-component.adoc | 8 ++++----
.../org/apache/camel/catalog/docs/velocity-component.adoc | 4 ++--
11 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 10672f9..9513e35 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -70,7 +70,7 @@
<awaitility-version>4.0.3</awaitility-version>
<aws-java-sdk-swf-libs>1.11.22</aws-java-sdk-swf-libs>
<aws-java-sdk-version>1.11.714</aws-java-sdk-version>
- <aws-java-sdk2-version>2.13.44</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.13.45</aws-java-sdk2-version>
<aws-xray-version>2.5.0</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
<azure-storage-blob-java-sdk12-version>12.6.1</azure-storage-blob-java-sdk12-version>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
index b2469ca..82a5a69 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
@@ -35,6 +35,7 @@
"numberOfConsumers": { "kind": "property", "displayName": "Number Of
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "1", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", "description": "Number of consumers - defaults to 1" },
"subscriptionInitialPosition": { "kind": "property", "displayName":
"Subscription Initial Position", "group": "consumer", "label": "consumer",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.pulsar.utils.consumers.SubscriptionInitialPosition",
"enum": [ "EARLIEST", "LATEST" ], "deprecated": false, "secret": false,
"defaultValue": "LATEST", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", [...]
"subscriptionName": { "kind": "property", "displayName": "Subscription
Name", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "subs", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", "description": "Name of the subscription to use" },
+ "subscriptionTopicsMode": { "kind": "property", "displayName":
"Subscription Topics Mode", "group": "consumer", "label": "consumer",
"required": false, "type": "object", "javaType":
"org.apache.pulsar.client.api.RegexSubscriptionMode", "enum": [
"PersistentOnly", "NonPersistentOnly", "AllTopics" ], "deprecated": false,
"secret": false, "defaultValue": "PersistentOnly", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration" [...]
"subscriptionType": { "kind": "property", "displayName": "Subscription
Type", "group": "consumer", "label": "consumer", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.pulsar.utils.consumers.SubscriptionType", "enum": [
"EXCLUSIVE", "SHARED", "FAILOVER", "KEY_SHARED" ], "deprecated": false,
"secret": false, "defaultValue": "EXCLUSIVE", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", "de [...]
"topicsPattern": { "kind": "property", "displayName": "Topics Pattern",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"configuration", "description": "Whether the topic is a pattern (regular
expression) that allows the consumer to subscribe to all matching topics in th
[...]
"pulsarMessageReceiptFactory": { "kind": "property", "displayName":
"Pulsar Message Receipt Factory", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.component.pulsar.PulsarMessageReceiptFactory", "deprecated":
false, "secret": false, "description": "Provide a factory to create an
alternate implementation of PulsarMessageReceipt." },
@@ -74,6 +75,7 @@
"numberOfConsumers": { "kind": "parameter", "displayName": "Number Of
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "1", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"pulsarConfiguration", "description": "Number of consumers - defaults to 1" },
"subscriptionInitialPosition": { "kind": "parameter", "displayName":
"Subscription Initial Position", "group": "consumer", "label": "consumer",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.pulsar.utils.consumers.SubscriptionInitialPosition",
"enum": [ "EARLIEST", "LATEST" ], "deprecated": false, "secret": false,
"defaultValue": "LATEST", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"pulsarConfigur [...]
"subscriptionName": { "kind": "parameter", "displayName": "Subscription
Name", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "subs", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"pulsarConfiguration", "description": "Name of the subscription to use" },
+ "subscriptionTopicsMode": { "kind": "parameter", "displayName":
"Subscription Topics Mode", "group": "consumer", "label": "consumer",
"required": false, "type": "object", "javaType":
"org.apache.pulsar.client.api.RegexSubscriptionMode", "enum": [
"PersistentOnly", "NonPersistentOnly", "AllTopics" ], "deprecated": false,
"secret": false, "defaultValue": "PersistentOnly", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"pulsarConfigu [...]
"subscriptionType": { "kind": "parameter", "displayName": "Subscription
Type", "group": "consumer", "label": "consumer", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.pulsar.utils.consumers.SubscriptionType", "enum": [
"EXCLUSIVE", "SHARED", "FAILOVER", "KEY_SHARED" ], "deprecated": false,
"secret": false, "defaultValue": "EXCLUSIVE", "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"pulsarConfiguratio [...]
"topicsPattern": { "kind": "parameter", "displayName": "Topics Pattern",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.pulsar.PulsarConfiguration", "configurationField":
"pulsarConfiguration", "description": "Whether the topic is a pattern (regular
expression) that allows the consumer to subscribe to all matching topic [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "secret": false, "description": "To let the consumer use a
custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled
then this option is not in use. By default the consumer will deal with [...]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/chunk-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/chunk-component.adoc
index f509302..052e1fb 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/chunk-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/chunk-component.adoc
@@ -179,7 +179,7 @@ dynamically via a header, so for example:
------------------------------------------------------------------
from("direct:in").
setHeader(ChunkConstants.CHUNK_RESOURCE_URI).constant("template").
-to("chunk:dummy");
+to("chunk:dummy?allowTemplateFromHeader=true");
------------------------------------------------------------------
An example of Chunk component options use:
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/freemarker-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/freemarker-component.adoc
index 670f187..8437603 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/freemarker-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/freemarker-component.adoc
@@ -233,7 +233,7 @@ should use dynamically via a header, so for example:
---------------------------------------------------------------------------------------------
from("direct:in").
setHeader(FreemarkerConstants.FREEMARKER_RESOURCE_URI).constant("path/to/my/template.ftl").
- to("freemarker:dummy");
+ to("freemarker:dummy?allowTemplateFromHeader=true");
---------------------------------------------------------------------------------------------
== The Email Sample
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jolt-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jolt-component.adoc
index 9d684a0..f50149e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jolt-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jolt-component.adoc
@@ -135,7 +135,7 @@ dynamically via a header, so for example:
---------------------------------------------------------------------
from("direct:in").
setHeader("CamelJoltResourceUri").constant("path/to/my/spec.json").
- to("jolt:dummy");
+ to("jolt:dummy?allowTemplateFromHeader=true");
---------------------------------------------------------------------
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jslt-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jslt-component.adoc
index 4ecf4bd..4339e87 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jslt-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jslt-component.adoc
@@ -154,7 +154,7 @@ dynamically via a header, so for example:
---------------------------------------------------------------------
from("direct:in").
setHeader("CamelJsltResourceUri").constant("path/to/my/spec.json").
- to("jslt:dummy");
+ to("jslt:dummy?allowTemplateFromHeader=true");
---------------------------------------------------------------------
Or send whole jslt expression via header: (suitable for querying)
@@ -163,7 +163,7 @@ Or send whole jslt expression via header: (suitable for
querying)
---------------------------------------------------------------------
from("direct:in").
setHeader("CamelJsltResourceUri").constant(".published").
- to("jslt:dummy");
+ to("jslt:dummy?allowTemplateFromHeader=true");
---------------------------------------------------------------------
Passing exchange properties to the jslt expression can be done like this
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mustache-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mustache-component.adoc
index fbcbf7a..b607595 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mustache-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mustache-component.adoc
@@ -178,7 +178,7 @@ dynamically via a header, so for example:
--------------------------------------------------------------------------------------------
from("direct:in").
setHeader(MustacheConstants.MUSTACHE_RESOURCE_URI).constant("path/to/my/template.mustache").
-to("mustache:dummy");
+to("mustache:dummy?allowTemplateFromHeader=true");
--------------------------------------------------------------------------------------------
== The Email Sample
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mvel-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mvel-component.adoc
index 4b9aa5d..1e06961 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mvel-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mvel-component.adoc
@@ -185,7 +185,7 @@ header, so for example:
-------------------------------------------------------------------------
from("direct:in").
setHeader("CamelMvelResourceUri").constant("path/to/my/template.mvel").
- to("mvel:dummy");
+ to("mvel:dummy?allowTemplateFromHeader=true");
-------------------------------------------------------------------------
To specify a template directly as a header the component should use
@@ -195,7 +195,7 @@ dynamically via a header, so for example:
------------------------------------------------------------------------------------------
from("direct:in").
setHeader("CamelMvelTemplate").constant("@{\"The result is \" + request.body
* 3}\" }").
- to("velocity:dummy");
+ to("velocity:dummy?allowTemplateFromHeader=true");
------------------------------------------------------------------------------------------
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pulsar-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pulsar-component.adoc
index 044cdea..32b0ab5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pulsar-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pulsar-component.adoc
@@ -35,7 +35,7 @@ pulsar:[persistent|non-persistent]://tenant/namespace/topic
// component options: START
-The Pulsar component supports 34 options, which are listed below.
+The Pulsar component supports 35 options, which are listed below.
@@ -56,6 +56,7 @@ The Pulsar component supports 34 options, which are listed
below.
| *numberOfConsumers* (consumer) | Number of consumers - defaults to 1 | 1 |
int
| *subscriptionInitialPosition* (consumer) | Control the initial position in
the topic of a newly created subscription. Default is latest message. The value
can be one of: EARLIEST, LATEST | LATEST | SubscriptionInitialPosition
| *subscriptionName* (consumer) | Name of the subscription to use | subs |
String
+| *subscriptionTopicsMode* (consumer) | Determines to which topics this
consumer should be subscribed to - Persistent, Non-Persistent, or both. Only
used with pattern subscriptions. The value can be one of: PersistentOnly,
NonPersistentOnly, AllTopics | PersistentOnly | RegexSubscriptionMode
| *subscriptionType* (consumer) | Type of the subscription
EXCLUSIVESHAREDFAILOVERKEY_SHARED, defaults to EXCLUSIVE. The value can be one
of: EXCLUSIVE, SHARED, FAILOVER, KEY_SHARED | EXCLUSIVE | SubscriptionType
| *topicsPattern* (consumer) | Whether the topic is a pattern (regular
expression) that allows the consumer to subscribe to all matching topics in the
namespace | false | boolean
| *pulsarMessageReceiptFactory* (consumer) | Provide a factory to create an
alternate implementation of PulsarMessageReceipt. | |
PulsarMessageReceiptFactory
@@ -105,7 +106,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (33 parameters):
+=== Query Parameters (34 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -124,6 +125,7 @@ with the following path and query parameters:
| *numberOfConsumers* (consumer) | Number of consumers - defaults to 1 | 1 |
int
| *subscriptionInitialPosition* (consumer) | Control the initial position in
the topic of a newly created subscription. Default is latest message. The value
can be one of: EARLIEST, LATEST | LATEST | SubscriptionInitialPosition
| *subscriptionName* (consumer) | Name of the subscription to use | subs |
String
+| *subscriptionTopicsMode* (consumer) | Determines to which topics this
consumer should be subscribed to - Persistent, Non-Persistent, or both. Only
used with pattern subscriptions. The value can be one of: PersistentOnly,
NonPersistentOnly, AllTopics | PersistentOnly | RegexSubscriptionMode
| *subscriptionType* (consumer) | Type of the subscription
EXCLUSIVESHAREDFAILOVERKEY_SHARED, defaults to EXCLUSIVE. The value can be one
of: EXCLUSIVE, SHARED, FAILOVER, KEY_SHARED | EXCLUSIVE | SubscriptionType
| *topicsPattern* (consumer) | Whether the topic is a pattern (regular
expression) that allows the consumer to subscribe to all matching topics in the
namespace | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/robotframework-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/robotframework-component.adoc
index a46a547..175aa79 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/robotframework-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/robotframework-component.adoc
@@ -232,7 +232,7 @@ should use dynamically via a header, so for example:
----
from("direct:in")
.setHeader(RobotFrameworkCamelConstants.CAMEL_ROBOT_RESOURCE_URI).constant("path/to/my/template.robot")
- .to("robotframework:dummy");
+ .to("robotframework:dummy?allowTemplateFromHeader=true");
----
Robotframework component helps you pass values into robot test cases
@@ -245,7 +245,7 @@ different ways. Exchange body, headers and properties.
from("direct:in")
.setBody(constant("Hello Robot"))
.setHeader(RobotFrameworkCamelConstants.CAMEL_ROBOT_RESOURCE_URI).constant("path/to/my/template.robot")
- .to("robotframework:dummy");
+ .to("robotframework:dummy?allowTemplateFromHeader=true");
----
And the `template.robot` file:
@@ -263,7 +263,7 @@ And the `template.robot` file:
from("direct:in")
.setHeader("testHeader", constant("testHeaderValue"))
.setHeader(RobotFrameworkCamelConstants.CAMEL_ROBOT_RESOURCE_URI).constant("path/to/my/template.robot")
- .to("robotframework:dummy");
+ .to("robotframework:dummy?allowTemplateFromHeader=true");
----
And the `template.robot` file:
@@ -281,7 +281,7 @@ And the `template.robot` file:
from("direct:in")
.setProperty"testProperty", constant("testPropertyValue"))
.setHeader(RobotFrameworkCamelConstants.CAMEL_ROBOT_RESOURCE_URI).constant("path/to/my/template.robot")
- .to("robotframework:dummy");
+ .to("robotframework:dummy?allowTemplateFromHeader=true");
----
And the `template.robot` file:
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/velocity-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/velocity-component.adoc
index e9fc32f..853a029 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/velocity-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/velocity-component.adoc
@@ -250,7 +250,7 @@ should use dynamically via a header, so for example:
---------------------------------------------------------------------------
from("direct:in").
setHeader("CamelVelocityResourceUri").constant("path/to/my/template.vm").
- to("velocity:dummy");
+ to("velocity:dummy?allowTemplateFromHeader=true"");
---------------------------------------------------------------------------
It's possible to specify a template directly as a header
@@ -260,7 +260,7 @@ the component should use dynamically via a header, so for
example:
---------------------------------------------------------------------------------------------------------------
from("direct:in").
setHeader("CamelVelocityTemplate").constant("Hi this is a velocity template
that can do templating ${body}").
- to("velocity:dummy");
+ to("velocity:dummy?allowTemplateFromHeader=true"");
---------------------------------------------------------------------------------------------------------------
== The Email Sample
