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.git
The following commit(s) were added to refs/heads/master by this push:
new aeb0d72 Regen
aeb0d72 is described below
commit aeb0d72bdaa976dd97a4c3b3cf9f680091ddb8c8
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jun 20 07:16:08 2019 +0200
Regen
---
.../src/main/docs/cm-sms-component.adoc | 6 +-
.../camel-main-configuration-metadata.json | 80 +++++++++++-----------
.../modules/ROOT/pages/cm-sms-component.adoc | 6 +-
.../modules/ROOT/pages/mongodb3-component.adoc | 11 +--
.../META-INF/spring-configuration-metadata.json | 80 +++++++++++-----------
5 files changed, 92 insertions(+), 91 deletions(-)
diff --git a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
index d40ba67..4470bc5 100644
--- a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
+++ b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
@@ -71,10 +71,10 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *defaultFrom* (producer) | This is the sender name. The maximum length is 11
characters. | | String)
-| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces
the max number. Message can be truncated. Technically the gateway will first
check if a message is larger than 160 characters, if so, the message will be
cut into multiple 153 characters parts limited by these parameters. | 8 |
Max(8L)::Int)
+| *defaultFrom* (producer) | This is the sender name. The maximum length is 11
characters. | | String
+| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces
the max number. Message can be truncated. Technically the gateway will first
check if a message is larger than 160 characters, if so, the message will be
cut into multiple 153 characters parts limited by these parameters. | 8 |
Max(8L)Int
| *lazyStartProducer* (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 creating and [...]
-| *productToken* (producer) | *Required* The unique token to use | | String)
+| *productToken* (producer) | *Required* The unique token to use | | String
| *testConnectionOnStartup* (producer) | Whether to test the connection to the
SMS Gateway on startup | false | boolean
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
diff --git
a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
index b211ae4..a5871f0 100644
---
a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
@@ -1,46 +1,6 @@
{
"properties": [
{
- "name": "camel.main.auto-configuration-enabled",
- "type": "java.lang.Boolean",
- "description": "Whether auto configuration of
components/dataformats/languages is enabled or not. When enabled the
configuration parameters are loaded from the properties component and
optionally from the classpath file
META-INF/services/org/apache/camel/autowire.properties. You can prefix the
parameters in the properties file with: - camel.component.name.option1=value1 -
camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 -
camel.dataformat.name.option2=valu [...]
- "defaultValue": true
- },
- {
- "name": "camel.main.autowire-component-properties",
- "type": "java.lang.Boolean",
- "description": "Whether autowiring components with properties that are
of same type, which has been added to the Camel registry, as a singleton
instance. This is used for convention over configuration to inject DataSource,
AmazonLogin instances to the components. <p/> This option is default enabled.",
- "defaultValue": true
- },
- {
- "name": "camel.main.autowire-component-properties-deep",
- "type": "java.lang.Boolean",
- "description": "Whether autowiring components (with deep nesting by
attempting to walk as deep down the object graph by creating new empty objects
on the way if needed) with properties that are of same type, which has been
added to the Camel registry, as a singleton instance. This is used for
convention over configuration to inject DataSource, AmazonLogin instances to
the components. <p/> This option is default disabled."
- },
- {
- "name": "camel.main.autowire-component-properties-allow-private-setter",
- "type": "java.lang.Boolean",
- "description": "Whether autowiring components allows to use private
setter method when setting the value. This may be needed in some rare
situations when some configuration classes may configure via constructors over
setters. But constructor configuration is more cumbersome to use via
.properties files etc.",
- "defaultValue": true
- },
- {
- "name": "camel.main.duration",
- "type": "java.lang.Long",
- "description": "Sets the duration (in seconds) to run the application
until it should be terminated. Defaults to -1. Any value <= 0 will run
forever.",
- "defaultValue": -1
- },
- {
- "name": "camel.main.duration-hit-exit-code",
- "type": "java.lang.Integer",
- "description": "Sets the exit code for the application if duration was
hit"
- },
- {
- "name": "camel.main.hangup-interceptor-enabled",
- "type": "java.lang.Boolean",
- "description": "Whether to use graceful hangup when Camel is stopping or
when the JVM terminates.",
- "defaultValue": true
- },
- {
"name": "camel.main.name",
"type": "java.lang.String",
"description": "Sets the name of the CamelContext."
@@ -264,6 +224,46 @@
"description": "Used for filtering routes routes matching the given
pattern, which follows the following rules: - Match by route id - Match by
route input endpoint uri The matching is using exact match, by wildcard and
regular expression as documented by {@link
PatternHelper#matchPattern(String,String)} . For example to only include routes
which starts with foo in their route id's, use: include=foo* And to exclude
routes which starts from JMS endpoints, use: exclude=jms:* [...]
},
{
+ "name": "camel.main.auto-configuration-enabled",
+ "type": "java.lang.Boolean",
+ "description": "Whether auto configuration of
components/dataformats/languages is enabled or not. When enabled the
configuration parameters are loaded from the properties component and
optionally from the classpath file
META-INF/services/org/apache/camel/autowire.properties. You can prefix the
parameters in the properties file with: - camel.component.name.option1=value1 -
camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 -
camel.dataformat.name.option2=valu [...]
+ "defaultValue": true
+ },
+ {
+ "name": "camel.main.autowire-component-properties",
+ "type": "java.lang.Boolean",
+ "description": "Whether autowiring components with properties that are
of same type, which has been added to the Camel registry, as a singleton
instance. This is used for convention over configuration to inject DataSource,
AmazonLogin instances to the components. <p/> This option is default enabled.",
+ "defaultValue": true
+ },
+ {
+ "name": "camel.main.autowire-component-properties-deep",
+ "type": "java.lang.Boolean",
+ "description": "Whether autowiring components (with deep nesting by
attempting to walk as deep down the object graph by creating new empty objects
on the way if needed) with properties that are of same type, which has been
added to the Camel registry, as a singleton instance. This is used for
convention over configuration to inject DataSource, AmazonLogin instances to
the components. <p/> This option is default disabled."
+ },
+ {
+ "name": "camel.main.autowire-component-properties-allow-private-setter",
+ "type": "java.lang.Boolean",
+ "description": "Whether autowiring components allows to use private
setter method when setting the value. This may be needed in some rare
situations when some configuration classes may configure via constructors over
setters. But constructor configuration is more cumbersome to use via
.properties files etc.",
+ "defaultValue": true
+ },
+ {
+ "name": "camel.main.duration",
+ "type": "java.lang.Long",
+ "description": "Sets the duration (in seconds) to run the application
until it should be terminated. Defaults to -1. Any value <= 0 will run
forever.",
+ "defaultValue": -1
+ },
+ {
+ "name": "camel.main.duration-hit-exit-code",
+ "type": "java.lang.Integer",
+ "description": "Sets the exit code for the application if duration was
hit"
+ },
+ {
+ "name": "camel.main.hangup-interceptor-enabled",
+ "type": "java.lang.Boolean",
+ "description": "Whether to use graceful hangup when Camel is stopping or
when the JVM terminates.",
+ "defaultValue": true
+ },
+ {
"name": "camel.main.hystrix.group-key",
"type": "java.lang.String",
"description": "Sets the group key to use. The default value is
CamelHystrix."
diff --git a/docs/components/modules/ROOT/pages/cm-sms-component.adoc
b/docs/components/modules/ROOT/pages/cm-sms-component.adoc
index d40ba67..4470bc5 100644
--- a/docs/components/modules/ROOT/pages/cm-sms-component.adoc
+++ b/docs/components/modules/ROOT/pages/cm-sms-component.adoc
@@ -71,10 +71,10 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *defaultFrom* (producer) | This is the sender name. The maximum length is 11
characters. | | String)
-| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces
the max number. Message can be truncated. Technically the gateway will first
check if a message is larger than 160 characters, if so, the message will be
cut into multiple 153 characters parts limited by these parameters. | 8 |
Max(8L)::Int)
+| *defaultFrom* (producer) | This is the sender name. The maximum length is 11
characters. | | String
+| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces
the max number. Message can be truncated. Technically the gateway will first
check if a message is larger than 160 characters, if so, the message will be
cut into multiple 153 characters parts limited by these parameters. | 8 |
Max(8L)Int
| *lazyStartProducer* (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 creating and [...]
-| *productToken* (producer) | *Required* The unique token to use | | String)
+| *productToken* (producer) | *Required* The unique token to use | | String
| *testConnectionOnStartup* (producer) | Whether to test the connection to the
SMS Gateway on startup | false | boolean
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
diff --git a/docs/components/modules/ROOT/pages/mongodb3-component.adoc
b/docs/components/modules/ROOT/pages/mongodb3-component.adoc
index 4939cda..c5928f6 100644
--- a/docs/components/modules/ROOT/pages/mongodb3-component.adoc
+++ b/docs/components/modules/ROOT/pages/mongodb3-component.adoc
@@ -91,7 +91,7 @@ with the following path and query parameters:
|===
-==== Query Parameters (23 parameters):
+==== Query Parameters (24 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -101,6 +101,7 @@ with the following path and query parameters:
| *collectionIndex* (common) | Sets the collection index (JSON FORMAT : {
field1 : order1, field2 : order2}) | | String
| *createCollection* (common) | Create collection during initialisation if it
doesn't exist. Default is true. | true | boolean
| *database* (common) | Sets the name of the MongoDB database to target | |
String
+| *mongoConnection* (common) | Sets the Mongo instance that represents the
backing connection | | MongoClient
| *operation* (common) | Sets the operation this endpoint will execute against
MongoDB. For possible values, see MongoDbOperation. | | MongoDbOperation
| *outputType* (common) | Convert the output of the producer to the selected
type : DocumentList Document or MongoIterable. DocumentList or MongoIterable
applies to findAll and aggregate. Document applies to all other operations. |
| MongoDbOutputType
| *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
@@ -152,7 +153,7 @@ The component supports 3 options, which are listed below.
// spring-boot-auto-configure options: END
-Note on options of MongoDB component
+Note on options of MongoDB component
writeConcern *Remove in camel 2.19.* See Mongo client options
<<MongoDB-ConfigurationofdatabaseinSpringXML>>. Set the WriteConcern for write
operations on MongoDB using the standard ones. Resolved from the fields of the
WriteConcern class by calling the link WriteConcernvalueOf(String) method.
@@ -844,7 +845,7 @@ new objects are inserted, MongoDB will push them as
`Document` in natural
order to your tailable cursor consumer, who will transform them to an
Exchange and will trigger your route logic.
-===== How the tailable cursor consumer works
+=== How the tailable cursor consumer works
To turn a cursor into a tailable cursor, a few special flags are to be
signalled to MongoDB when first generating the cursor. Once created, the
@@ -895,7 +896,7 @@ The above route will consume from the
"flights.cancellations" capped
collection, using "departureTime" as the increasing field, with a
default regeneration cursor delay of 1000ms.
-===== Persistent tail tracking
+=== Persistent tail tracking
Standard tail tracking is volatile and the last value is only kept in
memory. However, in practice you will need to restart your Camel
@@ -915,7 +916,7 @@ persisting at regular intervals too in the future (flush
every 5
seconds) for added robustness if the demand is there. To request this
feature, please open a ticket in the Camel JIRA.
-===== Enabling persistent tail tracking
+=== Enabling persistent tail tracking
To enable this function, set at least the following options on the
endpoint URI:
diff --git
a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
index 4f3190e..0a726b6 100644
---
a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
+++
b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -1,6 +1,46 @@
{
"properties": [
{
+ "name": "camel.main.auto-configuration-enabled",
+ "type": "java.lang.Boolean",
+ "description": "Whether auto configuration of
components/dataformats/languages is enabled or not. When enabled the
configuration parameters are loaded from the properties component and
optionally from the classpath file
META-INF/services/org/apache/camel/autowire.properties. You can prefix the
parameters in the properties file with: - camel.component.name.option1=value1 -
camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 -
camel.dataformat.name.option2=valu [...]
+ "defaultValue": true
+ },
+ {
+ "name": "camel.main.autowire-component-properties",
+ "type": "java.lang.Boolean",
+ "description": "Whether autowiring components with properties that are
of same type, which has been added to the Camel registry, as a singleton
instance. This is used for convention over configuration to inject DataSource,
AmazonLogin instances to the components. <p/> This option is default enabled.",
+ "defaultValue": true
+ },
+ {
+ "name": "camel.main.autowire-component-properties-deep",
+ "type": "java.lang.Boolean",
+ "description": "Whether autowiring components (with deep nesting by
attempting to walk as deep down the object graph by creating new empty objects
on the way if needed) with properties that are of same type, which has been
added to the Camel registry, as a singleton instance. This is used for
convention over configuration to inject DataSource, AmazonLogin instances to
the components. <p/> This option is default disabled."
+ },
+ {
+ "name": "camel.main.autowire-component-properties-allow-private-setter",
+ "type": "java.lang.Boolean",
+ "description": "Whether autowiring components allows to use private
setter method when setting the value. This may be needed in some rare
situations when some configuration classes may configure via constructors over
setters. But constructor configuration is more cumbersome to use via
.properties files etc.",
+ "defaultValue": true
+ },
+ {
+ "name": "camel.main.duration",
+ "type": "java.lang.Long",
+ "description": "Sets the duration (in seconds) to run the application
until it should be terminated. Defaults to -1. Any value <= 0 will run
forever.",
+ "defaultValue": -1
+ },
+ {
+ "name": "camel.main.duration-hit-exit-code",
+ "type": "java.lang.Integer",
+ "description": "Sets the exit code for the application if duration was
hit"
+ },
+ {
+ "name": "camel.main.hangup-interceptor-enabled",
+ "type": "java.lang.Boolean",
+ "description": "Whether to use graceful hangup when Camel is stopping or
when the JVM terminates.",
+ "defaultValue": true
+ },
+ {
"name": "camel.main.name",
"type": "java.lang.String",
"description": "Sets the name of the CamelContext."
@@ -224,46 +264,6 @@
"description": "Used for filtering routes routes matching the given
pattern, which follows the following rules: - Match by route id - Match by
route input endpoint uri The matching is using exact match, by wildcard and
regular expression as documented by {@link
PatternHelper#matchPattern(String,String)} . For example to only include routes
which starts with foo in their route id's, use: include=foo* And to exclude
routes which starts from JMS endpoints, use: exclude=jms:* [...]
},
{
- "name": "camel.main.auto-configuration-enabled",
- "type": "java.lang.Boolean",
- "description": "Whether auto configuration of
components/dataformats/languages is enabled or not. When enabled the
configuration parameters are loaded from the properties component and
optionally from the classpath file
META-INF/services/org/apache/camel/autowire.properties. You can prefix the
parameters in the properties file with: - camel.component.name.option1=value1 -
camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 -
camel.dataformat.name.option2=valu [...]
- "defaultValue": true
- },
- {
- "name": "camel.main.autowire-component-properties",
- "type": "java.lang.Boolean",
- "description": "Whether autowiring components with properties that are
of same type, which has been added to the Camel registry, as a singleton
instance. This is used for convention over configuration to inject DataSource,
AmazonLogin instances to the components. <p/> This option is default enabled.",
- "defaultValue": true
- },
- {
- "name": "camel.main.autowire-component-properties-deep",
- "type": "java.lang.Boolean",
- "description": "Whether autowiring components (with deep nesting by
attempting to walk as deep down the object graph by creating new empty objects
on the way if needed) with properties that are of same type, which has been
added to the Camel registry, as a singleton instance. This is used for
convention over configuration to inject DataSource, AmazonLogin instances to
the components. <p/> This option is default disabled."
- },
- {
- "name": "camel.main.autowire-component-properties-allow-private-setter",
- "type": "java.lang.Boolean",
- "description": "Whether autowiring components allows to use private
setter method when setting the value. This may be needed in some rare
situations when some configuration classes may configure via constructors over
setters. But constructor configuration is more cumbersome to use via
.properties files etc.",
- "defaultValue": true
- },
- {
- "name": "camel.main.duration",
- "type": "java.lang.Long",
- "description": "Sets the duration (in seconds) to run the application
until it should be terminated. Defaults to -1. Any value <= 0 will run
forever.",
- "defaultValue": -1
- },
- {
- "name": "camel.main.duration-hit-exit-code",
- "type": "java.lang.Integer",
- "description": "Sets the exit code for the application if duration was
hit"
- },
- {
- "name": "camel.main.hangup-interceptor-enabled",
- "type": "java.lang.Boolean",
- "description": "Whether to use graceful hangup when Camel is stopping or
when the JVM terminates.",
- "defaultValue": true
- },
- {
"name": "camel.main.hystrix.group-key",
"type": "java.lang.String",
"description": "Sets the group key to use. The default value is
CamelHystrix."
