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 5103fd9 Regen
5103fd9 is described below
commit 5103fd9f4d633463f86a9aa1e08518b1b9619fdc
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Mar 6 16:57:16 2021 +0100
Regen
---
.../camel/springboot/catalog/components/freemarker.json | 1 +
components-starter/camel-corda-starter/pom.xml | 8 --------
.../src/main/docs/freemarker-starter.adoc | 3 ++-
.../springboot/FreemarkerComponentConfiguration.java | 12 ++++++++++++
components-starter/camel-iota-starter/pom.xml | 12 ------------
docs/modules/ROOT/pages/freemarker-starter.adoc | 3 ++-
6 files changed, 17 insertions(+), 22 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json
index 071e9b0..6352f1d 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json
@@ -25,6 +25,7 @@
"allowContextMapAll": { "kind": "property", "displayName": "Allow Context
Map All", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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. [...]
"allowTemplateFromHeader": { "kind": "property", "displayName": "Allow
Template From Header", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "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 vulne [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 star [...]
+ "localizedLookup": { "kind": "property", "displayName": "Localized
Lookup", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Enables\/disables
localized template lookup. Disabled by default." },
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "freemarker.template.Configuration", "deprecated": false,
"autowired": false, "secret": false, "description": "To use an existing
freemarker.template.Configuration instance as the configuration." }
},
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 4aa7023..b215b27 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,14 +41,6 @@
<!--START OF GENERATED CODE-->
<exclusions>
<exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
diff --git
a/components-starter/camel-freemarker-starter/src/main/docs/freemarker-starter.adoc
b/components-starter/camel-freemarker-starter/src/main/docs/freemarker-starter.adoc
index 66ff0b7..54fb08b 100644
---
a/components-starter/camel-freemarker-starter/src/main/docs/freemarker-starter.adoc
+++
b/components-starter/camel-freemarker-starter/src/main/docs/freemarker-starter.adoc
@@ -17,7 +17,7 @@ When using freemarker with Spring Boot make sure to use the
following Maven depe
----
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
@@ -30,5 +30,6 @@ The component supports 6 options, which are listed below.
| *camel.component.freemarker.configuration* | To use an existing
freemarker.template.Configuration instance as the configuration. The option is
a freemarker.template.Configuration type. | | Configuration
| *camel.component.freemarker.enabled* | Whether to enable auto configuration
of the freemarker component. This is enabled by default. | | Boolean
| *camel.component.freemarker.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 [...]
+| *camel.component.freemarker.localized-lookup* | Enables/disables localized
template lookup. Disabled by default. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java
b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java
index 5cb3750..ad2dfaa 100644
---
a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java
+++
b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java
@@ -64,6 +64,10 @@ public class FreemarkerComponentConfiguration
*/
private Boolean lazyStartProducer = false;
/**
+ * Enables/disables localized template lookup. Disabled by default.
+ */
+ private Boolean localizedLookup = false;
+ /**
* Whether autowiring is enabled. This is used for automatic autowiring
* options (the option must be marked as autowired) by looking up in the
* registry to find if there is a single instance of matching type, which
@@ -102,6 +106,14 @@ public class FreemarkerComponentConfiguration
this.lazyStartProducer = lazyStartProducer;
}
+ public Boolean getLocalizedLookup() {
+ return localizedLookup;
+ }
+
+ public void setLocalizedLookup(Boolean localizedLookup) {
+ this.localizedLookup = localizedLookup;
+ }
+
public Boolean getAutowiredEnabled() {
return autowiredEnabled;
}
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index 3656ac0..1cdd52f 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,18 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/docs/modules/ROOT/pages/freemarker-starter.adoc
b/docs/modules/ROOT/pages/freemarker-starter.adoc
index 66ff0b7..54fb08b 100644
--- a/docs/modules/ROOT/pages/freemarker-starter.adoc
+++ b/docs/modules/ROOT/pages/freemarker-starter.adoc
@@ -17,7 +17,7 @@ When using freemarker with Spring Boot make sure to use the
following Maven depe
----
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
@@ -30,5 +30,6 @@ The component supports 6 options, which are listed below.
| *camel.component.freemarker.configuration* | To use an existing
freemarker.template.Configuration instance as the configuration. The option is
a freemarker.template.Configuration type. | | Configuration
| *camel.component.freemarker.enabled* | Whether to enable auto configuration
of the freemarker component. This is enabled by default. | | Boolean
| *camel.component.freemarker.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 [...]
+| *camel.component.freemarker.localized-lookup* | Enables/disables localized
template lookup. Disabled by default. | false | Boolean
|===
// spring-boot-auto-configure options: END
