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-spring-boot.git
commit 35010daaa8426a7f3194e788b56cd0d88118bcee
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Oct 9 19:17:37 2020 +0200
Regen
---
.../org/apache/camel/springboot/catalog/languages/bean.json | 2 +-
.../camel-bean-starter/src/main/docs/bean-starter.adoc | 2 +-
.../language/bean/springboot/BeanLanguageConfiguration.java | 5 +++--
components-starter/camel-corda-starter/pom.xml | 8 ++++++++
components-starter/camel-iota-starter/pom.xml | 12 ++++++++++++
docs/modules/ROOT/pages/bean-starter.adoc | 2 +-
6 files changed, 26 insertions(+), 5 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json
index b82165c..897d17f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json
@@ -19,7 +19,7 @@
"ref": { "kind": "attribute", "displayName": "Ref", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Reference to bean to lookup in the registry" },
"method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Name of method to call" },
"beanType": { "kind": "attribute", "displayName": "Bean Type", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Class name of the bean to use" },
- "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "secret": false, "defaultValue":
"Singleton", "description": "Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same tim [...]
+ "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "secret": false, "defaultValue":
"Singleton", "description": "Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same tim [...]
"trim": { "kind": "attribute", "displayName": "Trim", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"secret": false, "defaultValue": true, "description": "Whether to trim the
value to remove leading and trailing whitespaces and line breaks" },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Sets the id of this node" }
}
diff --git
a/components-starter/camel-bean-starter/src/main/docs/bean-starter.adoc
b/components-starter/camel-bean-starter/src/main/docs/bean-starter.adoc
index 827fdb9..c058644 100644
--- a/components-starter/camel-bean-starter/src/main/docs/bean-starter.adoc
+++ b/components-starter/camel-bean-starter/src/main/docs/bean-starter.adoc
@@ -31,7 +31,7 @@ The component supports 13 options, which are listed below.
| *camel.component.class.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 then [...]
| *camel.component.class.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple t [...]
| *camel.language.bean.enabled* | Whether to enable auto configuration of the
bean language. This is enabled by default. | | Boolean
-| *camel.language.bean.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple tim [...]
+| *camel.language.bean.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple tim [...]
| *camel.language.bean.trim* | Whether to trim the value to remove leading and
trailing whitespaces and line breaks | true | Boolean
| *camel.component.bean.basic-property-binding* | *Deprecated* Whether the
component should use basic property binding (Camel 2.x) or the newer property
binding with additional capabilities | false | Boolean
| *camel.component.bean.cache* | *Deprecated* Use singleton option instead. |
true | Boolean
diff --git
a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageConfiguration.java
b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageConfiguration.java
index e6409e6..32ba138 100644
---
a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageConfiguration.java
+++
b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageConfiguration.java
@@ -46,11 +46,12 @@ public class BeanLanguageConfiguration
* state on a bean while processing a request and you want to call the same
* bean instance multiple times while processing the request. The bean does
* not have to be thread-safe as the instance is only called from the same
- * request. When using delegate scope, then the bean will be looked up or
+ * request. When using prototype scope, then the bean will be looked up or
* created per call. However in case of lookup then this is delegated to
the
* bean registry such as Spring or CDI (if in use), which depends on their
* configuration can act as either singleton or prototype scope. so when
- * using delegate then this depends on the delegated registry.
+ * using prototype scope then this depends on the bean registry
+ * implementation.
*/
private String scope = "Singleton";
/**
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 274f6da..43b013d 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,6 +41,14 @@
<!--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-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index 2050aee..ce65d0f 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<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/bean-starter.adoc
b/docs/modules/ROOT/pages/bean-starter.adoc
index 827fdb9..c058644 100644
--- a/docs/modules/ROOT/pages/bean-starter.adoc
+++ b/docs/modules/ROOT/pages/bean-starter.adoc
@@ -31,7 +31,7 @@ The component supports 13 options, which are listed below.
| *camel.component.class.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 then [...]
| *camel.component.class.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple t [...]
| *camel.language.bean.enabled* | Whether to enable auto configuration of the
bean language. This is enabled by default. | | Boolean
-| *camel.language.bean.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple tim [...]
+| *camel.language.bean.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple tim [...]
| *camel.language.bean.trim* | Whether to trim the value to remove leading and
trailing whitespaces and line breaks | true | Boolean
| *camel.component.bean.basic-property-binding* | *Deprecated* Whether the
component should use basic property binding (Camel 2.x) or the newer property
binding with additional capabilities | false | Boolean
| *camel.component.bean.cache* | *Deprecated* Use singleton option instead. |
true | Boolean
