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 c564264 Polished
c564264 is described below
commit c564264bbca93b625bf654be170e3c890152352c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Feb 4 07:24:57 2021 +0100
Polished
---
.../META-INF/camel-main-configuration-metadata.json | 8 ++++----
core/camel-main/src/main/docs/main.adoc | 8 ++++----
.../camel/main/DefaultConfigurationProperties.java | 17 +++++++++--------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 5a85bd6..9e75fce 100644
---
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -34,8 +34,8 @@
{ "name": "camel.main.endpointRuntimeStatisticsEnabled", "description":
"Sets whether endpoint runtime statistics is enabled (gathers runtime usage of
each incoming and outgoing endpoints). The default value is false.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"boolean", "javaType": "boolean" },
{ "name": "camel.main.fileConfigurations", "description": "Directory to
load additional configuration files that contains configuration values that
takes precedence over any other configuration. This can be used to refer to
files that may have secret configuration that has been mounted on the file
system for containers. You can specify a pattern to load from sub directories
and a name pattern such as \/var\/app\/secret\/.properties, multiple
directories can be separated by comma.", " [...]
{ "name": "camel.main.inflightRepositoryBrowseEnabled", "description":
"Sets whether the inflight repository should allow browsing each inflight
exchange. This is by default disabled as there is a very slight performance
overhead when enabled.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean" },
- { "name": "camel.main.javaRoutesExcludePattern", "description": "Used for
exclusive filtering component scanning of RouteBuilder classes with Component
annotation. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. For example to exclude all classes starting with Bar use:
**\/Bar* To exclude all routes form a specific package use:
com\/mycompany\/bar\/* [...]
- { "name": "camel.main.javaRoutesIncludePattern", "description": "Used for
inclusive filtering component scanning of RouteBuilder classes with Component
annotation. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. For example to include all classes starting with Foo use:
**\/Foo To include all routes form a specific package use:
com\/mycompany\/foo\/* To in [...]
+ { "name": "camel.main.javaRoutesExcludePattern", "description": "Used for
exclusive filtering RouteBuilder classes which are collected from the registry
or via classpath scanning. The exclusive filtering takes precedence over
inclusive filtering. The pattern is using Ant-path style pattern. Multiple
patterns can be specified separated by comma. For example to exclude all
classes starting with Bar use: **\/Bar* To exclude all routes form
a specific package use: com\/mycomp [...]
+ { "name": "camel.main.javaRoutesIncludePattern", "description": "Used for
inclusive filtering RouteBuilder classes which are collected from the registry
or via classpath scanning. The exclusive filtering takes precedence over
inclusive filtering. The pattern is using Ant-path style pattern. Multiple
patterns can be specified separated by comma. Multiple patterns can be
specified separated by comma. For example to include all classes starting with
Foo use: **\/Foo To include a [...]
{ "name": "camel.main.jmxEnabled", "description": "Enable JMX in your
Camel application.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.main.jmxManagementNamePattern", "description": "The
naming pattern for creating the CamelContext JMX management name. The default
pattern is #name#", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": "java.lang.String", "defaultValue": "#name#" },
{ "name": "camel.main.jmxManagementStatisticsLevel", "description": "Sets
the JMX statistics level, the level can be set to Extended to gather additional
information The default value is Default.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "object",
"javaType": "org.apache.camel.ManagementStatisticsLevel", "defaultValue":
"Default", "enum": [ "Extended", "Default", "RoutesOnly", "Off" ] },
@@ -65,9 +65,9 @@
{ "name": "camel.main.routeFilterIncludePattern", "description": "Used for
filtering 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
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 en [...]
{ "name": "camel.main.routesBuilderClasses", "description": "Sets classes
names that implement RoutesBuilder .", "sourceType":
"org.apache.camel.main.MainConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.main.routesBuilders", "description": "Sets the
RoutesBuilder instances.", "sourceType":
"org.apache.camel.main.MainConfigurationProperties", "type": "object",
"javaType": "java.util.List" },
- { "name": "camel.main.routesCollectorEnabled", "description": "Whether the
routes collector is enabled or not. When enabled Camel will auto-discover
routes (RouteBuilder instances from the registry and also load additional XML
routes from the file system. The routes collector is default enabled.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"boolean", "javaType": "boolean", "defaultValue": true },
+ { "name": "camel.main.routesCollectorEnabled", "description": "Whether the
routes collector is enabled or not. When enabled Camel will auto-discover
routes (RouteBuilder instances from the registry and also load additional
routes from the file system). The routes collector is default enabled.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"boolean", "javaType": "boolean", "defaultValue": true },
{ "name": "camel.main.routesExcludePattern", "description": "Used for
exclusive filtering of routes from directories. The exclusive filtering takes
precedence over inclusive filtering. The pattern is using Ant-path style
pattern. Multiple patterns can be specified separated by comma, as example, to
exclude all the routes from a directory whose name contains foo use:
**\/foo.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": [...]
- { "name": "camel.main.routesIncludePattern", "description": "Used for
inclusive filtering of routes from directories. This is used to retrieve the
initial list of resource which can be filtered using the exclusive filter. The
pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma, as example, to include all the routes from a directory
whose name contains foo use: **\/foo.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProper [...]
+ { "name": "camel.main.routesIncludePattern", "description": "Used for
inclusive filtering of routes from directories. The exclusive filtering takes
precedence over inclusive filtering. The pattern is using Ant-path style
pattern. Multiple patterns can be specified separated by comma, as example, to
include all the routes from a directory whose name contains foo use:
**\/foo.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": [...]
{ "name": "camel.main.shutdownLogInflightExchangesOnTimeout",
"description": "Sets whether to log information about the inflight Exchanges
which are still running during a shutdown which didn't complete without the
given timeout. This requires to enable the option
inflightRepositoryBrowseEnabled.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.main.shutdownNowOnTimeout", "description": "Sets whether
to force shutdown of all consumers when a timeout occurred and thus not all
consumers was shutdown within that period. You should have good reasons to set
this option to false as it means that the routes keep running and is halted
abruptly when CamelContext has been shutdown.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.main.shutdownRoutesInReverseOrder", "description": "Sets
whether routes should be shutdown in reverse or the same order as they were
started.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index acf9bfb..bff9c2c 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -46,8 +46,8 @@ The following table lists all the options:
| *camel.main.endpointRuntime{zwsp}StatisticsEnabled* | Sets whether endpoint
runtime statistics is enabled (gathers runtime usage of each incoming and
outgoing endpoints). The default value is false. | | boolean
| *camel.main.fileConfigurations* | Directory to load additional configuration
files that contains configuration values that takes precedence over any other
configuration. This can be used to refer to files that may have secret
configuration that has been mounted on the file system for containers. You can
specify a pattern to load from sub directories and a name pattern such as
/var/app/secret/.properties, multiple directories can be separated by comma. |
| String
| *camel.main.inflightRepository{zwsp}BrowseEnabled* | Sets whether the
inflight repository should allow browsing each inflight exchange. This is by
default disabled as there is a very slight performance overhead when enabled. |
| boolean
-| *camel.main.javaRoutesExclude{zwsp}Pattern* | Used for exclusive filtering
component scanning of RouteBuilder classes with Component annotation. The
exclusive filtering takes precedence over inclusive filtering. The pattern is
using Ant-path style pattern. Multiple patterns can be specified separated by
comma. For example to exclude all classes starting with Bar use:
**/Bar* To exclude all routes form a specific package use:
com/mycompany/bar/* To exclude all routes for [...]
-| *camel.main.javaRoutesInclude{zwsp}Pattern* | Used for inclusive filtering
component scanning of RouteBuilder classes with Component annotation. The
exclusive filtering takes precedence over inclusive filtering. The pattern is
using Ant-path style pattern. Multiple patterns can be specified separated by
comma. For example to include all classes starting with Foo use: **/Foo
To include all routes form a specific package use: com/mycompany/foo/* To
include all routes form a s [...]
+| *camel.main.javaRoutesExclude{zwsp}Pattern* | Used for exclusive filtering
RouteBuilder classes which are collected from the registry or via classpath
scanning. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. For example to exclude all classes starting with Bar use:
**/Bar* To exclude all routes form a specific package use:
com/mycompany/bar/* To exclud [...]
+| *camel.main.javaRoutesInclude{zwsp}Pattern* | Used for inclusive filtering
RouteBuilder classes which are collected from the registry or via classpath
scanning. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. Multiple patterns can be specified separated by comma. For
example to include all classes starting with Foo use: **/Foo To include
all routes form a speci [...]
| *camel.main.jmxEnabled* | Enable JMX in your Camel application. | true |
boolean
| *camel.main.jmxManagementName{zwsp}Pattern* | The naming pattern for
creating the CamelContext JMX management name. The default pattern is #name# |
#name# | String
| *camel.main.jmxManagement{zwsp}StatisticsLevel* | Sets the JMX statistics
level, the level can be set to Extended to gather additional information The
default value is Default. | Default | ManagementStatisticsLevel
@@ -77,9 +77,9 @@ The following table lists all the options:
| *camel.main.routeFilterInclude{zwsp}Pattern* | Used for filtering 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
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 [...]
| *camel.main.routesBuilder{zwsp}Classes* | Sets classes names that implement
RoutesBuilder . | | String
| *camel.main.routesBuilders* | Sets the RoutesBuilder instances. | | List
-| *camel.main.routesCollector{zwsp}Enabled* | Whether the routes collector is
enabled or not. When enabled Camel will auto-discover routes (RouteBuilder
instances from the registry and also load additional XML routes from the file
system. The routes collector is default enabled. | true | boolean
+| *camel.main.routesCollector{zwsp}Enabled* | Whether the routes collector is
enabled or not. When enabled Camel will auto-discover routes (RouteBuilder
instances from the registry and also load additional routes from the file
system). The routes collector is default enabled. | true | boolean
| *camel.main.routesExclude{zwsp}Pattern* | Used for exclusive filtering of
routes from directories. The exclusive filtering takes precedence over
inclusive filtering. The pattern is using Ant-path style pattern. Multiple
patterns can be specified separated by comma, as example, to exclude all the
routes from a directory whose name contains foo use: **/foo. | | String
-| *camel.main.routesInclude{zwsp}Pattern* | Used for inclusive filtering of
routes from directories. This is used to retrieve the initial list of resource
which can be filtered using the exclusive filter. The pattern is using Ant-path
style pattern. Multiple patterns can be specified separated by comma, as
example, to include all the routes from a directory whose name contains foo
use: **/foo. |
classpath:camel/*.xml,classpath:camel-template/*.xml,classpath:camel-rest/*.xml
| String
+| *camel.main.routesInclude{zwsp}Pattern* | Used for inclusive filtering of
routes from directories. The exclusive filtering takes precedence over
inclusive filtering. The pattern is using Ant-path style pattern. Multiple
patterns can be specified separated by comma, as example, to include all the
routes from a directory whose name contains foo use: **/foo. |
classpath:camel/*.xml,classpath:camel-template/*.xml,classpath:camel-rest/*.xml
| String
| *camel.main.shutdownLogInflight{zwsp}ExchangesOnTimeout* | Sets whether to
log information about the inflight Exchanges which are still running during a
shutdown which didn't complete without the given timeout. This requires to
enable the option inflightRepositoryBrowseEnabled. | true | boolean
| *camel.main.shutdownNowOn{zwsp}Timeout* | Sets whether to force shutdown of
all consumers when a timeout occurred and thus not all consumers was shutdown
within that period. You should have good reasons to set this option to false as
it means that the routes keep running and is halted abruptly when CamelContext
has been shutdown. | true | boolean
| *camel.main.shutdownRoutesIn{zwsp}ReverseOrder* | Sets whether routes should
be shutdown in reverse or the same order as they were started. | true | boolean
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
index 9413cfd..7d2f0c6 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
@@ -838,7 +838,7 @@ public abstract class DefaultConfigurationProperties<T> {
* Whether the routes collector is enabled or not.
*
* When enabled Camel will auto-discover routes (RouteBuilder instances
from the registry and also load additional
- * XML routes from the file system.
+ * routes from the file system).
*
* The routes collector is default enabled.
*/
@@ -851,8 +851,9 @@ public abstract class DefaultConfigurationProperties<T> {
}
/**
- * Used for inclusive filtering component scanning of RouteBuilder classes
with @Component annotation. The exclusive
- * filtering takes precedence over inclusive filtering. The pattern is
using Ant-path style pattern.
+ * Used for inclusive filtering RouteBuilder classes which are collected
from the registry or via classpath
+ * scanning. The exclusive filtering takes precedence over inclusive
filtering. The pattern is using Ant-path style
+ * pattern. Multiple patterns can be specified separated by comma.
*
* Multiple patterns can be specified separated by comma. For example to
include all classes starting with Foo use:
* **/Foo* To include all routes form a specific package use:
com/mycompany/foo/* To include all routes
@@ -868,9 +869,9 @@ public abstract class DefaultConfigurationProperties<T> {
}
/**
- * Used for exclusive filtering component scanning of RouteBuilder classes
with @Component annotation. The exclusive
- * filtering takes precedence over inclusive filtering. The pattern is
using Ant-path style pattern. Multiple
- * patterns can be specified separated by comma.
+ * Used for exclusive filtering RouteBuilder classes which are collected
from the registry or via classpath
+ * scanning. The exclusive filtering takes precedence over inclusive
filtering. The pattern is using Ant-path style
+ * pattern. Multiple patterns can be specified separated by comma.
*
* For example to exclude all classes starting with Bar use:
**/Bar* To exclude all routes form a
* specific package use: com/mycompany/bar/* To exclude all routes
form a specific package and its sub-packages
@@ -886,8 +887,8 @@ public abstract class DefaultConfigurationProperties<T> {
}
/**
- * Used for inclusive filtering of routes from directories. This is used
to retrieve the initial list of resource
- * which can be filtered using the exclusive filter. The pattern is using
Ant-path style pattern.
+ * Used for inclusive filtering of routes from directories. The exclusive
filtering takes precedence over inclusive
+ * filtering. The pattern is using Ant-path style pattern.
*
* Multiple patterns can be specified separated by comma, as example, to
include all the routes from a directory
* whose name contains foo use: **/*foo*.
